From 18773daf34cd6eb77b5c23838e249adf9f7198f2 Mon Sep 17 00:00:00 2001 From: cccs-rs <62077998+cccs-rs@users.noreply.github.com> Date: Tue, 27 Jul 2021 05:39:19 -0700 Subject: [PATCH] build based on build_type --- Dockerfile | 3 ++- pipelines/azure-build.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 2d2bb86..928a479 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,5 @@ -FROM cccs/assemblyline-v4-service-base:latest +ARG branch=latest +FROM cccs/assemblyline-v4-service-base:$branch ENV SERVICE_PATH metadefender.MetaDefender diff --git a/pipelines/azure-build.yaml b/pipelines/azure-build.yaml index 316da1f..b9c1406 100644 --- 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-metadefender:$TAG -t cccs/assemblyline-service-metadefender:$BUILD_TYPE . + docker build --build-arg version=$TAG --build-arg branch=$BUILD_TYPE -t cccs/assemblyline-service-metadefender:$TAG -t cccs/assemblyline-service-metadefender:$BUILD_TYPE . docker push cccs/assemblyline-service-metadefender --all-tags displayName: Deploy to Docker Hub