Update redmine#21893
Open
tianon wants to merge 1 commit into
Open
Conversation
Changes: - docker-library/redmine@f772dee: Add 7.0.0 (docker-library/redmine#424)
Diff for cdebd76:diff --git a/_bashbrew-cat b/_bashbrew-cat
index c089912..c55bac7 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -8,12 +8,12 @@ Directory: 6.0/trixie
Tags: 6.0.10-alpine3.23, 6.0-alpine3.23
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: cd64642854837245a4d8e0125e85c9ec9f33bf01
+GitCommit: f772dee7158856abee669c717bb258f1ad43bce9
Directory: 6.0/alpine3.23
Tags: 6.0.10-alpine3.24, 6.0-alpine3.24, 6.0.10-alpine, 6.0-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: cd64642854837245a4d8e0125e85c9ec9f33bf01
+GitCommit: f772dee7158856abee669c717bb258f1ad43bce9
Directory: 6.0/alpine3.24
Tags: 6.0.10-bookworm, 6.0-bookworm
@@ -21,22 +21,42 @@ Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
GitCommit: 4e7d7ad67b47d3a0d9d1d22379141a8be0fae2ee
Directory: 6.0/bookworm
-Tags: 6.1.3, 6.1, 6, latest, 6.1.3-trixie, 6.1-trixie, 6-trixie, trixie
+Tags: 6.1.3, 6.1, 6, 6.1.3-trixie, 6.1-trixie, 6-trixie
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
GitCommit: 4e7d7ad67b47d3a0d9d1d22379141a8be0fae2ee
Directory: 6.1/trixie
-Tags: 6.1.3-alpine3.23, 6.1-alpine3.23, 6-alpine3.23, alpine3.23
+Tags: 6.1.3-alpine3.23, 6.1-alpine3.23, 6-alpine3.23
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: cd64642854837245a4d8e0125e85c9ec9f33bf01
+GitCommit: f772dee7158856abee669c717bb258f1ad43bce9
Directory: 6.1/alpine3.23
-Tags: 6.1.3-alpine3.24, 6.1-alpine3.24, 6-alpine3.24, alpine3.24, 6.1.3-alpine, 6.1-alpine, 6-alpine, alpine
+Tags: 6.1.3-alpine3.24, 6.1-alpine3.24, 6-alpine3.24, 6.1.3-alpine, 6.1-alpine, 6-alpine
Architectures: amd64, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: cd64642854837245a4d8e0125e85c9ec9f33bf01
+GitCommit: f772dee7158856abee669c717bb258f1ad43bce9
Directory: 6.1/alpine3.24
-Tags: 6.1.3-bookworm, 6.1-bookworm, 6-bookworm, bookworm
+Tags: 6.1.3-bookworm, 6.1-bookworm, 6-bookworm
Architectures: amd64, arm64v8
-GitCommit: 4e7d7ad67b47d3a0d9d1d22379141a8be0fae2ee
+GitCommit: f772dee7158856abee669c717bb258f1ad43bce9
Directory: 6.1/bookworm
+
+Tags: 7.0.0, 7.0, 7, latest, 7.0.0-trixie, 7.0-trixie, 7-trixie, trixie
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
+GitCommit: f772dee7158856abee669c717bb258f1ad43bce9
+Directory: 7.0/trixie
+
+Tags: 7.0.0-alpine3.23, 7.0-alpine3.23, 7-alpine3.23, alpine3.23
+Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
+GitCommit: f772dee7158856abee669c717bb258f1ad43bce9
+Directory: 7.0/alpine3.23
+
+Tags: 7.0.0-alpine3.24, 7.0-alpine3.24, 7-alpine3.24, alpine3.24, 7.0.0-alpine, 7.0-alpine, 7-alpine, alpine
+Architectures: amd64, arm64v8, ppc64le, riscv64, s390x
+GitCommit: f772dee7158856abee669c717bb258f1ad43bce9
+Directory: 7.0/alpine3.24
+
+Tags: 7.0.0-bookworm, 7.0-bookworm, 7-bookworm, bookworm
+Architectures: amd64, arm64v8
+GitCommit: f772dee7158856abee669c717bb258f1ad43bce9
+Directory: 7.0/bookworm
diff --git a/_bashbrew-list b/_bashbrew-list
index 1c79b2f..41ec867 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -28,6 +28,24 @@ redmine:6.1.3-alpine3.23
redmine:6.1.3-alpine3.24
redmine:6.1.3-bookworm
redmine:6.1.3-trixie
+redmine:7
+redmine:7-alpine
+redmine:7-alpine3.23
+redmine:7-alpine3.24
+redmine:7-bookworm
+redmine:7-trixie
+redmine:7.0
+redmine:7.0-alpine
+redmine:7.0-alpine3.23
+redmine:7.0-alpine3.24
+redmine:7.0-bookworm
+redmine:7.0-trixie
+redmine:7.0.0
+redmine:7.0.0-alpine
+redmine:7.0.0-alpine3.23
+redmine:7.0.0-alpine3.24
+redmine:7.0.0-bookworm
+redmine:7.0.0-trixie
redmine:alpine
redmine:alpine3.23
redmine:alpine3.24
diff --git a/_bashbrew-list-build-order b/_bashbrew-list-build-order
index 94efc14..c9e10ff 100644
--- a/_bashbrew-list-build-order
+++ b/_bashbrew-list-build-order
@@ -1,3 +1,7 @@
+redmine:6-alpine
+redmine:6-alpine3.23
+redmine:6-bookworm
+redmine:6-trixie
redmine:6.0-alpine
redmine:6.0-alpine3.23
redmine:6.0-bookworm
diff --git a/redmine_alpine/Dockerfile b/redmine_6-alpine/Dockerfile
similarity index 81%
copy from redmine_alpine/Dockerfile
copy to redmine_6-alpine/Dockerfile
index 3bd914b..13c25f5 100644
--- a/redmine_alpine/Dockerfile
+++ b/redmine_6-alpine/Dockerfile
@@ -122,14 +122,43 @@ RUN set -eux; \
rm /usr/local/bundle/gems/rbpdf-font-1.19.*/lib/fonts/ttf2ufm/ttf2ufm; \
\
runDeps="$( \
- scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/bundle/gems \
- | tr ',' '\n' \
+ scanelf --needed --nobanner --rpath --format '%n|%r|%F' --recursive /usr/local/bundle/gems \
+ | awk -F '|' '{ \
+ split($1, libs, ","); \
+ split($2, rpaths, ":"); \
+ \
+ # $3 is the full file path. Calculate $ORIGIN by stripping the filename.
+ origin = $3; \
+ sub("/[^/]+$", "", origin); \
+ \
+ for (i in libs) { \
+ lib = libs[i]; \
+ if (lib == "libc.so") continue; \
+ \
+ # 1. Skip if it exists in /usr/local/lib
+ if (!system("[ -e \"/usr/local/lib/" lib "\" ]")) continue; \
+ \
+ # 2. Check if satisfied by a bundled (relative) rpath
+ found = 0; \
+ for (j in rpaths) { \
+ rpath = rpaths[j]; \
+ \
+ # Only resolve $ORIGIN-relative rpaths.
+ if (sub(/^\$[{]?ORIGIN[}]?/, origin, rpath)) { \
+ if (!system("[ -e \"" rpath "/" lib "\" ]")) { \
+ found = 1; \
+ break; \
+ } \
+ } \
+ } \
+ \
+ # 3. If missing globally and not bundled locally, keep it as a system dep
+ if (!found) { \
+ print "so:" lib; \
+ } \
+ } \
+ }' \
| sort -u \
- | awk ' \
- $1 == "libc.so" { next } \
- system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } \
- { print "so:" $1 } \
- ' \
)"; \
apk add --no-network --virtual .redmine-rundeps $runDeps; \
apk del --no-network .build-deps; \
diff --git a/redmine_6.0-alpine/docker-entrypoint.sh b/redmine_6-alpine/docker-entrypoint.sh
similarity index 100%
copy from redmine_6.0-alpine/docker-entrypoint.sh
copy to redmine_6-alpine/docker-entrypoint.sh
diff --git a/redmine_alpine3.23/Dockerfile b/redmine_6-alpine3.23/Dockerfile
similarity index 81%
copy from redmine_alpine3.23/Dockerfile
copy to redmine_6-alpine3.23/Dockerfile
index e53ffad..be7261f 100644
--- a/redmine_alpine3.23/Dockerfile
+++ b/redmine_6-alpine3.23/Dockerfile
@@ -122,14 +122,43 @@ RUN set -eux; \
rm /usr/local/bundle/gems/rbpdf-font-1.19.*/lib/fonts/ttf2ufm/ttf2ufm; \
\
runDeps="$( \
- scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/bundle/gems \
- | tr ',' '\n' \
+ scanelf --needed --nobanner --rpath --format '%n|%r|%F' --recursive /usr/local/bundle/gems \
+ | awk -F '|' '{ \
+ split($1, libs, ","); \
+ split($2, rpaths, ":"); \
+ \
+ # $3 is the full file path. Calculate $ORIGIN by stripping the filename.
+ origin = $3; \
+ sub("/[^/]+$", "", origin); \
+ \
+ for (i in libs) { \
+ lib = libs[i]; \
+ if (lib == "libc.so") continue; \
+ \
+ # 1. Skip if it exists in /usr/local/lib
+ if (!system("[ -e \"/usr/local/lib/" lib "\" ]")) continue; \
+ \
+ # 2. Check if satisfied by a bundled (relative) rpath
+ found = 0; \
+ for (j in rpaths) { \
+ rpath = rpaths[j]; \
+ \
+ # Only resolve $ORIGIN-relative rpaths.
+ if (sub(/^\$[{]?ORIGIN[}]?/, origin, rpath)) { \
+ if (!system("[ -e \"" rpath "/" lib "\" ]")) { \
+ found = 1; \
+ break; \
+ } \
+ } \
+ } \
+ \
+ # 3. If missing globally and not bundled locally, keep it as a system dep
+ if (!found) { \
+ print "so:" lib; \
+ } \
+ } \
+ }' \
| sort -u \
- | awk ' \
- $1 == "libc.so" { next } \
- system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } \
- { print "so:" $1 } \
- ' \
)"; \
apk add --no-network --virtual .redmine-rundeps $runDeps; \
apk del --no-network .build-deps; \
diff --git a/redmine_6.0-alpine/docker-entrypoint.sh b/redmine_6-alpine3.23/docker-entrypoint.sh
similarity index 100%
copy from redmine_6.0-alpine/docker-entrypoint.sh
copy to redmine_6-alpine3.23/docker-entrypoint.sh
diff --git a/redmine_bookworm/Dockerfile b/redmine_6-bookworm/Dockerfile
similarity index 99%
copy from redmine_bookworm/Dockerfile
copy to redmine_6-bookworm/Dockerfile
index 543087f..210257f 100644
--- a/redmine_bookworm/Dockerfile
+++ b/redmine_6-bookworm/Dockerfile
@@ -93,11 +93,9 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
- cargo \
default-libmysqlclient-dev \
freetds-dev \
gcc \
- libclang-dev \
libpq-dev \
libsqlite3-dev \
libxml2-dev \
diff --git a/redmine_6.0-alpine/docker-entrypoint.sh b/redmine_6-bookworm/docker-entrypoint.sh
similarity index 100%
copy from redmine_6.0-alpine/docker-entrypoint.sh
copy to redmine_6-bookworm/docker-entrypoint.sh
diff --git a/redmine_trixie/Dockerfile b/redmine_6-trixie/Dockerfile
similarity index 100%
copy from redmine_trixie/Dockerfile
copy to redmine_6-trixie/Dockerfile
diff --git a/redmine_6.0-alpine/docker-entrypoint.sh b/redmine_6-trixie/docker-entrypoint.sh
similarity index 100%
copy from redmine_6.0-alpine/docker-entrypoint.sh
copy to redmine_6-trixie/docker-entrypoint.sh
diff --git a/redmine_6.0-alpine/Dockerfile b/redmine_6.0-alpine/Dockerfile
index 6be834f..cad6924 100644
--- a/redmine_6.0-alpine/Dockerfile
+++ b/redmine_6.0-alpine/Dockerfile
@@ -125,13 +125,42 @@ RUN set -eux; \
rm /usr/local/bundle/gems/rbpdf-font-1.19.*/lib/fonts/ttf2ufm/ttf2ufm; \
\
runDeps="$( \
- scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/bundle/gems \
- | tr ',' '\n' \
+ scanelf --needed --nobanner --rpath --format '%n|%r|%F' --recursive /usr/local/bundle/gems \
+ | awk -F '|' '{ \
+ split($1, libs, ","); \
+ split($2, rpaths, ":"); \
+ \
+ # $3 is the full file path. Calculate $ORIGIN by stripping the filename.
+ origin = $3; \
+ sub("/[^/]+$", "", origin); \
+ \
+ for (i in libs) { \
+ lib = libs[i]; \
+ \
+ # 1. Skip if it exists in /usr/local/lib
+ if (!system("[ -e \"/usr/local/lib/" lib "\" ]")) continue; \
+ \
+ # 2. Check if satisfied by a bundled (relative) rpath
+ found = 0; \
+ for (j in rpaths) { \
+ rpath = rpaths[j]; \
+ \
+ # Only resolve $ORIGIN-relative rpaths.
+ if (sub(/^\$[{]?ORIGIN[}]?/, origin, rpath)) { \
+ if (!system("[ -e \"" rpath "/" lib "\" ]")) { \
+ found = 1; \
+ break; \
+ } \
+ } \
+ } \
+ \
+ # 3. If missing globally and not bundled locally, keep it as a system dep
+ if (!found) { \
+ print "so:" lib; \
+ } \
+ } \
+ }' \
| sort -u \
- | awk ' \
- system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } \
- { print "so:" $1 } \
- ' \
)"; \
apk add --no-network --virtual .redmine-rundeps $runDeps; \
apk del --no-network .build-deps; \
diff --git a/redmine_6.0-alpine3.23/Dockerfile b/redmine_6.0-alpine3.23/Dockerfile
index cd21891..6cd0fb0 100644
--- a/redmine_6.0-alpine3.23/Dockerfile
+++ b/redmine_6.0-alpine3.23/Dockerfile
@@ -125,13 +125,42 @@ RUN set -eux; \
rm /usr/local/bundle/gems/rbpdf-font-1.19.*/lib/fonts/ttf2ufm/ttf2ufm; \
\
runDeps="$( \
- scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/bundle/gems \
- | tr ',' '\n' \
+ scanelf --needed --nobanner --rpath --format '%n|%r|%F' --recursive /usr/local/bundle/gems \
+ | awk -F '|' '{ \
+ split($1, libs, ","); \
+ split($2, rpaths, ":"); \
+ \
+ # $3 is the full file path. Calculate $ORIGIN by stripping the filename.
+ origin = $3; \
+ sub("/[^/]+$", "", origin); \
+ \
+ for (i in libs) { \
+ lib = libs[i]; \
+ \
+ # 1. Skip if it exists in /usr/local/lib
+ if (!system("[ -e \"/usr/local/lib/" lib "\" ]")) continue; \
+ \
+ # 2. Check if satisfied by a bundled (relative) rpath
+ found = 0; \
+ for (j in rpaths) { \
+ rpath = rpaths[j]; \
+ \
+ # Only resolve $ORIGIN-relative rpaths.
+ if (sub(/^\$[{]?ORIGIN[}]?/, origin, rpath)) { \
+ if (!system("[ -e \"" rpath "/" lib "\" ]")) { \
+ found = 1; \
+ break; \
+ } \
+ } \
+ } \
+ \
+ # 3. If missing globally and not bundled locally, keep it as a system dep
+ if (!found) { \
+ print "so:" lib; \
+ } \
+ } \
+ }' \
| sort -u \
- | awk ' \
- system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } \
- { print "so:" $1 } \
- ' \
)"; \
apk add --no-network --virtual .redmine-rundeps $runDeps; \
apk del --no-network .build-deps; \
diff --git a/redmine_alpine/Dockerfile b/redmine_alpine/Dockerfile
index 3bd914b..103e107 100644
--- a/redmine_alpine/Dockerfile
+++ b/redmine_alpine/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM ruby:3.4-alpine3.24
+FROM ruby:4.0-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.3
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.3.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 61db3008c7fd18a3afc559ed656fd38fdf8df8220ac69598b319095183190b7a
+ENV REDMINE_VERSION 7.0.0
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-7.0.0.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 857e9f8860c31e4c531389e5d93eea26488dba69830484a3b0aa904be615e90a
ENV RAILS_LOG_TO_STDOUT true
RUN set -eux; \
@@ -122,14 +122,43 @@ RUN set -eux; \
rm /usr/local/bundle/gems/rbpdf-font-1.19.*/lib/fonts/ttf2ufm/ttf2ufm; \
\
runDeps="$( \
- scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/bundle/gems \
- | tr ',' '\n' \
+ scanelf --needed --nobanner --rpath --format '%n|%r|%F' --recursive /usr/local/bundle/gems \
+ | awk -F '|' '{ \
+ split($1, libs, ","); \
+ split($2, rpaths, ":"); \
+ \
+ # $3 is the full file path. Calculate $ORIGIN by stripping the filename.
+ origin = $3; \
+ sub("/[^/]+$", "", origin); \
+ \
+ for (i in libs) { \
+ lib = libs[i]; \
+ if (lib == "libc.so") continue; \
+ \
+ # 1. Skip if it exists in /usr/local/lib
+ if (!system("[ -e \"/usr/local/lib/" lib "\" ]")) continue; \
+ \
+ # 2. Check if satisfied by a bundled (relative) rpath
+ found = 0; \
+ for (j in rpaths) { \
+ rpath = rpaths[j]; \
+ \
+ # Only resolve $ORIGIN-relative rpaths.
+ if (sub(/^\$[{]?ORIGIN[}]?/, origin, rpath)) { \
+ if (!system("[ -e \"" rpath "/" lib "\" ]")) { \
+ found = 1; \
+ break; \
+ } \
+ } \
+ } \
+ \
+ # 3. If missing globally and not bundled locally, keep it as a system dep
+ if (!found) { \
+ print "so:" lib; \
+ } \
+ } \
+ }' \
| sort -u \
- | awk ' \
- $1 == "libc.so" { next } \
- system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } \
- { print "so:" $1 } \
- ' \
)"; \
apk add --no-network --virtual .redmine-rundeps $runDeps; \
apk del --no-network .build-deps; \
diff --git a/redmine_alpine3.23/Dockerfile b/redmine_alpine3.23/Dockerfile
index e53ffad..9511b44 100644
--- a/redmine_alpine3.23/Dockerfile
+++ b/redmine_alpine3.23/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM ruby:3.4-alpine3.23
+FROM ruby:4.0-alpine3.23
# 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.3
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-6.1.3.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 61db3008c7fd18a3afc559ed656fd38fdf8df8220ac69598b319095183190b7a
+ENV REDMINE_VERSION 7.0.0
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-7.0.0.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 857e9f8860c31e4c531389e5d93eea26488dba69830484a3b0aa904be615e90a
ENV RAILS_LOG_TO_STDOUT true
RUN set -eux; \
@@ -122,14 +122,43 @@ RUN set -eux; \
rm /usr/local/bundle/gems/rbpdf-font-1.19.*/lib/fonts/ttf2ufm/ttf2ufm; \
\
runDeps="$( \
- scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/bundle/gems \
- | tr ',' '\n' \
+ scanelf --needed --nobanner --rpath --format '%n|%r|%F' --recursive /usr/local/bundle/gems \
+ | awk -F '|' '{ \
+ split($1, libs, ","); \
+ split($2, rpaths, ":"); \
+ \
+ # $3 is the full file path. Calculate $ORIGIN by stripping the filename.
+ origin = $3; \
+ sub("/[^/]+$", "", origin); \
+ \
+ for (i in libs) { \
+ lib = libs[i]; \
+ if (lib == "libc.so") continue; \
+ \
+ # 1. Skip if it exists in /usr/local/lib
+ if (!system("[ -e \"/usr/local/lib/" lib "\" ]")) continue; \
+ \
+ # 2. Check if satisfied by a bundled (relative) rpath
+ found = 0; \
+ for (j in rpaths) { \
+ rpath = rpaths[j]; \
+ \
+ # Only resolve $ORIGIN-relative rpaths.
+ if (sub(/^\$[{]?ORIGIN[}]?/, origin, rpath)) { \
+ if (!system("[ -e \"" rpath "/" lib "\" ]")) { \
+ found = 1; \
+ break; \
+ } \
+ } \
+ } \
+ \
+ # 3. If missing globally and not bundled locally, keep it as a system dep
+ if (!found) { \
+ print "so:" lib; \
+ } \
+ } \
+ }' \
| sort -u \
- | awk ' \
- $1 == "libc.so" { next } \
- system("[ -e /usr/local/lib/" $1 " ]") == 0 { next } \
- { print "so:" $1 } \
- ' \
)"; \
apk add --no-network --virtual .redmine-rundeps $runDeps; \
apk del --no-network .build-deps; \
diff --git a/redmine_bookworm/Dockerfile b/redmine_bookworm/Dockerfile
index 543087f..c23410a 100644
--- a/redmine_bookworm/Dockerfile
+++ b/redmine_bookworm/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM ruby:3.4-slim-bookworm
+FROM ruby:4.0-slim-bookworm
# 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
@@ -71,9 +71,9 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-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 REDMINE_VERSION 7.0.0
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-7.0.0.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 857e9f8860c31e4c531389e5d93eea26488dba69830484a3b0aa904be615e90a
ENV RAILS_LOG_TO_STDOUT true
RUN set -eux; \
@@ -93,11 +93,9 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
- cargo \
default-libmysqlclient-dev \
freetds-dev \
gcc \
- libclang-dev \
libpq-dev \
libsqlite3-dev \
libxml2-dev \
diff --git a/redmine_trixie/Dockerfile b/redmine_trixie/Dockerfile
index c74ebdc..fefac61 100644
--- a/redmine_trixie/Dockerfile
+++ b/redmine_trixie/Dockerfile
@@ -4,7 +4,7 @@
# PLEASE DO NOT EDIT IT DIRECTLY.
#
-FROM ruby:3.4-slim-trixie
+FROM ruby:4.0-slim-trixie
# 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
@@ -70,9 +70,9 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-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 REDMINE_VERSION 7.0.0
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-7.0.0.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 857e9f8860c31e4c531389e5d93eea26488dba69830484a3b0aa904be615e90a
ENV RAILS_LOG_TO_STDOUT true
RUN set -eux; \
@@ -92,7 +92,6 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
- cargo \
default-libmysqlclient-dev \
freetds-dev \
gcc \
@@ -107,6 +106,13 @@ RUN set -eux; \
pkgconf \
xz-utils \
; \
+# error: rustc 1.85.0 is not supported by the following packages: ... requires rustc 1.88.0
+# install cargo/rust from backports so that it is new enough
+# https://packages.debian.org/trixie-backports/cargo
+ echo 'deb http://deb.debian.org/debian trixie-backports main' > /etc/apt/sources.list.d/backports.list; \
+ apt-get update; \
+ apt-get install -y --no-install-recommends cargo/trixie-backports rustc/trixie-backports; \
+ rm -f /etc/apt/sources.list.d/backports.list; \
rm -rf /var/lib/apt/lists/*; \
\
gosu redmine bundle config --local without 'development test'; \Relevant Maintainers: |
|
The Redmin latest version is v7.0.0 , but office redmine image latest version is v6.1.3. Cloud you think update it to newlest version ? |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Changes: