From 67108a8f84670dca0e5feff43130f2f887700e13 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 13 Jan 2025 18:55:10 +0100 Subject: [PATCH] ci(azure-pipelines): use docker build in Bash@3 --- azure-pipelines.yaml | 8 ++++++++ docker/backend/Dockerfile | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index 884647804..159de9dc5 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -30,6 +30,14 @@ jobs: pwd ls -a . ls -a $(Build.Repository.LocalPath) + docker build \ + --build-arg HTTPS_PROXY=http://proxy.frankfurt-airport.de:8080 \ + --build-arg HTTP_PROXY=http://proxy.frankfurt-airport.de:8080 \ + --build-arg NO_PROXY='localhost,127.0.0.1,*.docker.internal,*.azmk8s.io,devfra.azurecr.io,devfra.westeurope.data.azurecr.io' \ + --build-arg FROM_IMG=devfra.azurecr.io/de.fraport.build/haskell \ + --build-arg MOUNT_DIR=$(Build.Repository.LocalPath) \ + --build-arg PROJECT_DIR=/fradrive \ + docker/backend/Dockerfile - task: Docker@2 name: dockerLoginDevFra displayName: Docker Login to devfra diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 50c99f1bf..3a33d407c 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -38,7 +38,7 @@ ARG MOUNT_DIR=/mnt/fradrive ARG PROJECT_DIR=/fradrive RUN mkdir -p "${PROJECT_DIR}" -COPY ${MOUNT_DIR} ${PROJECT_DIR} +COPY . ${PROJECT_DIR} # RUN if [ "${PROJECT_DIR}" != "${MOUNT_DIR}" ] ; then cp -r "${MOUNT_DIR}"/* "${PROJECT_DIR}" ; fi RUN mkdir -p "${PROJECT_DIR}/.stack"