Scott.Idem/OSIT-Mailman3
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #697 from maxking/dependabot/docker/core/alpine-3.20

Browse Source 
Bump alpine from 3.19 to 3.20 in /core
This commit is contained in:
Abhilash Raj
2024-09-20 17:55:49 +05:30
committed by GitHub
parent 2db9e289f7 622e624c3e
commit 6ea4da9bd7
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/Dockerfile
View File

@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.3 # syntax = docker/dockerfile:1.3
# Use 3.15 for Core since it has Python 3.9 # Use 3.15 for Core since it has Python 3.9
FROM alpine:3.19 FROM alpine:3.20
# Add requirements file. # Add requirements file.
COPY requirements.txt /tmp/ COPY requirements.txt /tmp/
@@ -15,7 +15,6 @@ RUN --mount=type=cache,target=/root/.cache \
&& apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c lynx tzdata \ && apk add --no-cache bash su-exec postgresql-client mysql-client curl python3 py3-pip linux-headers py-cryptography mariadb-connector-c lynx tzdata \
&& python3 -m pip install --break-system-packages -U pip setuptools wheel \ && python3 -m pip install --break-system-packages -U pip setuptools wheel \
&& python3 -m pip install --break-system-packages psycopg2 \ && python3 -m pip install --break-system-packages psycopg2 \
gunicorn==19.9.0 \
pymysql \ pymysql \
-r /tmp/requirements.txt \ -r /tmp/requirements.txt \
'importlib-resources<6.0.0' \ 'importlib-resources<6.0.0' \

3
core/Dockerfile.dev
View File

@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.3 # syntax = docker/dockerfile:1.3
# Use 3.15 for Core since it has Python 3.9 # Use 3.15 for Core since it has Python 3.9
FROM alpine:3.19 FROM alpine:3.20
# Set the commits that we are building. # Set the commits that we are building.
ARG CORE_REF ARG CORE_REF
@@ -18,7 +18,6 @@ RUN --mount=type=cache,target=/root/.cache \
&& python3 -m pip install --break-system-packages \ && python3 -m pip install --break-system-packages \
git+https://gitlab.com/mailman/mailman \ git+https://gitlab.com/mailman/mailman \
git+https://gitlab.com/mailman/mailman-hyperkitty \ git+https://gitlab.com/mailman/mailman-hyperkitty \
gunicorn==19.9.0 \
&& apk del build-deps \ && apk del build-deps \
&& adduser -S mailman && adduser -S mailman