Merge pull request #1990 from wger-project/feature/update-translations-docker

Compile django translations on docker build time

Author: rolandgeider

.dockerignore

@@ -1,17 +1,32 @@
+# Git
+.git
+.gitignore
+
+# Docker
+Dockerfile*
+.dockerignore
+
+# Python
+__pycache__/
+*.pyo
+*.pyd
 .venv
 venv
-node_modules
 *.sqlite3
-**/__pycache__
 *.egg-info
 
+# IDE / OS specific
+.idea/
+.vscode/
+*.swp
+.DS_Store
+
 # Other files and folders
 /coverage.lcov
 /media/
 /static/
 /db/
-/extras/docker/open-food-facts/dump/*.tar.gz
-/extras/docker/open-food-facts/dump/off/*
+/extras/open-food-facts/dump/
 /extras/authors/commits_cache/
 /extras/authors/*.md
 /extras/scripts/*.json

extras/docker/base/Dockerfile

@@ -10,7 +10,7 @@
 
 FROM ubuntu:24.04
 
-LABEL maintainer="Roland Geider <[email protected]>"
+LABEL org.opencontainers.image.authors="wger team <[email protected]>"
 
 # Install dependencies
 ENV DEBIAN_FRONTEND=noninteractive

extras/docker/demo/Dockerfile

@@ -20,7 +20,8 @@
 FROM wger/base:latest AS builder
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt update \
+RUN wget -O- https://deb.nodesource.com/setup_22.x | bash - \
+  && apt update \
   && apt install --no-install-recommends -y \
       build-essential \
       python3-dev \
@@ -32,31 +33,33 @@ RUN apt update \
       libpq-dev \
       rustc \
       cargo \
-      yarnpkg \
       sassc \
-    && ln -s /usr/bin/yarnpkg /usr/bin/yarn \
-    && ln -s /usr/bin/sassc /usr/bin/sass
+      nodejs \
+    && ln -s /usr/bin/sassc /usr/bin/sass \
+    && rm -rf /var/lib/apt/lists/* \
+    && corepack enable
 
 # Build the necessary python wheels
 # Note that the --mount is a workaround for https://github.com/rust-lang/cargo/issues/8719
-COPY pyproject.toml .
-COPY wger/version.py ./wger/version.py
-COPY wger/__init__.py ./wger/__init__.py
-COPY README.md ./README.md
-RUN --mount=type=tmpfs,target=/root/.cargo pip3 wheel --no-cache-dir --wheel-dir /wheels --group docker . \
-  && pip3 install --break-system-packages --user --no-cache-dir /wheels/*
-
-COPY . /home/wger/src
 WORKDIR /home/wger/src
-RUN yarn install \
-    && yarn build:css:sass
+
+COPY pyproject.toml /home/wger/src
+COPY wger/version.py /home/wger/src/wger/
+COPY wger/__init__.py /home/wger/src/wger/
+COPY README.md /home/wger/src
+COPY package.json /home/wger/src
+COPY yarn.lock /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 . \
+  && yarn install \
+  && yarn build:css:sass
 
 
 ########
 # Final
 ########
 FROM wger/base:latest AS final
-LABEL maintainer="Roland Geider <[email protected]>"
+LABEL org.opencontainers.image.authors="wger team <[email protected]>"
 ENV TERM=xterm
 ARG DOCKER_DIR=./extras/docker/demo
 EXPOSE 80
@@ -90,7 +93,6 @@ RUN chmod 0644 /etc/cron.d/wger \
   && chmod +x /home/wger/venvwrapper \
   && touch /var/log/cron.log
 
-COPY --from=builder /wheels /wheels
 COPY --chown=wger:www-data . /home/wger/src
 COPY --from=builder --chown=wger:wger /home/wger/src/wger/core/static/yarn /home/wger/src/wger/core/static/yarn
 
@@ -107,7 +109,7 @@ RUN mkdir -p ~/static/CACHE ~/media \
     && ln -s /home/wger/static/CACHE /home/wger/src/CACHE \
     && chmod g+w /home/wger/static/CACHE
 
-RUN . /home/wger/venv/bin/activate \
+RUN --mount=type=bind,from=builder,source=/wheels,target=/wheels  . /home/wger/venv/bin/activate \
     && pip install --upgrade pip \
     && pip install --no-cache /wheels/* \
     && pip install -e . \

extras/docker/production/Dockerfile

@@ -14,7 +14,9 @@
 FROM wger/base:latest AS builder
 ARG DEBIAN_FRONTEND=noninteractive
 
-RUN apt update \
+# Need a newer node than what's in ubuntu
+RUN wget -O- https://deb.nodesource.com/setup_22.x | bash - \
+    && apt update \
     && apt install --no-install-recommends -y \
       build-essential \
       python3-dev \
@@ -25,61 +27,67 @@ RUN apt update \
       libwebp-dev \
       libpq-dev \
       rustc \
-      yarnpkg \
       sassc \
-      cargo
+      cargo \
+      unzip \
+      nodejs \
+    && rm -rf /var/lib/apt/lists/* \
+    && corepack enable \
+    && mkdir -p /root/src/wger/core/static
+
 
-# Build the necessary python wheels
 #
-# PS: the --mount tmpfs is a workaround for https://github.com/rust-lang/cargo/issues/8719
+# Build the python wheels
 #
-# PPS: actually only pyproject.toml is needed here, but it seems there is no way
-# to tell pip to only build the dependencies and not the project itself as well,
-# so we copy enough to make this is possible
-COPY pyproject.toml .
-COPY wger/version.py ./wger/version.py
-COPY wger/__init__.py ./wger/__init__.py
-COPY README.md ./README.md
+WORKDIR /root/src
+
+# Copy necessary files to build the application
+COPY pyproject.toml /root/src
+COPY wger/version.py /root/src/wger/
+COPY wger/__init__.py /root/src/wger/
+COPY README.md /root/src
+COPY package.json /root/src
+COPY yarn.lock /root/src
+COPY wger/core/static /root/src/wger/core/static
 
+# NB: the --mount tmpfs is a workaround for https://github.com/rust-lang/cargo/issues/8719
 RUN --mount=type=tmpfs,target=/root/.cargo \
     pip3 wheel \
       --no-cache-dir \
       --wheel-dir /wheels \
       --group docker . \
-    && pip3 install \
-      --break-system-packages \
-      --no-warn-script-location \
-      --root-user-action ignore \
-      --user \
-      --no-cache-dir /wheels/* \
-    && ln -s /usr/bin/yarnpkg /usr/bin/yarn \
     && ln -s /usr/bin/sassc /usr/bin/sass
 
-
-# Download and copy js and css files
-COPY . /home/wger/src
-WORKDIR /home/wger/src
-RUN yarn install \
-    && yarn build:css:sass
+#
+# Build the JS and CSS files
+#
+RUN yarn config set nodeLinker node-modules \
+    && yarn install \
+    && yarn build:css:sass \
+    && cd .. \
+    && wget https://github.com/wger-project/react/archive/refs/heads/master.zip \
+    && unzip master.zip \
+    && cd react-master \
+    && yarn config set --home enableTelemetry 0 \
+    && yarn config set nodeLinker node-modules \
+    && yarn install \
+    && WGER_STATIC_FOLDER="/root/src/wger/core/static/react" yarn build
 
 
 ########
 # Final
 ########
 FROM wger/base:latest AS final
-LABEL maintainer="Roland Geider <[email protected]>"
+LABEL org.opencontainers.image.authors="wger team <[email protected]>"
 ARG DOCKER_DIR=./extras/docker/production
 ENV PATH="/home/wger/.local/bin:$PATH"
-
+WORKDIR /home/wger/src
 EXPOSE 8000
 
-
 # Set up the application
-COPY --from=builder --chown=wger:wger /root/.local /home/wger/.local
-
-WORKDIR /home/wger/src
 COPY --chown=wger:wger . /home/wger/src
-COPY --from=builder --chown=wger:wger /home/wger/src/wger/core/static/yarn /home/wger/src/wger/core/static/yarn
+COPY --chown=wger:wger --from=builder /root/src/wger/core/static/yarn /home/wger/src/wger/core/static/yarn
+COPY --chown=wger:wger --from=builder /root/src/wger/core/static/react /home/wger/src/wger/core/static/react
 COPY ${DOCKER_DIR}/settings.py /home/wger/src
 COPY ${DOCKER_DIR}/settings.py /tmp/
 COPY ${DOCKER_DIR}/entrypoint.sh /home/wger/entrypoint.sh
@@ -93,10 +101,11 @@ RUN chmod +x /home/wger/entrypoint.sh \
     && chown wger:wger /home/wger/src
 
 USER wger
-RUN pip3 install --break-system-packages --user --editable . \
-    && mkdir ~/media \
-    && mkdir ~/static \
-    && mkdir ~/beat \
-    && mkdir ~/db
+RUN --mount=type=bind,from=builder,source=/wheels,target=/wheels \
+    pip3 install --break-system-packages --no-cache-dir --user /wheels/* \
+    && pip3 install --break-system-packages --user . \
+    && mkdir -p ~/media ~/static ~/beat ~/db \
+    && cd wger \
+    && django-admin compilemessages
 
 CMD ["/home/wger/entrypoint.sh"]

package.json

@@ -10,11 +10,12 @@
   },
   "homepage": "https://github.com/wger-project/wger",
   "dependencies": {
-    "htmx.org": "^2.0.5",
+    "@popperjs/core": "^2.11.8",
     "bootstrap": "5.3.7",
     "components-font-awesome": "5.9.0",
     "datatables.net-bs5": "^2.3.1",
     "devbridge-autocomplete": "^1.4.11",
+    "htmx.org": "^2.0.5",
     "jquery": "^3.7.1",
     "masonry-layout": "^4.2.2",
     "popper.js": "^1.16.1",
@@ -25,5 +26,6 @@
   },
   "engines": {
     "yarn": ">= 1.0.0"
-  }
+  },
+  "packageManager": "[email protected]"
 }