From 0b9e55cfeaa147b78a01a72df282f67f6170760d Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Fri, 20 Dec 2024 16:59:26 +0100 Subject: [PATCH] ci(azure-pipelines): use /work/1 as mount-dir; copy repository recursively again --- azure-pipelines.yaml | 2 +- docker/backend/Dockerfile | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/azure-pipelines.yaml b/azure-pipelines.yaml index cb5bdb04b..0bdf92483 100644 --- a/azure-pipelines.yaml +++ b/azure-pipelines.yaml @@ -42,7 +42,7 @@ jobs: --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=$(Pipeline.Workspace) + --build-arg MOUNT_DIR=/work/1 # - job: BuildKitTest # container: # image: 'devfra.azurecr.io/de.fraport.trusted/buildkit:0.12.1' diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 241b33df1..447bd2891 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -22,8 +22,8 @@ RUN apt-get -y update && apt-get -y install texlive-latex-recommended texlive-lu ARG MOUNT_DIR=/mnt/fradrive ARG PROJECT_DIR=/fradrive -# RUN mkdir -p "${PROJECT_DIR}" -RUN if [ "${PROJECT_DIR}" != "${MOUNT_DIR}" ] ; then cp "${MOUNT_DIR}" "${PROJECT_DIR}" ; fi +RUN mkdir -p "${PROJECT_DIR}" +RUN if [ "${PROJECT_DIR}" != "${MOUNT_DIR}" ] ; then cp -r "${MOUNT_DIR}"/* "${PROJECT_DIR}" ; fi RUN mkdir -p "${PROJECT_DIR}/.stack" ENV STACK_ROOT="${PROJECT_DIR}/.stack"