Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Correctly build all docker images

Roland Geider2be0ce11d9eb
diff --git a/extras/docker/base/Dockerfile b/extras/docker/base/Dockerfile
index caa9b6be1..881591fd9 100644
--- a/extras/docker/base/Dockerfile
+++ b/extras/docker/base/Dockerfile
@@ -8,7 +8,7 @@
# docker build --tag wger/base .
#
-FROM ubuntu:22.04
+FROM ubuntu:24.04
LABEL maintainer="Roland Geider <[email protected]>"
@@ -16,8 +16,9 @@ LABEL maintainer="Roland Geider <[email protected]>"
ENV DEBIAN_FRONTEND=noninteractive
RUN apt update \
&& apt install --no-install-recommends -y \
+ adduser \
locales \
- yarn \
+ yarnpkg \
python3-pip \
sqlite3 \
wget \
@@ -36,4 +37,6 @@ ENV PYTHONUNBUFFERED=1
# Add wger user
+RUN ln -s /usr/bin/yarnpkg /usr/bin/yarn
+RUN ln -s /usr/bin/sassc /usr/bin/sass
RUN adduser wger --disabled-password --gecos ""
diff --git a/extras/docker/demo/Dockerfile b/extras/docker/demo/Dockerfile
index 333167bbf..12e2a8972 100644
--- a/extras/docker/demo/Dockerfile
+++ b/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 \
@@ -31,8 +31,7 @@ RUN apt update \
libwebp-dev \
libpq-dev \
rustc \
- cargo \
- && pip install --upgrade pip
+ cargo
# Build the necessary python wheels
# Note that the --mount is a workaround for https://github.com/rust-lang/cargo/issues/8719
@@ -45,7 +44,8 @@ RUN --mount=type=tmpfs,target=/root/.cargo pip3 wheel --no-cache-dir --wheel-dir
########
FROM wger/base:latest
LABEL maintainer="Roland Geider <[email protected]>"
-
+ENV PATH="/root/.local/bin:$PATH"
+ENV TERM=xterm
ARG DOCKER_DIR=./extras/docker/demo
EXPOSE 80
@@ -84,7 +84,6 @@ 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
RUN . /home/wger/venv/bin/activate \
&& pip install --upgrade pip \
diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfile
index 99e55ab9d..5a7a84182 100644
--- a/extras/docker/development/Dockerfile
+++ b/extras/docker/development/Dockerfile
@@ -1,5 +1,5 @@
#
-# Docker image for wger development
+# Docker image for wger
#
# Please consult the README for usage
#
@@ -33,7 +33,7 @@ RUN apt update \
COPY requirements* ./
RUN --mount=type=tmpfs,target=/root/.cargo \
pip3 wheel --no-cache-dir --wheel-dir /wheels -r requirements_docker.txt \
- && pip3 install --user --no-cache-dir /wheels/*
+ && pip3 install --break-system-packages --user --no-cache-dir /wheels/*
@@ -64,7 +64,7 @@ RUN chmod +x /home/wger/entrypoint.sh \
&& chmod +x /start-flower
USER wger
-RUN pip3 install --user -e . \
+RUN pip3 install --break-system-packages --user -e . \
&& mkdir ~/media \
&& mkdir ~/static \
&& mkdir ~/beat \
diff --git a/extras/docker/development/entrypoint.sh b/extras/docker/development/entrypoint.sh
index 11f2eec86..9a65bb6fc 100644
--- a/extras/docker/development/entrypoint.sh
+++ b/extras/docker/development/entrypoint.sh
@@ -13,7 +13,7 @@ fi
# after a first checkout), repeat the process.
if [ ! -d "/home/wger/src/wger.egg-info" ];
then
- pip3 install -e .
+ pip3 install --break-system-packages -e .
fi
# Bootstrap the application
diff --git a/package.json b/package.json
index 22b713860..036a0c3f1 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,7 @@
"yarn": "^1.22.22"
},
"scripts": {
- "build:css:sass": "sass wger/core/static/scss/main.scss:wger/core/static/yarn/bootstrap-compiled.css"
+ "build:css:sass": "sass wger/core/static/scss/main.scss wger/core/static/yarn/bootstrap-compiled.css"
},
"engines": {
"yarn": ">= 1.0.0"