diff options
| author | Bob Micheletto <Micheletto@users.noreply.github.com> | 2018-02-05 23:22:09 +0100 |
|---|---|---|
| committer | Dylan William Hardison <dylan@hardison.net> | 2018-02-05 23:22:09 +0100 |
| commit | a04c1a35649b19f80e1c56cf907691daa7705abc (patch) | |
| tree | 7333c62cab95f67070bfa0d7eeee7429fe44e0d0 | |
| parent | ac80568834a7954046d6dcaed98d9460b3d34b09 (diff) | |
| download | bugzilla-a04c1a35649b19f80e1c56cf907691daa7705abc.tar.gz bugzilla-a04c1a35649b19f80e1c56cf907691daa7705abc.tar.xz | |
no bug - change version.json build setting to match dockerflow specifications (#389)
| -rw-r--r-- | .circleci/config.yml | 2 | ||||
| -rw-r--r-- | Dockerfile | 4 | ||||
| -rw-r--r-- | extensions/BMO/Extension.pm | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 75dfa3435..818b9338b 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -81,7 +81,7 @@ jobs: docker build \ --build-arg CI="$CI" \ --build-arg CIRCLE_SHA1="$CIRCLE_SHA1" \ - --build-arg CIRCLE_BUILD_NUM="$CIRCLE_BUILD_NUM" \ + --build-arg CIRCLE_BUILD_URL="$CIRCLE_BUILD_URL" \ -t bmo . - deploy: command: | diff --git a/Dockerfile b/Dockerfile index 1ad8d19be..5f4072a18 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,10 +2,10 @@ FROM mozillabteam/bmo-slim:20171228.1 ARG CI ARG CIRCLE_SHA1 -ARG CIRCLE_BUILD_NUM +ARG CIRCLE_BUILD_URL ENV CI=${CI} -ENV CIRCLE_BUILD_NUM=${CIRCLE_BUILD_NUM} +ENV CIRCLE_BUILD_URL=${CIRCLE_BUILD_URL} ENV CIRCLE_SHA1=${CIRCLE_SHA1} ENV HTTPD_StartServers=8 diff --git a/extensions/BMO/Extension.pm b/extensions/BMO/Extension.pm index e69d6f1e2..9be44f0f4 100644 --- a/extensions/BMO/Extension.pm +++ b/extensions/BMO/Extension.pm @@ -2553,7 +2553,7 @@ sub install_filesystem { source => $contribute->{repository}{url}, version => BUGZILLA_VERSION, commit => $ENV{CIRCLE_SHA1} // 'unknown', - build => $ENV{CIRCLE_BUILD_NUM} // 'unknown', + build => $ENV{CIRCLE_BUILD_URL} // 'unknown', }; $create_files->{'version.json'} = { |