Merge branch 'master' into dependabot/pip/django-debug-toolbar-4.4.6

Author: rolandgeider

.github/dependabot.yml

@@ -21,6 +21,6 @@ updates:
       interval: "daily"
 
   - package-ecosystem: "docker"
-    directory: "/extras/docker/development/"
+    directory: "/extras/docker/production/"
     schedule:
       interval: "daily"

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
     strategy:
       matrix:
         #TODO: pypy3 has problems compiling lxml
-        python-version: [ '3.10', '3.11', '3.12' ]
+        python-version: [ '3.10', '3.11', '3.12', '3.13' ]
     name: CI job (python ${{ matrix.python-version }})
 
     steps:

.github/workflows/docker-base.yml

@@ -21,7 +21,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.2.0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3

.github/workflows/docker-demo.yml

@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.2.0
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -41,4 +41,4 @@ jobs:
           push: true
           file: extras/docker/demo/Dockerfile
           platforms: linux/amd64,linux/arm64
-          tags: ${{ vars.REGISTRY_REPO }}/demo:latest,${{ vars.REGISTRY_REPO }}/demo:2.3-dev,${{ vars.REGISTRY_REPO }}/apache:latest,${{ vars.REGISTRY_REPO }}/apache:2.3-dev
+          tags: ${{ vars.REGISTRY_REPO }}/demo:latest,${{ vars.REGISTRY_REPO }}/demo:2.3-dev

.github/workflows/docker.yml

@@ -9,7 +9,6 @@ on:
 
 env:
   REGISTRY_IMAGE: ${{ vars.REGISTRY_REPO }}/server
-  REGISTRY_IMAGE_ALT: ${{ vars.REGISTRY_REPO }}/devel
 
 jobs:
   build-prod:
@@ -23,6 +22,11 @@ jobs:
           - linux/arm/v7
           - linux/arm64
     steps:
+      - name: Prepare
+        run: |
+          platform=${{ matrix.platform }}
+          echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV
+
       - name: Checkout
         uses: actions/checkout@v4
 
@@ -37,10 +41,9 @@ jobs:
             type=raw,value=2.3-dev
           images: |
             ${{ env.REGISTRY_IMAGE }}
-            ${{ env.REGISTRY_IMAGE_ALT }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3.1.0
+        uses: docker/setup-qemu-action@v3.2.0
 
       - name: Set up Docker Buildx
         id: buildx
@@ -67,7 +70,7 @@ jobs:
         uses: docker/build-push-action@v6
         with:
           context: .
-          file: extras/docker/development/Dockerfile
+          file: extras/docker/production/Dockerfile
           builder: ${{ steps.buildx.outputs.name }}
           platforms: ${{ matrix.platform }}
           labels: ${{ steps.meta.outputs.labels }}
@@ -85,9 +88,9 @@ jobs:
           touch "/tmp/digests/${digest#sha256:}"
 
       - name: Upload digest
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
-          name: digests
+          name: digests-${{ env.PLATFORM_PAIR }}
           path: /tmp/digests/*
           if-no-files-found: error
           retention-days: 1
@@ -103,10 +106,11 @@ jobs:
       - build-prod
     steps:
       - name: Download digests
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
-          name: digests
           path: /tmp/digests
+          pattern: digests-*
+          merge-multiple: true
 
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
@@ -120,7 +124,6 @@ jobs:
             type=raw,value=2.3-dev
           images: |
             ${{ env.REGISTRY_IMAGE }}
-            ${{ env.REGISTRY_IMAGE_ALT }}
 
       - name: Login to Docker Hub
         uses: docker/login-action@v3

AUTHORS.rst

@@ -79,6 +79,11 @@ Developers
 * Ethan Winters - https://github.com/ebwinters
 * Dieter Plaetinck - https://github.com/Dieterbe
 * Jonathan La Field - https://github.com/JLaField
+* Kevin Moy - https://github.com/kmoy1
+* Taylor Fuller - https://github.com/taylor-fuller
+* eyJhb - https://github.com/eyJhb
+* Joshua Shelley - https://github.com/navyjosh
+* Matt Harrison - https://github.com/Maralai
 
 
 Translators

extras/docker/base/Dockerfile

@@ -8,33 +8,32 @@
 # docker build --tag wger/base .
 #
 
-FROM ubuntu:22.04
+FROM ubuntu:24.04
 
 LABEL maintainer="Roland Geider <roland@geider.net>"
 
 # Install dependencies
 ENV DEBIAN_FRONTEND=noninteractive
 RUN apt update \
   && apt install --no-install-recommends -y \
+      adduser \
       locales \
-      nodejs \
-      npm \
       python3-pip \
       sqlite3 \
       wget \
       tzdata \
       libpq5 \
-  && npm install -g yarn sass\
   && locale-gen en_US.UTF-8
 
 # Environmental variables
-ENV LANG en_US.UTF-8
-ENV LANGUAGE en_US:en
-ENV LC_ALL en_US.UTF-8
+ENV LANG=en_US.UTF-8
+ENV LANGUAGE=en_US:en
+ENV LC_ALL=en_US.UTF-8
 
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE=1
+ENV PYTHONUNBUFFERED=1
 
 
 # Add wger user
-RUN adduser wger --disabled-password --gecos ""
+RUN deluser ubuntu
+RUN adduser wger --uid 1000 --disabled-password --gecos ""

extras/docker/demo/Dockerfile

@@ -17,7 +17,7 @@
 ##########
 # Builder
 ##########
-FROM wger/base:latest as builder
+FROM wger/base:latest AS builder
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt update \
@@ -32,20 +32,29 @@ RUN apt update \
       libpq-dev \
       rustc \
       cargo \
-  && pip install --upgrade pip
+      yarnpkg \
+      sassc
 
 # Build the necessary python wheels
 # Note that the --mount is a workaround for https://github.com/rust-lang/cargo/issues/8719
 COPY requirements* ./
-RUN --mount=type=tmpfs,target=/root/.cargo pip3 wheel --no-cache-dir --wheel-dir /wheels -r requirements_docker.txt
+RUN --mount=type=tmpfs,target=/root/.cargo pip3 wheel --no-cache-dir --wheel-dir /wheels -r requirements_docker.txt \
+  && pip3 install --break-system-packages --user --no-cache-dir /wheels/*
+
+COPY . /home/wger/src
+WORKDIR /home/wger/src
+RUN ln -s /usr/bin/yarnpkg /usr/bin/yarn \
+    && ln -s /usr/bin/sassc /usr/bin/sass \
+    && yarn install \
+    && yarn build:css:sass
 
 
 ########
 # Final
 ########
 FROM wger/base:latest
 LABEL maintainer="Roland Geider <roland@geider.net>"
-
+ENV TERM=xterm
 ARG DOCKER_DIR=./extras/docker/demo
 EXPOSE 80
 
@@ -70,45 +79,46 @@ RUN a2dissite 000-default.conf \
 # Configure cron
 COPY ${DOCKER_DIR}/crontab /etc/cron.d/wger
 COPY ${DOCKER_DIR}/venvwrapper /home/wger/venvwrapper
-COPY ${DOCKER_DIR}/entrypoint.sh /home/wger/entrypoint.sh
 
 RUN chmod 0644 /etc/cron.d/wger \
-  && chmod +x /home/wger/venvwrapper /home/wger/entrypoint.sh \
+  && 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
 
 # Set up the application
 RUN ln -s /home/wger/static/CACHE /var/www
 USER wger
 
 WORKDIR /home/wger/src
-#RUN git clone https://github.com/wger-project/wger.git
 RUN python3 -m venv /home/wger/venv
+
+# Change permissions of some files and folders so the apache process
+# can access them.
+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 \
     && pip install --upgrade pip \
     && pip install --no-cache /wheels/* \
     && pip install -e . \
     && wger create-settings --database-path /home/wger/db/database.sqlite \
-    && wger bootstrap \
-    && wger load-online-fixtures \
+    && sed -i "/^MEDIA_ROOT/c\MEDIA_ROOT='\/home\/wger\/media'" settings.py \
+    && echo STATIC_ROOT=\'/home/wger/static\' >> settings.py \
+    && wger bootstrap --no-process-static \
     && python3 manage.py sync-exercises \
-    && python3 manage.py download-exercise-images
+    && wger load-online-fixtures \
+    && python3 manage.py download-exercise-images \
+    && python3 manage.py collectstatic --no-input
 
 
-# Change permissions of some files and folders so the apache process
-# can access them.
-RUN mkdir -p ~/static/CACHE ~/media \
-    && ln -s /home/wger/static/CACHE /home/wger/src/CACHE \
-    && chmod g+w /home/wger/static/CACHE \
-    && sed -i "/^MEDIA_ROOT/c\MEDIA_ROOT='\/home\/wger\/media'" settings.py \
-    && echo STATIC_ROOT=\'/home/wger/static\' >> settings.py
 
 USER root
-RUN apt-get remove build-essential -y \
-    && apt autoremove -y \
-    && chown :www-data -R /home/wger/db \
+RUN chown :www-data -R /home/wger/db \
+    && chown www-data:www-data -R /home/wger/static \
     && chmod g+w /home/wger/db /home/wger/db/database.sqlite
 
-ENTRYPOINT ["/home/wger/entrypoint.sh"]
+CMD ["/usr/sbin/apache2ctl", "-D", "FOREGROUND"]

extras/docker/demo/entrypoint.sh

@@ -1,74 +1,27 @@
 #
-# Docker image for wger development
+# Installs some additional packages needed for development
 #
-# Please consult the README for usage
+# Note that this dockerfile is built from the corresponding docker-compose file
 #
-# Note: you MUST build this image from the project's root!
-# docker build -f extras/docker/development/Dockerfile --tag wger/server .
-#
-# To run the container consult https://github.com/wger-project/docker
-
-##########
-# Builder
-##########
-FROM wger/base:latest as builder
-ARG DEBIAN_FRONTEND=noninteractive
-
-RUN apt update \
-    && apt install --no-install-recommends -y \
-      build-essential \
-      python3-dev \
-      python3-wheel \
-      pkg-config \
-      libcairo2-dev \
-      libjpeg8-dev \
-      libwebp-dev \
-      libpq-dev \
-      rustc \
-      cargo \
-  && pip install --upgrade pip
-
-# Build the necessary python wheels
-# Note that the --mount tmpfs is a workaround for https://github.com/rust-lang/cargo/issues/8719
-COPY requirements* ./
-RUN --mount=type=tmpfs,target=/root/.cargo \
-    pip3 wheel --no-cache-dir --wheel-dir /wheels -r requirements_docker.txt
 
+FROM wger/server:latest
 
+USER root
 
-########
-# Final
-########
-FROM wger/base:latest
-LABEL maintainer="Roland Geider <roland@geider.net>"
-ARG DOCKER_DIR=./extras/docker/development
-ENV PATH="/home/wger/.local/bin:$PATH"
-
-EXPOSE 8000
+WORKDIR /home/wger/src
+RUN apt-get update && \
+    apt-get install -y \
+        git \
+        vim \
+        yarnpkg \
+        sassc
 
+COPY ../../../requirements.txt /tmp/requirements.txt
+COPY ../../../requirements_dev.txt /tmp/requirements_dev.txt
 
-# Set up the application
-WORKDIR /home/wger/src
-COPY --chown=wger:wger . /home/wger/src
-COPY --from=builder /wheels /wheels
-COPY ${DOCKER_DIR}/settings.py /home/wger/src
-COPY ${DOCKER_DIR}/settings.py /tmp/
-COPY ${DOCKER_DIR}/entrypoint.sh /home/wger/entrypoint.sh
-COPY ${DOCKER_DIR}/celery/beat/start /start-beat
-COPY ${DOCKER_DIR}/celery/worker/start /start-worker
-COPY ${DOCKER_DIR}/celery/flower/start /start-flower
-RUN chmod +x /home/wger/entrypoint.sh \
-    && chmod +x /start-beat \
-    && chmod +x /start-worker \
-    && chmod +x /start-flower \
-    && pip3 install --no-cache /wheels/* \
-    && chown -R wger:wger .
+RUN ln -s /usr/bin/yarnpkg /usr/bin/yarn \
+    && ln -s /usr/bin/sassc /usr/bin/sass
 
 USER wger
-RUN pip3 install -e . \
-    && mkdir ~/media \
-    && mkdir ~/static \
-    && mkdir ~/beat \
-    && mkdir ~/db/
-
-CMD ["/home/wger/entrypoint.sh"]
+RUN pip3 install --break-system-packages --user -r /tmp/requirements.txt \
+    && pip3 install --break-system-packages --user -r /tmp/requirements_dev.txt