Skip to content

armgit / wger

Public Imported from GitHub
0

Self hosted FLOSS fitness/workout, nutrition and weight tracker

Update installed packages

Roland Geider02697acdf0d1
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index 2139ca29a..8700fb897 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -59,5 +59,5 @@ jobs:
context: .
push: true
file: extras/docker/development/Dockerfile
- platforms: linux/amd64,linux/arm64
+ platforms: linux/amd64,linux/arm64,linux/arm/v7
tags: wger/server:latest,wger/server:2.2-dev,wger/devel:latest,wger/devel:2.2-dev
diff --git a/extras/docker/base/Dockerfile b/extras/docker/base/Dockerfile
index 39e9b3b7a..2819d2b07 100644
--- a/extras/docker/base/Dockerfile
+++ b/extras/docker/base/Dockerfile
@@ -16,15 +16,12 @@ LABEL maintainer="Roland Geider <[email protected]>"
ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get install --no-install-recommends -y \
- git \
locales \
nodejs \
npm \
- python3-venv \
python3-pip \
sqlite3 \
wget \
- libpq5 \
&& rm -rf /var/lib/apt/lists/* \
&& npm install -g yarn sass\
&& locale-gen en_US.UTF-8
diff --git a/extras/docker/demo/Dockerfile b/extras/docker/demo/Dockerfile
index 99d7e8c41..d794afad2 100644
--- a/extras/docker/demo/Dockerfile
+++ b/extras/docker/demo/Dockerfile
@@ -17,28 +17,33 @@
##########
# Builder
##########
-FROM ubuntu:22.04 as builder
+FROM wger/base:latest as builder
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get install --no-install-recommends -y \
build-essential \
python3-dev \
- python3-pip \
python3-wheel \
pkg-config \
libcairo2-dev \
- git
-
-# Set up the application
+ libjpeg8-dev \
+ libwebp-dev \
+ libpq-dev \
+ rustc \
+ cargo \
+ && pip install --upgrade pip
+
+# Build the necessary python wheels
+# Note that the --mount is a workaround for https://github.com/rust-lang/cargo/issues/8719
COPY requirements* ./
-RUN pip3 wheel --no-cache-dir --wheel-dir /usr/src/app/wheels -r requirements_dev.txt
+RUN --mount=type=tmpfs,target=/root/.cargo pip3 wheel --no-cache-dir --wheel-dir /wheels -r requirements_docker.txt
########
# Final
########
-FROM wger/base:2.2-dev
+FROM wger/base:latest
LABEL maintainer="Roland Geider <[email protected]>"
ARG DOCKER_DIR=./extras/docker/demo
@@ -50,6 +55,7 @@ RUN apt-get update \
&& apt-get install --no-install-recommends -y \
apache2 \
cron \
+ python3-venv \
libapache2-mod-wsgi-py3 \
python3-wheel \
&& rm -rf /var/lib/apt/lists/*
diff --git a/extras/docker/development/Dockerfile b/extras/docker/development/Dockerfile
index 894d15ad0..5c567cdc4 100644
--- a/extras/docker/development/Dockerfile
+++ b/extras/docker/development/Dockerfile
@@ -12,30 +12,34 @@
##########
# Builder
##########
-FROM ubuntu:22.04 as builder
+FROM wger/base:latest as builder
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update \
&& apt-get install --no-install-recommends -y \
build-essential \
python3-dev \
- python3-pip \
python3-wheel \
pkg-config \
libcairo2-dev \
- git \
- libpq-dev
+ libjpeg8-dev \
+ libwebp-dev \
+ libpq-dev \
+ rustc \
+ cargo \
+ && pip install --upgrade pip
# Build the necessary python wheels
+# Note that the --mount is a workaround for https://github.com/rust-lang/cargo/issues/8719
COPY requirements* ./
-RUN 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
########
# Final
########
-FROM wger/base:2.2-dev
+FROM wger/base:latest
LABEL maintainer="Roland Geider <[email protected]>"
ARG DOCKER_DIR=./extras/docker/development
ENV PATH="/home/wger/.local/bin:$PATH"