diff options
| author | Mary Anthony <mary@docker.com> | 2015-04-16 11:33:49 -0700 |
|---|---|---|
| committer | Jessica Frazelle <princess@docker.com> | 2015-04-16 11:37:59 -0700 |
| commit | fdd21bf032b61fd3a51bfbe5d9a6d6bf18329d92 (patch) | |
| tree | 0e6687748ff2bda6a4226c9120417053da98ba55 | |
| parent | d928dad8c8f90e764495cdb08d42596037c22647 (diff) | |
| download | docker-fdd21bf032b61fd3a51bfbe5d9a6d6bf18329d92.tar.gz | |
for 1.6
Signed-off-by: Mary Anthony <mary@docker.com>
(cherry picked from commit f44aa3b1fbe5e042fee0fb78507ebac35eca3d04)
| -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 490c492ea4..0ce0b8c292 100644 --- a/docs/s3_website.json +++ b/docs/s3_website.json @@ -39,7 +39,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/" } } ] } |