From cd64642854837245a4d8e0125e85c9ec9f33bf01 Mon Sep 17 00:00:00 2001 From: Joseph Ferguson Date: Thu, 18 Jun 2026 14:35:00 -0700 Subject: [PATCH] Update to Alpine 3.24 Drop Alpine 3.22 accordingly Update 6.0 to 6.0.10 Update 6.1 to 6.1.3 --- 6.0/alpine3.23/Dockerfile | 6 ++--- 6.0/{alpine3.22 => alpine3.24}/Dockerfile | 8 +++---- .../docker-entrypoint.sh | 0 6.0/bookworm/Dockerfile | 6 ++--- 6.0/trixie/Dockerfile | 6 ++--- 6.1/alpine3.23/Dockerfile | 8 +++---- 6.1/{alpine3.22 => alpine3.24}/Dockerfile | 10 ++++---- .../docker-entrypoint.sh | 0 6.1/bookworm/Dockerfile | 6 ++--- 6.1/trixie/Dockerfile | 6 ++--- Dockerfile.template | 2 +- versions.json | 24 +++++++++---------- versions.sh | 2 +- 13 files changed, 42 insertions(+), 42 deletions(-) rename 6.0/{alpine3.22 => alpine3.24}/Dockerfile (96%) rename 6.0/{alpine3.22 => alpine3.24}/docker-entrypoint.sh (100%) rename 6.1/{alpine3.22 => alpine3.24}/Dockerfile (96%) rename 6.1/{alpine3.22 => alpine3.24}/docker-entrypoint.sh (100%) diff --git a/6.0/alpine3.23/Dockerfile b/6.0/alpine3.23/Dockerfile index 84edb6e..cd21891 100644 --- a/6.0/alpine3.23/Dockerfile +++ b/6.0/alpine3.23/Dockerfile @@ -67,9 +67,9 @@ RUN set -eux; \ chown redmine:redmine "$HOME"; \ chmod 1777 "$HOME" -ENV REDMINE_VERSION 6.0.9 -ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.0.9.tar.gz -ENV REDMINE_DOWNLOAD_SHA256 9bc760b5147cc27e27334cecbaf600be6efc009cd8fe57680309af513d852006 +ENV REDMINE_VERSION 6.0.10 +ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.0.10.tar.gz +ENV REDMINE_DOWNLOAD_SHA256 0f3f3a7159188fbd65a365519037ebe6882c6dace78d8630de22c570ff20ca77 ENV RAILS_LOG_TO_STDOUT true RUN set -eux; \ diff --git a/6.0/alpine3.22/Dockerfile b/6.0/alpine3.24/Dockerfile similarity index 96% rename from 6.0/alpine3.22/Dockerfile rename to 6.0/alpine3.24/Dockerfile index d268dfe..6be834f 100644 --- a/6.0/alpine3.22/Dockerfile +++ b/6.0/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM ruby:3.3-alpine3.22 +FROM ruby:3.3-alpine3.24 # explicitly set uid/gid to guarantee that it won't change in the future # the values 999:999 are identical to the current user/group id assigned @@ -67,9 +67,9 @@ RUN set -eux; \ chown redmine:redmine "$HOME"; \ chmod 1777 "$HOME" -ENV REDMINE_VERSION 6.0.9 -ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.0.9.tar.gz -ENV REDMINE_DOWNLOAD_SHA256 9bc760b5147cc27e27334cecbaf600be6efc009cd8fe57680309af513d852006 +ENV REDMINE_VERSION 6.0.10 +ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.0.10.tar.gz +ENV REDMINE_DOWNLOAD_SHA256 0f3f3a7159188fbd65a365519037ebe6882c6dace78d8630de22c570ff20ca77 ENV RAILS_LOG_TO_STDOUT true RUN set -eux; \ diff --git a/6.0/alpine3.22/docker-entrypoint.sh b/6.0/alpine3.24/docker-entrypoint.sh similarity index 100% rename from 6.0/alpine3.22/docker-entrypoint.sh rename to 6.0/alpine3.24/docker-entrypoint.sh diff --git a/6.0/bookworm/Dockerfile b/6.0/bookworm/Dockerfile index d97818c..d114ae0 100644 --- a/6.0/bookworm/Dockerfile +++ b/6.0/bookworm/Dockerfile @@ -71,9 +71,9 @@ RUN set -eux; \ chown redmine:redmine "$HOME"; \ chmod 1777 "$HOME" -ENV REDMINE_VERSION 6.0.9 -ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.0.9.tar.gz -ENV REDMINE_DOWNLOAD_SHA256 9bc760b5147cc27e27334cecbaf600be6efc009cd8fe57680309af513d852006 +ENV REDMINE_VERSION 6.0.10 +ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.0.10.tar.gz +ENV REDMINE_DOWNLOAD_SHA256 0f3f3a7159188fbd65a365519037ebe6882c6dace78d8630de22c570ff20ca77 ENV RAILS_LOG_TO_STDOUT true RUN set -eux; \ diff --git a/6.0/trixie/Dockerfile b/6.0/trixie/Dockerfile index 8dcc46d..995d114 100644 --- a/6.0/trixie/Dockerfile +++ b/6.0/trixie/Dockerfile @@ -70,9 +70,9 @@ RUN set -eux; \ chown redmine:redmine "$HOME"; \ chmod 1777 "$HOME" -ENV REDMINE_VERSION 6.0.9 -ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.0.9.tar.gz -ENV REDMINE_DOWNLOAD_SHA256 9bc760b5147cc27e27334cecbaf600be6efc009cd8fe57680309af513d852006 +ENV REDMINE_VERSION 6.0.10 +ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.0.10.tar.gz +ENV REDMINE_DOWNLOAD_SHA256 0f3f3a7159188fbd65a365519037ebe6882c6dace78d8630de22c570ff20ca77 ENV RAILS_LOG_TO_STDOUT true RUN set -eux; \ diff --git a/6.1/alpine3.23/Dockerfile b/6.1/alpine3.23/Dockerfile index d8c06b3..e53ffad 100644 --- a/6.1/alpine3.23/Dockerfile +++ b/6.1/alpine3.23/Dockerfile @@ -67,9 +67,9 @@ RUN set -eux; \ chown redmine:redmine "$HOME"; \ chmod 1777 "$HOME" -ENV REDMINE_VERSION 6.1.2 -ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.2.tar.gz -ENV REDMINE_DOWNLOAD_SHA256 938e975e808ccfb4b0dcbad8b42f02aacf0ca9ef15491c38c5af4756740ccf08 +ENV REDMINE_VERSION 6.1.3 +ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.3.tar.gz +ENV REDMINE_DOWNLOAD_SHA256 61db3008c7fd18a3afc559ed656fd38fdf8df8220ac69598b319095183190b7a ENV RAILS_LOG_TO_STDOUT true RUN set -eux; \ @@ -88,7 +88,7 @@ RUN set -eux; \ RUN set -eux; \ apk add --no-cache --virtual .build-deps \ cargo \ - clang19-dev \ + clang21-dev \ coreutils \ freetds-dev \ gcc \ diff --git a/6.1/alpine3.22/Dockerfile b/6.1/alpine3.24/Dockerfile similarity index 96% rename from 6.1/alpine3.22/Dockerfile rename to 6.1/alpine3.24/Dockerfile index c8ac87e..3bd914b 100644 --- a/6.1/alpine3.22/Dockerfile +++ b/6.1/alpine3.24/Dockerfile @@ -4,7 +4,7 @@ # PLEASE DO NOT EDIT IT DIRECTLY. # -FROM ruby:3.4-alpine3.22 +FROM ruby:3.4-alpine3.24 # explicitly set uid/gid to guarantee that it won't change in the future # the values 999:999 are identical to the current user/group id assigned @@ -67,9 +67,9 @@ RUN set -eux; \ chown redmine:redmine "$HOME"; \ chmod 1777 "$HOME" -ENV REDMINE_VERSION 6.1.2 -ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.2.tar.gz -ENV REDMINE_DOWNLOAD_SHA256 938e975e808ccfb4b0dcbad8b42f02aacf0ca9ef15491c38c5af4756740ccf08 +ENV REDMINE_VERSION 6.1.3 +ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.3.tar.gz +ENV REDMINE_DOWNLOAD_SHA256 61db3008c7fd18a3afc559ed656fd38fdf8df8220ac69598b319095183190b7a ENV RAILS_LOG_TO_STDOUT true RUN set -eux; \ @@ -88,7 +88,7 @@ RUN set -eux; \ RUN set -eux; \ apk add --no-cache --virtual .build-deps \ cargo \ - clang19-dev \ + clang21-dev \ coreutils \ freetds-dev \ gcc \ diff --git a/6.1/alpine3.22/docker-entrypoint.sh b/6.1/alpine3.24/docker-entrypoint.sh similarity index 100% rename from 6.1/alpine3.22/docker-entrypoint.sh rename to 6.1/alpine3.24/docker-entrypoint.sh diff --git a/6.1/bookworm/Dockerfile b/6.1/bookworm/Dockerfile index 79edf74..8179f73 100644 --- a/6.1/bookworm/Dockerfile +++ b/6.1/bookworm/Dockerfile @@ -71,9 +71,9 @@ RUN set -eux; \ chown redmine:redmine "$HOME"; \ chmod 1777 "$HOME" -ENV REDMINE_VERSION 6.1.2 -ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.2.tar.gz -ENV REDMINE_DOWNLOAD_SHA256 938e975e808ccfb4b0dcbad8b42f02aacf0ca9ef15491c38c5af4756740ccf08 +ENV REDMINE_VERSION 6.1.3 +ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.3.tar.gz +ENV REDMINE_DOWNLOAD_SHA256 61db3008c7fd18a3afc559ed656fd38fdf8df8220ac69598b319095183190b7a ENV RAILS_LOG_TO_STDOUT true RUN set -eux; \ diff --git a/6.1/trixie/Dockerfile b/6.1/trixie/Dockerfile index 7d369ad..0e4d137 100644 --- a/6.1/trixie/Dockerfile +++ b/6.1/trixie/Dockerfile @@ -70,9 +70,9 @@ RUN set -eux; \ chown redmine:redmine "$HOME"; \ chmod 1777 "$HOME" -ENV REDMINE_VERSION 6.1.2 -ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.2.tar.gz -ENV REDMINE_DOWNLOAD_SHA256 938e975e808ccfb4b0dcbad8b42f02aacf0ca9ef15491c38c5af4756740ccf08 +ENV REDMINE_VERSION 6.1.3 +ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.3.tar.gz +ENV REDMINE_DOWNLOAD_SHA256 61db3008c7fd18a3afc559ed656fd38fdf8df8220ac69598b319095183190b7a ENV RAILS_LOG_TO_STDOUT true RUN set -eux; \ diff --git a/Dockerfile.template b/Dockerfile.template index e3cfcd6..4a7fc2a 100644 --- a/Dockerfile.template +++ b/Dockerfile.template @@ -186,7 +186,7 @@ ENV BUNDLE_FORCE_RUBY_PLATFORM 1 else # 6.1+ needs to compile some extensions on non-amd64-non-arm64 architectures "cargo", - "clang19-dev", # TODO the dep needing libclang.so doesn't seem to care what version, so maybe there's a more generic dep we could use here? + "clang21-dev", # TODO the dep needing libclang.so doesn't seem to care what version, so maybe there's a more generic dep we could use here? empty end, empty diff --git a/versions.json b/versions.json index c5615fb..b7a4c6d 100644 --- a/versions.json +++ b/versions.json @@ -1,34 +1,34 @@ { "6.0": { - "alpine": "3.23", + "alpine": "3.24", "debian": "trixie", - "downloadUrl": "https://www.redmine.org/releases/redmine-6.0.9.tar.gz", + "downloadUrl": "https://www.redmine.org/releases/redmine-6.0.10.tar.gz", "ruby": { "version": "3.3" }, - "sha256": "9bc760b5147cc27e27334cecbaf600be6efc009cd8fe57680309af513d852006", + "sha256": "0f3f3a7159188fbd65a365519037ebe6882c6dace78d8630de22c570ff20ca77", "variants": [ "trixie", "bookworm", - "alpine3.23", - "alpine3.22" + "alpine3.24", + "alpine3.23" ], - "version": "6.0.9" + "version": "6.0.10" }, "6.1": { - "alpine": "3.23", + "alpine": "3.24", "debian": "trixie", - "downloadUrl": "https://www.redmine.org/releases/redmine-6.1.2.tar.gz", + "downloadUrl": "https://www.redmine.org/releases/redmine-6.1.3.tar.gz", "ruby": { "version": "3.4" }, - "sha256": "938e975e808ccfb4b0dcbad8b42f02aacf0ca9ef15491c38c5af4756740ccf08", + "sha256": "61db3008c7fd18a3afc559ed656fd38fdf8df8220ac69598b319095183190b7a", "variants": [ "trixie", "bookworm", - "alpine3.23", - "alpine3.22" + "alpine3.24", + "alpine3.23" ], - "version": "6.1.2" + "version": "6.1.3" } } diff --git a/versions.sh b/versions.sh index 1ec606f..eb27f92 100755 --- a/versions.sh +++ b/versions.sh @@ -6,8 +6,8 @@ supportedDebianSuites=( bookworm ) supportedAlpineVersions=( + 3.24 3.23 - 3.22 ) defaultDebianSuite="${supportedDebianSuites[0]}"