diff options
| -rw-r--r-- | docs/Dockerfile | 6 | ||||
| -rw-r--r-- | docs/s3_website.json | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/docs/Dockerfile b/docs/Dockerfile index aa97313ae9..d5ffae4609 100644 --- a/docs/Dockerfile +++ b/docs/Dockerfile @@ -6,9 +6,9 @@ MAINTAINER Sven Dowideit <SvenDowideit@docker.com> (@SvenDowideit) # This section ensures we pull the correct version of each # sub project -ENV COMPOSE_BRANCH release -ENV SWARM_BRANCH v0.1.0 -ENV MACHINE_BRANCH v0.1.0 +ENV COMPOSE_BRANCH 1.2.0 +ENV SWARM_BRANCH v0.2.0 +ENV MACHINE_BRANCH master ENV DISTRIB_BRANCH master diff --git a/docs/s3_website.json b/docs/s3_website.json index 1142fc0d87..95e7109c6c 100644 --- a/docs/s3_website.json +++ b/docs/s3_website.json @@ -42,7 +42,8 @@ { "Condition": { "KeyPrefixEquals": "installation/openSUSE/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "installation/SUSE/" } }, { "Condition": { "KeyPrefixEquals": "contributing/contributing/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/who-written-for/" } }, { "Condition": { "KeyPrefixEquals": "contributing/devenvironment/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/set-up-prereqs/" } }, - { "Condition": { "KeyPrefixEquals": "contributing/docs_style-guide/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/doc-style/" } } + { "Condition": { "KeyPrefixEquals": "contributing/docs_style-guide/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "project/doc-style/" } }, + { "Condition": { "KeyPrefixEquals": "registry/" }, "Redirect": { "HostName": "$BUCKET", "ReplaceKeyPrefixWith": "registry/overview/" } } ] } |