From 0d59cc080a8dc115bdb727d376e3965e58109718 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Mon, 12 May 2014 10:31:27 +1000 Subject: [PATCH] Give the Redirect a HostName - filled in from the s3 bucket name. Docker-DCO-1.1-Signed-off-by: Sven Dowideit (github: SvenDowideit) --- docs/Dockerfile | 2 +- docs/release.sh | 7 +++++-- docs/s3_website.json | 12 ++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/docs/Dockerfile b/docs/Dockerfile index a907072ddf..694729d89b 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -4,7 +4,7 @@ FROM debian:jessie MAINTAINER Sven Dowideit (@SvenDowideit) -RUN apt-get update && apt-get install -yq make python-pip python-setuptools vim-tiny git pandoc +RUN apt-get update && apt-get install -yq make python-pip python-setuptools vim-tiny git gettext RUN pip install mkdocs diff --git a/docs/release.sh b/docs/release.sh index 323887f594..acb40a46d7 100755 --- a/docs/release.sh +++ b/docs/release.sh @@ -19,7 +19,7 @@ EOF [ "$AWS_S3_BUCKET" ] || usage #VERSION=$(cat VERSION) -BUCKET=$AWS_S3_BUCKET +export BUCKET=$AWS_S3_BUCKET export AWS_CONFIG_FILE=$(pwd)/awsconfig [ -e "$AWS_CONFIG_FILE" ] || usage @@ -37,7 +37,10 @@ setup_s3() { # Make the bucket accessible through website endpoints. echo "make $BUCKET accessible as a website" #aws s3 website s3://$BUCKET --index-document index.html --error-document jsearch/index.html - s3conf=$(cat s3_website.json) + s3conf=$(cat s3_website.json | envsubst) + echo + echo $s3conf + echo aws s3api put-bucket-website --bucket $BUCKET --website-configuration "$s3conf" } diff --git a/docs/s3_website.json b/docs/s3_website.json index fb14628ce6..2d158cf9de 100644 --- a/docs/s3_website.json +++ b/docs/s3_website.json @@ -6,12 +6,12 @@ "Suffix": "index.html" }, "RoutingRules": [ - { "Condition": { "KeyPrefixEquals": "en/latest/" }, "Redirect": { "ReplaceKeyPrefixWith": "" } }, - { "Condition": { "KeyPrefixEquals": "en/master/" }, "Redirect": { "ReplaceKeyPrefixWith": "" } }, - { "Condition": { "KeyPrefixEquals": "en/v0.6.3/" }, "Redirect": { "ReplaceKeyPrefixWith": "" } }, - { "Condition": { "KeyPrefixEquals": "jsearch/index.html" }, "Redirect": { "ReplaceKeyPrefixWith": "jsearch/" } }, - { "Condition": { "KeyPrefixEquals": "index/" }, "Redirect": { "ReplaceKeyPrefixWith": "docker-io/" } }, - { "Condition": { "KeyPrefixEquals": "reference/api/index_api/" }, "Redirect": { "ReplaceKeyPrefixWith": "reference/api/docker-io_api/" } } + { "Condition": { "KeyPrefixEquals": "en/latest/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } }, + { "Condition": { "KeyPrefixEquals": "en/master/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } }, + { "Condition": { "KeyPrefixEquals": "en/v0.6.3/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "" } }, + { "Condition": { "KeyPrefixEquals": "jsearch/index.html" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "jsearch/" } }, + { "Condition": { "KeyPrefixEquals": "index/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "docker-io/" } }, + { "Condition": { "KeyPrefixEquals": "reference/api/index_api/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "reference/api/docker-io_api/" } } ] }