diff options
author | Achilleas Pipinellis <axil@gitlab.com> | 2019-02-18 18:57:58 +0300 |
---|---|---|
committer | Achilleas Pipinellis <axil@gitlab.com> | 2019-02-18 18:57:58 +0300 |
commit | 3198ff5b64b05580ea41cf26690c00f99c12b3a4 (patch) | |
tree | 03c1d70900840827fa30482e09e8a6b1f1d6051b /Dockerfile.master | |
parent | 22cae422437c04dbf9a08b433d4cd13381449f44 (diff) |
Define env variables of --build-arg in Dockerfile.master
Diffstat (limited to 'Dockerfile.master')
-rw-r--r-- | Dockerfile.master | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Dockerfile.master b/Dockerfile.master index d10d3c08..63207919 100644 --- a/Dockerfile.master +++ b/Dockerfile.master @@ -1,6 +1,13 @@ # First use the bootstrap image to build master FROM registry.gitlab.com/gitlab-com/gitlab-docs:bootstrap as builder +# Set up needed environment variables that are called with --build-arg when +# the Docker image is built (see .gitlab-ci.yml). +ARG NANOC_ENV +ARG CI_COMMIT_REF_NAME +# If CI_COMMIT_REF_NAME is not set (local development), set it to master +ENV CI_COMMIT_REF_NAME ${CI_COMMIT_REF_NAME:-master} + # Build the docs from this branch COPY . /source/ RUN bundle exec rake setup_git default |