From 6167940e98099002b7163a415c4e2eefedfd946b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Yule=20B=C3=A4dorf?= Date: Fri, 29 Mar 2024 23:58:42 +0100 Subject: [PATCH 1/3] chore: update to v1.41.1 --- .forgejo/workflows/build-image.yml | 2 +- Dockerfile | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml index 33e7393..6215037 100644 --- a/.forgejo/workflows/build-image.yml +++ b/.forgejo/workflows/build-image.yml @@ -17,4 +17,4 @@ jobs: uses: docker/build-push-action@v5.1.0 with: push: true - tags: git.pub.solar/pub-solar/mediawiki-oidc-docker:1.41.0 + tags: git.pub.solar/pub-solar/mediawiki-oidc-docker:1.41.1 diff --git a/Dockerfile b/Dockerfile index b8739be..b99fe71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,29 +1,29 @@ -FROM mediawiki:1.41.0 +FROM mediawiki:1.41.1 RUN apt-get update && apt-get install --yes curl libpq-dev tar unzip RUN docker-php-ext-configure pgsql --with-pgsql=/usr/local/pgsql && \ docker-php-ext-install pgsql -ENV PLUGGABLE_AUTH_VERSION=REL1_41-0273c84 -ENV OPENID_CONNECT_VERSION=REL1_41-7aa039e -ENV TEMPLATE_STYLES_VERSION=REL1_41-a9dde29 +ENV PLUGGABLE_AUTH_VERSION=REL1_41-d5b3ad8 +ENV OPENID_CONNECT_VERSION=REL1_41-f428716 +ENV TEMPLATE_STYLES_VERSION=REL1_41-7607e3c -RUN export PLUGGABLE_AUTH_SHA256SUM=9a3d8d7c1e5234bf932747b08b09c2577b08afb252a6dd995b1b0e26beb97af9 && \ +RUN export PLUGGABLE_AUTH_SHA256SUM=1d002567bbf7a4b029b7c2b83df33eb59c1c4ceff05b8716119da3d81a0007a1 && \ export archive=PluggableAuth-${PLUGGABLE_AUTH_VERSION}.tar.gz && \ curl --location --silent --output /tmp/${archive} https://extdist.wmflabs.org/dist/extensions/${archive} && \ echo "${PLUGGABLE_AUTH_SHA256SUM} /tmp/${archive}" | sha256sum --check && \ tar --extract --gzip --file /tmp/${archive} --directory /var/www/html/extensions && \ rm /tmp/${archive} -RUN export OPENID_CONNECT_SHA256SUM=3d96788d28151056e7052d76e5264355daa39f5a825fd4489b0ce3d6b9607dc7 && \ +RUN export OPENID_CONNECT_SHA256SUM=9a0a8e8bd4cf77759da2ff8e65a8055310d14f7b054f6289baf42538dc46e04d && \ export archive=OpenIDConnect-${OPENID_CONNECT_VERSION}.tar.gz && \ curl --location --silent --output /tmp/${archive} https://extdist.wmflabs.org/dist/extensions/${archive} && \ echo "${OPENID_CONNECT_SHA256SUM} /tmp/${archive}" | sha256sum --check && \ tar --extract --gzip --file /tmp/${archive} --directory /var/www/html/extensions && \ rm /tmp/${archive} -RUN export TEMPLATE_STYLES_SHA256SUM=74c3287f8c8658d6e12dc16a2dd8587505695f684eb850bc36b3af6b019e4794 && \ +RUN export TEMPLATE_STYLES_SHA256SUM=096ce6a6d7ee0d1432b2c49ca8cd86ad6a96a6af45650ca6b29a66677d60d5de && \ export archive=TemplateStyles-${TEMPLATE_STYLES_VERSION}.tar.gz && \ curl --location --silent --output /tmp/${archive} https://extdist.wmflabs.org/dist/extensions/${archive} && \ echo "${TEMPLATE_STYLES_SHA256SUM} /tmp/${archive}" | sha256sum --check && \ -- 2.44.2 From 615c767e71b8f9fdfffb9cc408e689734fac61e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Yule=20B=C3=A4dorf?= Date: Fri, 29 Mar 2024 23:58:42 +0100 Subject: [PATCH 2/3] chore: update to v1.41.1 --- .forgejo/workflows/build-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.forgejo/workflows/build-image.yml b/.forgejo/workflows/build-image.yml index 33e7393..6215037 100644 --- a/.forgejo/workflows/build-image.yml +++ b/.forgejo/workflows/build-image.yml @@ -17,4 +17,4 @@ jobs: uses: docker/build-push-action@v5.1.0 with: push: true - tags: git.pub.solar/pub-solar/mediawiki-oidc-docker:1.41.0 + tags: git.pub.solar/pub-solar/mediawiki-oidc-docker:1.41.1 -- 2.44.2 From df64f70cc9ccc3cac18bd55b6ca8d191b3f73c49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Yule=20B=C3=A4dorf?= Date: Fri, 5 Apr 2024 13:08:35 +0200 Subject: [PATCH 3/3] Update readme to hint at container build tag updates --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 5ac5f98..2a8f50b 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,9 @@ by the community. First, update the `FROM` image tag in the `Dockerfile` to the newest version, for example `1.41.0`. +Then, update the tag in the `.forgejo/workflows/build-image.yml` script, so the container +will get published with the new tag. + Next, download the newest version of each extension (matching the mediawiki docker image version, e.g. `1.41.0`) ... -- 2.44.2