From ff3d33bbf498166fde2d70ffda12f18c3fef30f3 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Wed, 5 Mar 2025 18:05:37 +0100 Subject: [PATCH] build(docker/backend): switch from Dockerfile-based yesod-bin+hpack install to Makefile-based install --- Makefile | 4 ++++ docker/backend/Dockerfile | 7 ++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Makefile b/Makefile index e270e46f3..997f50289 100644 --- a/Makefile +++ b/Makefile @@ -297,6 +297,10 @@ endif # uniworx.cabal: # stack exec -- hpack --force +.stack: + stack install hpack + stack install yesod-bin + # HELP(compile-frontend): compile frontend assets --compile-frontend: node_modules assets esbuild.config.mjs frontend/src/env.sass npm run build diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 2c3e585ae..db3ccb209 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -25,12 +25,9 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \ --mount=type=cache,target=/var/lib/apt,sharing=locked \ apt-get -y update && apt-get -y install texlive-latex-recommended texlive-luatex texlive-plain-generic texlive-lang-german texlive-lang-english -ENV STACK_ROOT="/.stack" -RUN stack install yesod-bin -RUN stack install hpack - ARG PROJECT_DIR=/fradrive ENV PROJECT_DIR=${PROJECT_DIR} # RUN mkdir -p "${PROJECT_DIR}"; chmod -R 777 "${PROJECT_DIR}" WORKDIR ${PROJECT_DIR} -ENV HOME=${PROJECT_DIR} \ No newline at end of file +ENV HOME=${PROJECT_DIR} +ENV STACK_ROOT="${PROJECT_DIR}/.stack" \ No newline at end of file