no bug - change version.json build setting to match dockerflow specifications (#389)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 75dfa34350dbbcd1d15b255f8a3485e0dd194019..818b9338be734444128753225970a67aad14ecfb 100644 (file)
--- 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 1ad8d19be96ec3812a3633a9a20f0bec02d1a2a2..5f4072a18c9e17ed106a2fb9f501360a66a7e57f 100644 (file)
--- 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 e69d6f1e2a4e11680151970368d144a60c67ccd1..9be44f0f4b4a86a277e2fdd5eec3f8de6dcc6a24 100644 (file)
--- 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'} = {