Merge pull request #13 from CybercentreCanada/build_path

build based on build_type
CybercentreCanada · Jul 27, 2021 · 499471e · 499471e
2 parents 283d254 + b3ff157
commit 499471e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,5 @@
-FROM cccs/assemblyline-v4-service-base:latest AS base
+ARG branch=latest
+FROM cccs/assemblyline-v4-service-base:$branch AS base
 
 ENV SERVICE_PATH suricata_.suricata_.Suricata
 ENV SURICATA_VERSION 6.0.3

diff --git a/pipelines/azure-build.yaml b/pipelines/azure-build.yaml
@@ -25,6 +25,6 @@ stages:
         set -xv  # Echo commands before they are run
         export TAG=${BUILD_SOURCEBRANCH#"refs/tags/v"}
         if [[ "$TAG" == *stable* ]]; then export BUILD_TYPE=stable; else export BUILD_TYPE=latest; fi
-        docker build --build-arg version=$TAG -t cccs/assemblyline-service-suricata:$TAG -t cccs/assemblyline-service-suricata:$BUILD_TYPE .
+        docker build --build-arg version=$TAG --build-arg branch=$BUILD_TYPE -t cccs/assemblyline-service-suricata:$TAG -t cccs/assemblyline-service-suricata:$BUILD_TYPE .
         docker push cccs/assemblyline-service-suricata --all-tags
       displayName: Deploy to Docker Hub