From 22a918c5e365ab3856b66a591ef57c902701c8a0 Mon Sep 17 00:00:00 2001 From: Sarah Vaupel Date: Mon, 19 Aug 2024 00:59:56 +0200 Subject: [PATCH] chore(docker): reintroduce ADD to frontend and backend Dockerfiles for gitlab-ci compatibility --- docker/backend/Dockerfile | 3 ++- docker/frontend/Dockerfile | 10 +++------- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/docker/backend/Dockerfile b/docker/backend/Dockerfile index 76ef5728a..b122a756c 100644 --- a/docker/backend/Dockerfile +++ b/docker/backend/Dockerfile @@ -6,10 +6,11 @@ RUN apt-get -y update RUN apt-get -y install haskell-stack git RUN apt-get -y install alex g++ happy libghc-zlib-dev libpq-dev +ADD . /fradrive WORKDIR /fradrive ENV HOME=/fradrive -# ENV STACK_ROOT=/fradrive/.stack +ENV STACK_ROOT=/fradrive/.stack ENV LANG=en_US.UTF-8 ENV FRADRIVE_MAKE_TARGET=backend-build diff --git a/docker/frontend/Dockerfile b/docker/frontend/Dockerfile index 4cbc8560f..54ba5b3f8 100644 --- a/docker/frontend/Dockerfile +++ b/docker/frontend/Dockerfile @@ -9,18 +9,14 @@ RUN apt-get -y install curl npm # Build and watch dependencies RUN apt-get -y install exiftool +# TODO: pin nodejs/npm version # RUN npm install -g n # RUN n 14.19.1 -# RUN mkdir /fradrive -# VOLUME [ "/fradrive" ] -# WORKDIR /fradrive - -# RUN pwd && ls -a . && make list - +ADD . /fradrive WORKDIR /fradrive -# RUN chown -R `id -u`:`id -g` "/.npm" +ENV HOME=/fradrive ENV FRADRIVE_MAKE_TARGET=frontend-build ENTRYPOINT make -- ${FRADRIVE_MAKE_TARGET} \ No newline at end of file