From 86fb6529cff4136306acae73a34d6a07c424b891 Mon Sep 17 00:00:00 2001 From: Roland Geider Date: Tue, 29 Apr 2025 14:00:45 +0200 Subject: [PATCH] Install the "regular" wger project for development --- extras/docker/development/Dockerfile | 7 +------ extras/docker/production/Dockerfile | 5 +++-- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfile index 5665d4438..1c98a2a79 100644 --- a/extras/docker/development/Dockerfile +++ b/extras/docker/development/Dockerfile @@ -20,10 +20,5 @@ RUN apt-get update && \ && ln -s /usr/bin/yarnpkg /usr/bin/yarn \ && ln -s /usr/bin/sassc /usr/bin/sass -COPY ./pyproject.toml /tmp/pyproject.toml -COPY ./wger/version.py /tmp/wger/version.py -COPY ./wger/__init__.py /tmp/wger/__init__.py -COPY ./README.md /tmp/README.md - USER wger -RUN pip3 install --break-system-packages --user --group dev /tmp/ +RUN pip3 install --break-system-packages --user --group dev --editable . diff --git a/extras/docker/production/Dockerfile b/extras/docker/production/Dockerfile index 855a1b284..34aecdf0f 100644 --- a/extras/docker/production/Dockerfile +++ b/extras/docker/production/Dockerfile @@ -89,10 +89,11 @@ COPY ${DOCKER_DIR}/celery/start-flower /start-flower RUN chmod +x /home/wger/entrypoint.sh \ && chmod +x /start-beat \ && chmod +x /start-worker \ - && chmod +x /start-flower + && chmod +x /start-flower \ + && chown wger:wger /home/wger/src USER wger -RUN pip3 install --break-system-packages --user -e . \ +RUN pip3 install --break-system-packages --user --editable . \ && mkdir ~/media \ && mkdir ~/static \ && mkdir ~/beat \