From bee5c200b66aad3645dd918ebe2d5e57a2aa022f Mon Sep 17 00:00:00 2001 From: "Langhammer, Jens" Date: Tue, 1 Oct 2019 15:30:22 +0200 Subject: [PATCH] docker(minor): fix static build failing --- static.Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/static.Dockerfile b/static.Dockerfile index 376d20ff9..f6b69297d 100644 --- a/static.Dockerfile +++ b/static.Dockerfile @@ -1,14 +1,16 @@ -FROM docker.beryju.org/passbook/dev:latest as static-build +FROM docker.beryju.org/passbook/dev as static-build COPY ./passbook/ /app/passbook COPY ./manage.py /app/ -COPY ./requirements.txt /app/ WORKDIR /app/ +ENV PASSBOOK_POSTGRESQL__USER=passbook +# CI Password, same as in .gitlab-ci.yml +ENV PASSBOOK_POSTGRESQL__PASSWORD="EK-5jnKfjrGRm<77" RUN ./manage.py collectstatic --no-input FROM nginx:latest -COPY --from=static-build /app/static /static/static/ +COPY --from=static-build /app/static /static/_/static/ COPY ./passbook/core/nginx.conf /etc/nginx/nginx.conf