Merge pull request #317 from CybercentreCanada/rename-again-patch

Update build-base.yaml
CybercentreCanada · Feb 7, 2025 · fa05003 · fa05003
2 parents d390c67 + 2dcc101
commit fa05003
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/pipelines/templates/stages/build-base.yaml b/pipelines/templates/stages/build-base.yaml
@@ -16,27 +16,27 @@ stages:
               containerRegistry: cccstemp
           - script: |
               set -exv  # Echo commands before they are run
-              if [[ "$TAG" == *stable* ]]; then export BUILD_TYPE=stable; else export BUILD_TYPE=dev; fi
+              if [[ "$TAG" == *stable* ]]; then export BUILD_KIND=stable; else export BUILD_KIND=dev; fi
               export VERSION=${TAG/stable}
               export VERSION=${VERSION/beta/b}
-              export SERIES="`expr $TAG : '\([0-9]\+\.[0-9]\+\.\)'`${BUILD_TYPE}"
+              export SERIES="`expr $TAG : '\([0-9]\+\.[0-9]\+\.\)'`${BUILD_KIND}"
 
               cd assemblyline-base
               mv ../dist/ dist
 
-              docker pull cccstemp.azurecr.io/assemblyline-root-build:$BUILD_TYPE &
-              docker pull cccstemp.azurecr.io/assemblyline-root:$BUILD_TYPE &
+              docker pull cccstemp.azurecr.io/assemblyline-root-build:$BUILD_KIND &
+              docker pull cccstemp.azurecr.io/assemblyline-root:$BUILD_KIND &
               wait
 
               set +xv
               export IMAGE=cccstemp.azurecr.io/assemblyline
-              # docker build --build-arg version=$VERSION -t $IMAGE:$TAG -t $IMAGE:$BUILD_TYPE -t $IMAGE:$SERIES . | while read line ; do echo "$(date) | $line"; done;
+              # docker build --build-arg version=$VERSION -t $IMAGE:$TAG -t $IMAGE:$BUILD_KIND -t $IMAGE:$SERIES . | while read line ; do echo "$(date) | $line"; done;
               docker build --build-arg version=$VERSION \
                            --build-arg version_tag=$TAG \
-                           --build-arg build_image=cccstemp.azurecr.io/assemblyline-root-build:$BUILD_TYPE \
+                           --build-arg build_image=cccstemp.azurecr.io/assemblyline-root-build:$BUILD_KIND \
                            --build-arg base=cccstemp.azurecr.io/assemblyline-root \
-                           --build-arg tag=$BUILD_TYPE \
-                           -t $IMAGE:$TAG -t $IMAGE:$BUILD_TYPE -t $IMAGE:$SERIES . -f incremental.Dockerfile | while read line ; do echo "$(date) | $line"; done;
+                           --build-arg tag=$BUILD_KIND \
+                           -t $IMAGE:$TAG -t $IMAGE:$BUILD_KIND -t $IMAGE:$SERIES . -f incremental.Dockerfile | while read line ; do echo "$(date) | $line"; done;
               docker push $IMAGE -q --all-tags
             workingDirectory: $(Pipeline.Workspace)/working
             displayName: Build Base