diff options
| author | Dylan William Hardison <dylan@hardison.net> | 2017-10-07 00:14:56 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-07 00:14:56 +0200 |
| commit | 3e1b339cebc0f5259027e266f98f9b06f83f53a3 (patch) | |
| tree | 7d090b7aee0721d4c7a848402844eba524671be5 | |
| parent | bbfe30297f0a56d4d384f60e0ff20e7c67e08d7a (diff) | |
| download | bugzilla-3e1b339cebc0f5259027e266f98f9b06f83f53a3.tar.gz bugzilla-3e1b339cebc0f5259027e266f98f9b06f83f53a3.tar.xz | |
Bug 1406239 - Pass CircleCI Environmental variables to docker build process
| -rw-r--r-- | .circleci/config.yml | 7 | ||||
| -rw-r--r-- | Dockerfile | 8 |
2 files changed, 14 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index de289a3c5..f13b10a58 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -70,7 +70,12 @@ jobs: name: install git and ssh command: apk update && apk add git openssh-client - checkout - - run: docker build -t bmo . + - run: | + docker build \ + --build-arg CI="$CI" \ + --build-arg CIRCLE_SHA1="$CIRCLE_SHA1" \ + --build-arg CIRCLE_BUILD_NUM="$CIRCLE_BUILD_NUM" \ + -t bmo . - deploy: command: | docker build -t bmo . diff --git a/Dockerfile b/Dockerfile index 604f12c14..4a387f1a2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,13 @@ FROM mozillabteam/bmo-slim:20170927.1 +ARG CI +ARG CIRCLE_SHA1 +ARG CIRCLE_BUILD_NUM + +ENV CI=${CI} +ENV CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM} +ENV CIRCLE_SHA1=${CIRCLE_SHA1} + ENV HTTPD_StartServers=8 ENV HTTPD_MinSpareServers=5 ENV HTTPD_MaxSpareServers=20 |