docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8722 from SvenDowideit/sven-cannot-bash 

Add --dryrun to allow testing to the docs-release site, and then fix the...
This commit is contained in:
James Turnbull 2014-10-23 21:37:55 -04:00
parent 8f79bd964f 4bae6235c0
commit c6f242b88f
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -34,7 +34,7 @@ docs-shell: docs-build
$(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash $(DOCKER_RUN_DOCS) -p $(if $(DOCSPORT),$(DOCSPORT):)8000 "$(DOCKER_DOCS_IMAGE)" bash
docs-release: docs-build docs-release: docs-build
$(DOCKER_RUN_DOCS) -e BUILD_ROOT "$(DOCKER_DOCS_IMAGE)" ./release.sh $(DOCKER_RUN_DOCS) -e OPTIONS -e BUILD_ROOT "$(DOCKER_DOCS_IMAGE)" ./release.sh
test: build test: build
$(DOCKER_RUN_DOCKER) hack/make.sh binary cross test-unit test-integration test-integration-cli $(DOCKER_RUN_DOCKER) hack/make.sh binary cross test-unit test-integration test-integration-cli

10
docs/release.sh
View File

@ -14,6 +14,8 @@ If you're publishing the current release's documentation, also set `BUILD_ROOT=y
make AWS_S3_BUCKET=docs-stage.docker.com docs-release make AWS_S3_BUCKET=docs-stage.docker.com docs-release
will then push the documentation site to your s3 bucket. will then push the documentation site to your s3 bucket.
Note: you can add `OPTIONS=--dryrun` to see what will be done without sending to the server
EOF EOF
exit 1 exit 1
} }
@ -22,7 +24,7 @@ EOF
VERSION=$(cat VERSION) VERSION=$(cat VERSION)
if [ "$$AWS_S3_BUCKET" == "docs.docker.com" ]; then if [ "$AWS_S3_BUCKET" == "docs.docker.com" ]; then
if [ "${VERSION%-dev}" != "$VERSION" ]; then if [ "${VERSION%-dev}" != "$VERSION" ]; then
echo "Please do not push '-dev' documentation to docs.docker.com ($VERSION)" echo "Please do not push '-dev' documentation to docs.docker.com ($VERSION)"
exit 1 exit 1
@ -96,7 +98,7 @@ upload_current_documentation() {
done done
include="--include *.$i $include" include="--include *.$i $include"
echo "uploading *.$i" echo "uploading *.$i"
run="aws s3 sync --profile $BUCKET --cache-control \"max-age=3600\" --acl public-read \ run="aws s3 sync $OPTIONS --profile $BUCKET --cache-control \"max-age=3600\" --acl public-read \
$include \ $include \
--exclude *.text* \ --exclude *.text* \
--exclude *.*~ \ --exclude *.*~ \
@ -118,7 +120,9 @@ upload_current_documentation() {
done done
} }
setup_s3 if [ "$OPTIONS" != "--dryrun" ]; then
setup_s3
fi
# Default to only building the version specific docs so we don't clober the latest by accident with old versions # Default to only building the version specific docs so we don't clober the latest by accident with old versions
if [ "$BUILD_ROOT" == "yes" ]; then if [ "$BUILD_ROOT" == "yes" ]; then