Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update paths in docker file

Roland Geider564e65d33441
diff --git a/extras/docker/demo/Dockerfile b/extras/docker/demo/Dockerfile
index 2177b1fd6..4306bf0b4 100644
--- a/extras/docker/demo/Dockerfile
+++ b/extras/docker/demo/Dockerfile
@@ -39,9 +39,7 @@ RUN wget -O- https://deb.nodesource.com/setup_22.x | bash - \
&& rm -rf /var/lib/apt/lists/*
# Build the necessary python wheels
-# Note that the --mount is a workaround for https://github.com/rust-lang/cargo/issues/8719
WORKDIR /home/wger/src
-
COPY pyproject.toml /home/wger/src
COPY wger/version.py /home/wger/src/wger/
COPY wger/__init__.py /home/wger/src/wger/
@@ -49,9 +47,8 @@ COPY README.md /home/wger/src
COPY package.json /home/wger/src
COPY package-lock.json /home/wger/src
COPY wger/core/static /home/wger/src/wger/core/static
-RUN --mount=type=tmpfs,target=/root/.cargo pip3 wheel --no-cache-dir --wheel-dir /wheels --group docker .
-RUN cat package.json \
- && npm ci \
+RUN pip3 wheel --no-cache-dir --wheel-dir /wheels --group docker .
+RUN npm ci \
&& npm run build:css:sass
@@ -94,7 +91,8 @@ RUN chmod 0644 /etc/cron.d/wger \
&& touch /var/log/cron.log
COPY --chown=wger:www-data . /home/wger/src
-COPY --from=builder --chown=wger:wger /home/wger/src/wger/node_modules /home/wger/src/wger/node_modules
+COPY --chown=wger:wger --from=builder /home/wger/src/node_modules /home/wger/src/node_modules
+COPY --chown=wger:wger --from=builder /home/wger/src/wger/core/static/bootstrap-compiled.css /home/wger/src/core/static/bootstrap-compiled.css
# Set up the application
RUN ln -s /home/wger/static/CACHE /var/www
diff --git a/extras/docker/production/Dockerfile b/extras/docker/production/Dockerfile
index 0e64ef598..4ca85fcd3 100644
--- a/extras/docker/production/Dockerfile
+++ b/extras/docker/production/Dockerfile
@@ -44,8 +44,10 @@ WORKDIR /root/src
COPY pyproject.toml README.md /root/src/
COPY wger/version.py wger/__init__.py /root/src/wger/
-# NB: the --mount tmpfs is a workaround for https://github.com/rust-lang/cargo/issues/8719
-# --mount=type=tmpfs,target=/root/.cargo \
+# NB: this was a workound for https://github.com/rust-lang/cargo/issues/8719
+# which was needed when building rust dependencies for arm/v7. If we re-enable
+# the arch, we will probably need to add it again (same for demo, etc).
+# --mount=type=tmpfs,target=/root/.cargo
RUN pip3 wheel \
--no-cache-dir \
--wheel-dir /wheels \
@@ -76,7 +78,8 @@ EXPOSE 8000
# Set up the application
COPY --chown=wger:wger . /home/wger/src
-COPY --chown=wger:wger --from=builder /root/src/node_modules /home/wger/src/wger/node_modules
+COPY --chown=wger:wger --from=builder /root/src/node_modules /home/wger/src/node_modules
+COPY --chown=wger:wger --from=builder /root/src/wger/core/static/bootstrap-compiled.css /home/wger/src/core/static/bootstrap-compiled.css
COPY ${DOCKER_DIR}/settings.py /home/wger/src
COPY ${DOCKER_DIR}/settings.py /tmp/
COPY ${DOCKER_DIR}/entrypoint.sh /home/wger/entrypoint.sh
diff --git a/wger/settings_global.py b/wger/settings_global.py
index e979dc3c8..a3ed09b78 100644
--- a/wger/settings_global.py
+++ b/wger/settings_global.py
@@ -204,8 +204,6 @@ STATICFILES_DIRS = (
('node', os.path.join(BASE_DIR, '..', 'node_modules')),
)
-print(STATICFILES_DIRS)
-
#
# Email
#