Merge pull request #154 from CybercentreCanada/bugfix/nightly_build_i…

…mage Patch nightly builds to install libssl-dev for yara-python dep.
CybercentreCanada · Dec 13, 2023 · 5ebba5f · 5ebba5f
2 parents fd235ff + 4a49549
commit 5ebba5f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/build-image/Dockerfile b/build-image/Dockerfile
@@ -4,7 +4,7 @@ FROM $base
 
 # Get required apt packages
 RUN apt-get update \
-  && apt-get install -yy build-essential libffi-dev libfuzzy-dev \
+  && apt-get install -yy build-essential libffi-dev libfuzzy-dev libssl-dev \
   && rm -rf /var/lib/apt/lists/*
 
 # Install assemblyline dependencies, but don't keep assemblyline

diff --git a/pipelines/nightly-builds-dev.yaml b/pipelines/nightly-builds-dev.yaml
@@ -27,7 +27,7 @@ stages:
               command: login
               containerRegistry: cccstemp
           - script: |
-              set -xv  # Echo commands before they are run
+              set -exv  # Echo commands before they are run
               docker build -t common:local root-image -f root-image/common.Dockerfile
 
               export IMAGE=cccstemp.azurecr.io/assemblyline-root-build

diff --git a/pipelines/nightly-builds.yaml b/pipelines/nightly-builds.yaml
@@ -27,12 +27,12 @@ stages:
               command: login
               containerRegistry: cccstemp
           - script: |
-              set -xv  # Echo commands before they are run
+              set -exv  # Echo commands before they are run
               docker build -t common:local root-image -f root-image/common.Dockerfile
 
               export IMAGE=cccstemp.azurecr.io/assemblyline-root-build
               export BUILD_TYPE=stable
-              
+
               docker build --build-arg base=common:local -t $IMAGE:$BUILD_TYPE build-image
               docker push $IMAGE -q --all-tags