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

Dockerfile: use ARG to configure engine and distribution branches 

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-03-06 15:15:14 +01:00
parent 5d8ce076f7
commit f98576eaa2
No known key found for this signature in database
GPG Key ID: 76698F39D527CE8C
1 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Dockerfile
View File

@ -11,27 +11,32 @@
# #
# When the image is run, it starts Nginx and serves the docs at port 4000 # When the image is run, it starts Nginx and serves the docs at port 4000
# Engine
ARG ENGINE_BRANCH="18.09.x"
# Distribution
ARG DISTRIBUTION_BRANCH="release/2.6"
# Get basic configs and Jekyll env # Get basic configs and Jekyll env
FROM docs/docker.github.io:docs-builder AS builder FROM docs/docker.github.io:docs-builder AS builder
ENV TARGET=/usr/share/nginx/html ENV TARGET=/usr/share/nginx/html
WORKDIR /usr/src/app/md_source/ WORKDIR /usr/src/app/md_source/
# 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'
ARG ENGINE_BRANCH
ENV ENGINE_BRANCH=${ENGINE_BRANCH}
ENV ENGINE_SVN_BRANCH=branches/${ENGINE_BRANCH}
ARG DISTRIBUTION_BRANCH
ENV DISTRIBUTION_BRANCH=${DISTRIBUTION_BRANCH}
ENV DISTRIBUTION_SVN_BRANCH=branches/${DISTRIBUTION_BRANCH}
# Get the current docs from the checked out branch # Get the current docs from the checked out branch
COPY . . COPY . .
####### START UPSTREAM RESOURCES ######## ####### 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/18.09.x"
ENV ENGINE_BRANCH="18.09.x"
# Distribution
ENV DISTRIBUTION_SVN_BRANCH="branches/release/2.6"
ENV DISTRIBUTION_BRANCH="release/2.6"
# Fetch upstream resources # Fetch upstream resources
RUN bash ./_scripts/fetch-upstream-resources.sh . RUN bash ./_scripts/fetch-upstream-resources.sh .
####### END UPSTREAM RESOURCES ######## ####### END UPSTREAM RESOURCES ########