From 255fa196d5d836ecd5d8826ea995d66223886d37 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Sun, 18 Aug 2024 03:06:41 +0200 Subject: [PATCH] chore(docker): use ENV args for make targets in frontend and backend docker --- docker/backend/Dockerfile | 5 ++--- docker/frontend/Dockerfile | 5 ++++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 7e0d1b4a4..cbc328792 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -1,8 +1,6 @@ # TODO: switch to uniworx registry debian image FROM debian:12.5 -ARG dev=-dev - RUN apt-get -y update RUN apt-get -y install haskell-stack @@ -10,4 +8,5 @@ RUN apt-get -y install libghc-zlib-dev libpq-dev WORKDIR /fradrive -ENTRYPOINT make -- --backend-build${dev} \ No newline at end of file +ENV FRADRIVE_MAKE_TARGET=backend-build +ENTRYPOINT pwd && ls -a . && make -- ${FRADRIVE_MAKE_TARGET} \ No newline at end of file diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 06071454e..4cbc8560f 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -20,4 +20,7 @@ RUN apt-get -y install exiftool WORKDIR /fradrive -ENTRYPOINT make frontend-build \ No newline at end of file +# RUN chown -R `id -u`:`id -g` "/.npm" + +ENV FRADRIVE_MAKE_TARGET=frontend-build +ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} \ No newline at end of file