From 6051302b4d3c0e55a6cc5652670c9938e3122570 Mon Sep 17 00:00:00 2001 From: Misty Stanley-Jones Date: Tue, 26 Dec 2017 23:17:44 -0800 Subject: [PATCH] Use multistage build for master (#5369) --- Dockerfile | 94 +++++++++++++++++++++------- Dockerfile.archive | 11 ++++ README.md | 79 ++++++++++++++++++++++- _config.yml | 4 +- _scripts/fetch-upstream-resources.sh | 74 ++++++++++++---------- hooks/post_push | 14 ----- 6 files changed, 206 insertions(+), 70 deletions(-) create mode 100644 Dockerfile.archive delete mode 100755 hooks/post_push diff --git a/Dockerfile b/Dockerfile index 080890abf30..2b334f2aa91 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,35 +1,87 @@ -FROM docs/docker.github.io:docs-base +# This Dockerfile builds the docs for https://docs.docker.com/ +# from the master branch of https://github.com/docker/docker.github.io +# +# Here is the sequence: +# 1. Set up the build +# 2. Fetch upstream resources +# 3. Build master +# 4. Copy static HTML from already-built archive images +# 5. Copy Nginx config +# +# When the image is run, it starts Nginx and serves the docs at port 4000 -# docs-base contains: GitHub Pages, nginx, wget, svn, and the docs archives, -# running on Alpine. See the contents of docs-base at: -# https://github.com/docker/docker.github.io/tree/docs-base +# Get basic configs and Jekyll env +FROM docs/docker.github.io:docs-builder AS builder -# First, build non-edge (all of this is duplicated later -- that is on purpose) +# Set the target again +ENV TARGET=/usr/share/nginx/html -# Copy master into target directory (skipping files / folders in .dockerignore) -# These files represent the current docs -COPY . md_source +# Set the source directory to md_source +ENV SOURCE=md_source -# Move built html into md_source directory so we can reuse the target directory -# to hold the static output. -# Pull reference docs from upstream locations, then build the master docs -# into static HTML in the "target" directory using Jekyll -# then nuke the md_source directory. +# Get the current docs from the checked out branch +# ${SOURCE} will contain a directory for each archive +COPY . ${SOURCE} +####### START UPSTREAM RESOURCES ######## +# Set vars used by fetch-upstream-resources.sh script ## Branch to pull from, per ref doc ## To get master from svn the svn branch needs to be 'trunk'. To get a branch from svn it needs to be 'branches/branchname' # Engine -ENV ENGINE_SVN_BRANCH="branches/17.06.x" -ENV ENGINE_BRANCH="17.06.x" +ENV ENGINE_SVN_BRANCH="branches/17.09.x" +ENV ENGINE_BRANCH="17.09.x" # Distribution ENV DISTRIBUTION_SVN_BRANCH="branches/release/2.6" ENV DISTRIBUTION_BRANCH="release/2.6" -RUN /sbin/apk --update add bash \ - && bash ./md_source/_scripts/fetch-upstream-resources.sh \ - && jekyll build -s md_source -d target --config md_source/_config.yml \ - && rm -rf target/apidocs/layouts \ - && find target -type f -name '*.html' -print0 | xargs -0 sed -i 's#href="https://docs.docker.com/#href="/#g' \ - && rm -rf md_source +# Fetch upstream resources +RUN bash ./${SOURCE}/_scripts/fetch-upstream-resources.sh ${SOURCE} +####### END UPSTREAM RESOURCES ######## + + +# Build the static HTML, now that everything is in place + +RUN jekyll build -s ${SOURCE} -d ${TARGET} --config ${SOURCE}/_config.yml + +# Fix up some links, don't touch the archives +RUN find ${TARGET} -type f -name '*.html' | grep -vE "v[0-9]+\." | while read i; do sed -i 's#href="https://docs.docker.com/#href="/#g' "$i"; done + +# BUILD OF MASTER DOCS IS NOW DONE! +# Reset to alpine so we don't get any docs source or extra apps +FROM nginx:alpine + +# Set the target again +ENV TARGET=/usr/share/nginx/html + +# Get the built docs output from the previous step +COPY --from=builder ${TARGET} ${TARGET} + +# Get all the archive static HTML and put it into place +# To add a new archive, add it here +# AND ALSO edit _data/docsarchives/archives.yaml to add it to the drop-down +COPY --from=docs/docker.github.io:v1.4 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v1.5 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v1.6 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v1.7 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v1.8 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v1.9 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v1.10 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v1.11 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v1.12 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v1.13 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v17.03 ${TARGET} ${TARGET} +COPY --from=docs/docker.github.io:v17.06 ${TARGET} ${TARGET} + +# The archives are self-browseable and each come with an index.html. This creates +# a conflict with the index.html and 404.html from the master build. The easiest +# solution is to just overwrite them again here. +COPY --from=builder ${TARGET}/index.html ${TARGET}/index.html +COPY --from=builder ${TARGET}/404.html ${TARGET}/404.html + +# Get the nginx config from the nginx-onbuild image +COPY --from=docs/docker.github.io:nginx-onbuild /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/default.conf + +# Serve the site (target), which is now all static HTML +CMD echo -e "Docker docs are viewable at:\nhttp://0.0.0.0:4000"; exec nginx -g 'daemon off;' \ No newline at end of file diff --git a/Dockerfile.archive b/Dockerfile.archive new file mode 100644 index 00000000000..dc349659a2a --- /dev/null +++ b/Dockerfile.archive @@ -0,0 +1,11 @@ +# Set to the version for this archive +ARG VER=vXX + +# This image comes from the Dockerfile.onbuild file in the docs-builder branch +# https://github.com/docker/docker.github.io/blob/docs-builder/Dockerfile.onbuild +FROM docs/docker.github.io:docs-builder-onbuild AS builder + +# Reset the docs:onbuild image, which is based on nginx:alpine +# This image comes from the Dockerfile in the nginx-onbuild branch +# https://github.com/docker/docker.github.io/blob/nginx-onbuild/Dockerfile +FROM docs/docker.github.io:nginx-onbuild \ No newline at end of file diff --git a/README.md b/README.md index 27b52b678d9..8f2d6f9dd7b 100644 --- a/README.md +++ b/README.md @@ -175,7 +175,7 @@ To read the docs offline, you can use either a standalone container or a swarm s To see all available tags, go to [Docker Cloud](https://cloud.docker.com/app/docs/repository/docker/docs/docker.github.io/tags). The following examples use the `latest` tag: - + - Run a single container: ```bash @@ -278,6 +278,83 @@ Bootstrap JS are loaded. > **Note**: In general, this is a bad idea. +## Building archives and the live published docs + +All the images described below are automatically built using Docker Cloud. To +build the site manually, from scratch, including all utility and archive +images, see the [README in the publish-tools branch](https://github.com/docker/docker.github.io/blob/publish-tools/README.md). + +- Some utility images are built from Dockerfiles in the `publish-tools` branch. + See its [README](https://github.com/docker/docker.github.io/blob/publish-tools/README.md) + for details. +- Each archive branch automatically builds an image tagged + `docs/docker.github.io:v` when a change is merged into that branch. +- The `master` branch has a Dockerfile which uses the static HTML from each + archive image, in combination with the Markdown + files in `master` and some upstream resources which are fetched at build-time, + to create the full site at https://docs.docker.com/. All + of the long-running branches, such as `vnext-engine`, `vnext-compose`, etc, + use the same logic. + +## Creating a new archive + +When a new Docker CE Stable version is released, the previous state of `master` +is archived into a version-specific branch like `v17.09`, by doing the following: + +1. Create branch based off the commit hash before the new version was released. + + ```bash + $ git checkout + $ git checkout -b v17.09 + ``` + +2. Run the `_scripts/fetch-upstream-resources.sh` script. This puts static + copies of the files in place that the `master` build typically fetches + each build. + + ```bash + $ _scripts/fetch-upstream/resources.sh + ``` + +3. Overwrite the `Dockerfile` with the `Dockerfile.archive` (use `cp` rather + than `mv` so you don't inadvertently remove either file). Edit the resulting + `Dockerfile` and set the `VER` build argument to the appropriate value, like + `v17.09`. + + ```bash + $ mv Dockerfile.archive Dockerfile + $ vi Dockerfile + + < edit the variable and save > + ``` + +4. Do `git status` and add all changes, being careful not to add anything extra + by accident. Commit your work. + + ```bash + $ git status + $ git add + $ git add (etc etc etc) + $ git commit -m "Creating archive for 17.09 docs" + ``` + +5. Make sure the archive builds. + + ```bash + $ docker build -t docker build -t docker.github.io/docs:v17.09 . + $ docker run --rm -it -p 4000:4000 docker.github.io/docs:v17.09 + ``` + + After the `docker run` command, browse to `http://localhost:4000/` and + verify that the archive is self-browseable. + +6. Push the branch to the upstream repository. Do not create a pull request + as there is no reference branch to compare against. + + ```bash + $ git push upstream v17.09 + ``` + ## Copyright and license Code and documentation copyright 2017 Docker, inc, released under the Apache 2.0 license. diff --git a/_config.yml b/_config.yml index 534c5114971..67c73849c07 100644 --- a/_config.yml +++ b/_config.yml @@ -11,13 +11,15 @@ permalink: pretty safe: false lsi: false url: https://docs.docker.com +# This needs to have all the directories you expect to be in the archives (delivered by docs-base in the Dockerfile) keep_files: ["v1.4", "v1.5", "v1.6", "v1.7", "v1.8", "v1.9", "v1.10", "v1.11", "v1.12", "v1.13", "v17.03", "v17.06"] +exclude: ["_scripts", "apidocs/layouts", "Gemfile", "hooks"] # Component versions -- address like site.docker_ce_stable_version # You can't have - characters in these for non-YAML reasons docker_ce_stable_version: "17.09" -latest_stable_docker_engine_api_version: "1.32" +latest_stable_docker_engine_api_version: "1.33" docker_ce_edge_version: "17.11" docker_ee_version: "17.06" compose_version: "1.18.0" diff --git a/_scripts/fetch-upstream-resources.sh b/_scripts/fetch-upstream-resources.sh index 3b37e1609cf..cf785ef4415 100755 --- a/_scripts/fetch-upstream-resources.sh +++ b/_scripts/fetch-upstream-resources.sh @@ -8,17 +8,25 @@ # Parse some variables from _config.yml and make them available to this script # This only finds top-level variables with _version in them that don't have any # leading space. This is brittle! + +SOURCE="$1" + +if [ -z "$SOURCE" ]; then + echo "No source passed in, assuming md_source/..." + SOURCE="md_source" +fi + while read i; do # Store the key as a variable name and the value as the variable value varname=$(echo "$i" | sed 's/"//g' | awk -F ':' {'print $1'} | tr -d '[:space:]') varvalue=$(echo "$i" | sed 's/"//g' | awk -F ':' {'print $2'} | tr -d '[:space:]') echo "Setting \$${varname} to $varvalue" declare "$varname=$varvalue" -done < <(cat md_source/_config.yml |grep '_version:' |grep '^[a-z].*') +done < <(cat ${SOURCE}/_config.yml |grep '_version:' |grep '^[a-z].*') # Replace variable in toc.yml with value from above #echo "Replacing the string 'site.latest_stable_docker_engine_api_version' in _data/toc.yml with $latest_stable_docker_engine_api_version" -sed -i "s/{{ site.latest_stable_docker_engine_api_version }}/$latest_stable_docker_engine_api_version/g" md_source/_data/toc.yaml +sed -i "s/{{ site.latest_stable_docker_engine_api_version }}/$latest_stable_docker_engine_api_version/g" ${SOURCE}/_data/toc.yaml # Engine stable ENGINE_SVN_BRANCH="branches/17.09" @@ -30,17 +38,17 @@ DISTRIBUTION_SVN_BRANCH="branches/release/2.6" DISTRIBUTION_BRANCH="release/2.6" # Directories to get via SVN. We use this because you can't use git to clone just a portion of a repository -svn co https://github.com/docker/docker-ce/"$ENGINE_SVN_BRANCH"/components/cli/docs/extend md_source/engine/extend || (echo "Failed engine/extend download" && exit -1) -svn co https://github.com/docker/docker-ce/"$ENGINE_SVN_BRANCH"/components/engine/docs/api md_source/engine/api || (echo "Failed engine/api download" && exit -1) # This will only get you the old API MD files 1.18 through 1.24 -svn co https://github.com/docker/distribution/"$DISTRIBUTION_SVN_BRANCH"/docs/spec md_source/registry/spec || (echo "Failed registry/spec download" && exit -1) -svn co https://github.com/docker/compliance/trunk/docs/compliance md_source/compliance || (echo "Failed docker/compliance download" && exit -1) +svn co https://github.com/docker/docker-ce/"$ENGINE_SVN_BRANCH"/components/cli/docs/extend ${SOURCE}engine/extend || (echo "Failed engine/extend download" && exit -1) +svn co https://github.com/docker/docker-ce/"$ENGINE_SVN_BRANCH"/components/engine/docs/api ${SOURCE}/engine/api || (echo "Failed engine/api download" && exit -1) # This will only get you the old API MD files 1.18 through 1.24 +svn co https://github.com/docker/distribution/"$DISTRIBUTION_SVN_BRANCH"/docs/spec ${SOURCE}/registry/spec || (echo "Failed registry/spec download" && exit -1) +svn co https://github.com/docker/compliance/trunk/docs/compliance ${SOURCE}/compliance || (echo "Failed docker/compliance download" && exit -1) # Get the Library docs -svn co https://github.com/docker-library/docs/trunk md_source/_samples/library || (echo "Failed library download" && exit -1) +svn co https://github.com/docker-library/docs/trunk ${SOURCE}/_samples/library || (echo "Failed library download" && exit -1) # Remove symlinks to maintainer.md because they break jekyll and we don't use em -find md_source/_samples/library -maxdepth 9 -type l -delete +find ${SOURCE}/_samples/library -maxdepth 9 -type l -delete # Loop through the README.md files, turn them into rich index.md files -FILES=$(find md_source/_samples/library -type f -name 'README.md') +FILES=$(find ${SOURCE}/_samples/library -type f -name 'README.md') for f in $FILES do curdir=$(dirname "${f}") @@ -73,7 +81,7 @@ do echo GitHub repo: \["${gitrepo}"\]\("${gitrepo}"\)\{: target="_blank"\} >> ${curdir}/front-matter.txt echo >> ${curdir}/front-matter.txt fi - cat ${curdir}/front-matter.txt md_source/_samples/boilerplate.txt > ${curdir}/header.txt + cat ${curdir}/front-matter.txt ${SOURCE}/_samples/boilerplate.txt > ${curdir}/header.txt echo {% raw %} >> ${curdir}/header.txt cat ${curdir}/header.txt ${curdir}/README.md > ${curdir}/index.md echo {% endraw %} >> ${curdir}/index.md @@ -83,41 +91,41 @@ done # Get the Engine APIs that are in Swagger # Be careful with the locations on Github for these -wget -O md_source/engine/api/v1.25/swagger.yaml https://raw.githubusercontent.com/docker/docker/v1.13.0/api/swagger.yaml || (echo "Failed 1.25 swagger download" && exit -1) -wget -O md_source/engine/api/v1.26/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.03.0-ce/api/swagger.yaml || (echo "Failed 1.26 swagger download" && exit -1) -wget -O md_source/engine/api/v1.27/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.03.1-ce/api/swagger.yaml || (echo "Failed 1.27 swagger download" && exit -1) +wget -O ${SOURCE}/engine/api/v1.25/swagger.yaml https://raw.githubusercontent.com/docker/docker/v1.13.0/api/swagger.yaml || (echo "Failed 1.25 swagger download" && exit -1) +wget -O ${SOURCE}/engine/api/v1.26/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.03.0-ce/api/swagger.yaml || (echo "Failed 1.26 swagger download" && exit -1) +wget -O ${SOURCE}/engine/api/v1.27/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.03.1-ce/api/swagger.yaml || (echo "Failed 1.27 swagger download" && exit -1) # Get the Edge API Swagger # When you change this you need to make sure to copy the previous # directory into a new one in the docs git and change the index.html -wget -O md_source/engine/api/v1.28/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.04.0-ce/api/swagger.yaml || (echo "Failed 1.28 swagger download or the 1.28 directory doesn't exist" && exit -1) -wget -O md_source/engine/api/v1.29/swagger.yaml https://raw.githubusercontent.com/docker/docker/17.05.x/api/swagger.yaml || (echo "Failed 1.29 swagger download or the 1.29 directory doesn't exist" && exit -1) +wget -O ${SOURCE}/engine/api/v1.28/swagger.yaml https://raw.githubusercontent.com/docker/docker/v17.04.0-ce/api/swagger.yaml || (echo "Failed 1.28 swagger download or the 1.28 directory doesn't exist" && exit -1) +wget -O ${SOURCE}/engine/api/v1.29/swagger.yaml https://raw.githubusercontent.com/docker/docker/17.05.x/api/swagger.yaml || (echo "Failed 1.29 swagger download or the 1.29 directory doesn't exist" && exit -1) # New location for swagger.yaml for 17.06 -wget -O md_source/engine/api/v1.30/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.06/components/engine/api/swagger.yaml || (echo "Failed 1.30 swagger download or the 1.30 directory doesn't exist" && exit -1) -wget -O md_source/engine/api/v1.31/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.07/components/engine/api/swagger.yaml || (echo "Failed 1.31 swagger download or the 1.31 directory doesn't exist" && exit -1) -wget -O md_source/engine/api/v1.32/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.09/components/engine/api/swagger.yaml || (echo "Failed 1.32 swagger download or the 1.32 directory doesn't exist" && exit -1) -wget -O md_source/engine/api/v1.33/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.10/components/engine/api/swagger.yaml || (echo "Failed 1.33 swagger download or the 1.33 directory doesn't exist" && exit -1) -wget -O md_source/engine/api/v1.34/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.11/components/engine/api/swagger.yaml || (echo "Failed 1.34 swagger download or the 1.34 directory doesn't exist" && exit -1) +wget -O ${SOURCE}/engine/api/v1.30/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.06/components/engine/api/swagger.yaml || (echo "Failed 1.30 swagger download or the 1.30 directory doesn't exist" && exit -1) +wget -O ${SOURCE}/engine/api/v1.31/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.07/components/engine/api/swagger.yaml || (echo "Failed 1.31 swagger download or the 1.31 directory doesn't exist" && exit -1) +wget -O ${SOURCE}/engine/api/v1.32/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.09/components/engine/api/swagger.yaml || (echo "Failed 1.32 swagger download or the 1.32 directory doesn't exist" && exit -1) +wget -O ${SOURCE}/engine/api/v1.33/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.10/components/engine/api/swagger.yaml || (echo "Failed 1.33 swagger download or the 1.33 directory doesn't exist" && exit -1) +wget -O ${SOURCE}/engine/api/v1.34/swagger.yaml https://raw.githubusercontent.com/docker/docker-ce/17.11/components/engine/api/swagger.yaml || (echo "Failed 1.34 swagger download or the 1.34 directory doesn't exist" && exit -1) # Get dockerd.md for stable and edge, from upstream -wget -O md_source/engine/reference/commandline/dockerd.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/commandline/dockerd.md || (echo "Failed to fetch stable dockerd.md" && exit -1) -wget -O md_source/edge/engine/reference/commandline/dockerd.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_EDGE_BRANCH"/components/cli/docs/reference/commandline/dockerd.md || (echo "Failed to fetch edge dockerd.md" && exit -1) +wget -O ${SOURCE}/engine/reference/commandline/dockerd.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/commandline/dockerd.md || (echo "Failed to fetch stable dockerd.md" && exit -1) +wget -O ${SOURCE}/edge/engine/reference/commandline/dockerd.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_EDGE_BRANCH"/components/cli/docs/reference/commandline/dockerd.md || (echo "Failed to fetch edge dockerd.md" && exit -1) # Add an admonition to the edge dockerd file EDGE_DOCKERD_INCLUDE='{% include edge_only.md section=\"dockerd\" %}' -sed -i "s/^#\ daemon/${EDGE_DOCKERD_INCLUDE}/1" md_source/edge/engine/reference/commandline/dockerd.md +sed -i "s/^#\ daemon/${EDGE_DOCKERD_INCLUDE}/1" ${SOURCE}/edge/engine/reference/commandline/dockerd.md # Get a few one-off files that we use directly from upstream -wget -O md_source/engine/reference/builder.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/builder.md || (echo "Failed engine/reference/builder.md download" && exit -1) -wget -O md_source/engine/reference/run.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/run.md || (echo "Failed engine/reference/run.md download" && exit -1) +wget -O ${SOURCE}/engine/reference/builder.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/builder.md || (echo "Failed engine/reference/builder.md download" && exit -1) +wget -O ${SOURCE}/engine/reference/run.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/run.md || (echo "Failed engine/reference/run.md download" && exit -1) # Adjust this one when Edge != Stable -wget -O md_source/edge/engine/reference/run.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/run.md || (echo "Failed engine/reference/run.md download" && exit -1) -wget -O md_source/engine/reference/commandline/cli.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/commandline/cli.md || (echo "Failed engine/reference/commandline/cli.md download" && exit -1) -wget -O md_source/engine/deprecated.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/deprecated.md || (echo "Failed engine/deprecated.md download" && exit -1) -wget -O md_source/registry/configuration.md https://raw.githubusercontent.com/docker/distribution/"$DISTRIBUTION_BRANCH"/docs/configuration.md || (echo "Failed registry/configuration.md download" && exit -1) +wget -O ${SOURCE}/edge/engine/reference/run.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/run.md || (echo "Failed engine/reference/run.md download" && exit -1) +wget -O ${SOURCE}/engine/reference/commandline/cli.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/reference/commandline/cli.md || (echo "Failed engine/reference/commandline/cli.md download" && exit -1) +wget -O ${SOURCE}/engine/deprecated.md https://raw.githubusercontent.com/docker/docker-ce/"$ENGINE_BRANCH"/components/cli/docs/deprecated.md || (echo "Failed engine/deprecated.md download" && exit -1) +wget -O ${SOURCE}/registry/configuration.md https://raw.githubusercontent.com/docker/distribution/"$DISTRIBUTION_BRANCH"/docs/configuration.md || (echo "Failed registry/configuration.md download" && exit -1) # Remove things we don't want in the build -rm md_source/registry/spec/api.md.tmpl -rm -rf md_source/apidocs/cloud-api-source -rm -rf md_source/tests -rm md_source/_samples/library/index.md +rm ${SOURCE}/registry/spec/api.md.tmpl +rm -rf ${SOURCE}/apidocs/cloud-api-source +rm -rf ${SOURCE}/tests +rm ${SOURCE}/_samples/library/index.md diff --git a/hooks/post_push b/hooks/post_push deleted file mode 100755 index 815d2d60a47..00000000000 --- a/hooks/post_push +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -set -e - -# If this is an archive branch (like v1.4 or v1.11), -# build and push the docs-base branch at the end of -# a successful build of the branch - -if [[ $SOURCE_BRANCH =~ (^v1\.[0-9]+$|^v1[7-9]\.[0-9]+$) ]]; then - git fetch origin docs-base:docs-base --depth 1 || ( echo "Couldn't fetch docs-base." && exit 1 ) - git checkout docs-base || ( echo "Couldn't check out docs-base." && exit 1 ) - docker build -t docs/docker.github.io:docs-base . || ( echo "Couldn't build docs-base Dockerfile." && exit 1 ) - docker push docs/docker.github.io:docs-base || ( echo "Coudn't push new docs-base image." && exit 1 ) -fi