Skip to content

Commit 422f2da

Browse files
committedNov 5, 2024
Upgrade containers to Alpine 3.20
1 parent 5daee53 commit 422f2da

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed
 

‎.github/workflows/tests.yml

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
contents: read
1010

1111
container:
12-
image: ghcr.io/weasyl/ci-base-image@sha256:9a366824361bf3123b28364ab6a4bd039ac765fafd5a1baab07f5c7c4485c007
12+
image: ghcr.io/weasyl/ci-base-image@sha256:960e621bcdde15bdf9b1dd29c8b45dec93927aa67f2e7f4ab3f763a16f2b99f4
1313
options: --user 1001
1414

1515
services:
@@ -61,6 +61,7 @@ jobs:
6161
run: |
6262
cp ci/site.config.txt config/
6363
cp config/weasyl-staff.example.py config/weasyl-staff.py
64+
cat imagemagick-policy.xml > /usr/etc/ImageMagick-6/policy.xml
6465
printf %.8s "$GITHUB_SHA" > version.txt
6566
6667
- name: Build assets

‎Dockerfile

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# syntax=docker/dockerfile:1
2-
FROM docker.io/library/node:16-alpine3.16 AS asset-builder
2+
FROM docker.io/library/node:18-alpine3.20 AS asset-builder
33
RUN --mount=type=cache,id=apk,target=/var/cache/apk,sharing=locked \
44
ln -s /var/cache/apk /etc/apk/cache && apk upgrade && apk add \
55
sassc runit
@@ -16,7 +16,7 @@ COPY assets assets
1616
RUN node build.js
1717

1818

19-
FROM docker.io/library/alpine:3.16 AS mozjpeg
19+
FROM docker.io/library/alpine:3.20 AS mozjpeg
2020
RUN --mount=type=cache,id=apk,target=/var/cache/apk,sharing=locked \
2121
ln -s /var/cache/apk /etc/apk/cache && apk upgrade && apk add \
2222
musl-dev gcc make \
@@ -88,7 +88,7 @@ RUN --network=none make -j"$(nproc)"
8888
RUN --network=none make install DESTDIR="$HOME/package-root"
8989

9090

91-
FROM docker.io/library/python:3.10-alpine3.16 AS bdist
91+
FROM docker.io/library/python:3.10-alpine3.20 AS bdist
9292
# libwebp-dev, zlib-dev: Pillow
9393
# libffi-dev, openssl-dev: cryptography
9494
# libmemcached-dev: pylibmc
@@ -138,15 +138,14 @@ RUN --mount=type=cache,id=poetry,target=/weasyl/.cache/pypoetry,sharing=locked,u
138138
.poetry-venv/bin/poetry install --only=dev
139139

140140

141-
FROM docker.io/library/python:3.10-alpine3.16 AS package
142-
# gcc (libgomp), lcms2, libpng, libxml2, libwebp: ImageMagick
141+
FROM docker.io/library/python:3.10-alpine3.20 AS package
142+
# gcc (libgomp), lcms2, libpng, libxml2, libwebp*: ImageMagick
143143
RUN --mount=type=cache,id=apk,target=/var/cache/apk,sharing=locked \
144144
ln -s /var/cache/apk /etc/apk/cache && apk upgrade && apk add \
145-
gcc lcms2 libpng libxml2 libwebp \
145+
gcc lcms2 libpng libxml2 libwebpdemux libwebpmux \
146146
libffi \
147147
libmemcached-libs \
148148
libpq \
149-
libwebp \
150149
libxslt
151150
RUN adduser -S weasyl -h /weasyl
152151
WORKDIR /weasyl
@@ -175,7 +174,7 @@ COPY assets assets
175174
CMD pytest -x libweasyl.test libweasyl.models.test && pytest -x weasyl.test
176175
STOPSIGNAL SIGINT
177176

178-
FROM docker.io/library/alpine:3.16 AS flake8
177+
FROM docker.io/library/alpine:3.20 AS flake8
179178
RUN --mount=type=cache,id=apk,target=/var/cache/apk,sharing=locked \
180179
ln -s /var/cache/apk /etc/apk/cache && apk upgrade && apk add \
181180
py3-flake8

‎containers/postgres/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/library/postgres:13-alpine3.16
1+
FROM docker.io/library/postgres:13-alpine3.20
22
COPY \
33
00-hstore.sql \
44
01-test.sql \

‎docker-compose.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ services:
7979
read_only: false
8080

8181
memcached:
82-
image: docker.io/library/memcached:1.6-alpine3.16
82+
image: docker.io/library/memcached:1.6-alpine3.20
8383
command: --memory-limit=64
8484
networks:
8585
- web-memcached
@@ -117,7 +117,7 @@ services:
117117

118118
configure:
119119
profiles: [ configure ]
120-
image: docker.io/library/alpine:3.16
120+
image: docker.io/library/alpine:3.20
121121
entrypoint:
122122
- sh
123123
- -c

‎tools/poetry-requirements/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM docker.io/library/python:3.10-alpine3.16
1+
FROM docker.io/library/python:3.10-alpine3.20
22
RUN python3 -m venv .poetry-venv && .poetry-venv/bin/pip install poetry
33
RUN .poetry-venv/bin/poetry self add poetry-plugin-export
44
COPY pyproject.toml ./

0 commit comments

Comments
 (0)
Please sign in to comment.