Skip to content

Update redmine#17837

Merged
tianon merged 1 commit intodocker-library:masterfrom
docker-library-bot:redmine
Nov 4, 2024
Merged

Update redmine#17837
tianon merged 1 commit intodocker-library:masterfrom
docker-library-bot:redmine

Conversation

@yosifkit
Copy link
Member

@yosifkit yosifkit commented Nov 4, 2024

Changes:

Changes:

- docker-library/redmine@47d9994: Update 5.1 to 5.1.4
- docker-library/redmine@dd8cf6b: Update 5.0 to 5.0.10
- docker-library/redmine@45af1fd: Update `generate-stackbrew-library.sh` to support `BASHBREW_LIBRARY` for easier cascading updates
- docker-library/redmine@23cb85e: Update to actions/checkout@v4 🙃
- docker-library/redmine@ec4b14e: Merge pull request docker-library/redmine#339 from infosiftr/leftover-passengers
- docker-library/redmine@7498e9c: Remove leftover `passenger` references
@yosifkit yosifkit requested a review from a team as a code owner November 4, 2024 17:33
@github-actions
Copy link

github-actions bot commented Nov 4, 2024

Diff for c69f002:
diff --git a/_bashbrew-cat b/_bashbrew-cat
index 7c9b5de..eac9d8b 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,32 +1,32 @@
 Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
 GitRepo: https://github.com/docker-library/redmine.git
 
-Tags: 5.0.9, 5.0, 5.0.9-bookworm, 5.0-bookworm
+Tags: 5.0.10, 5.0, 5.0.10-bookworm, 5.0-bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f44d7a06e867841594aaaf45fddf59a77fad5337
+GitCommit: dd8cf6be1e8a824236e6717cb948695b7740e77c
 Directory: 5.0/bookworm
 
-Tags: 5.0.9-alpine3.19, 5.0-alpine3.19
+Tags: 5.0.10-alpine3.19, 5.0-alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f44d7a06e867841594aaaf45fddf59a77fad5337
+GitCommit: dd8cf6be1e8a824236e6717cb948695b7740e77c
 Directory: 5.0/alpine3.19
 
-Tags: 5.0.9-alpine3.20, 5.0-alpine3.20, 5.0.9-alpine, 5.0-alpine
+Tags: 5.0.10-alpine3.20, 5.0-alpine3.20, 5.0.10-alpine, 5.0-alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f44d7a06e867841594aaaf45fddf59a77fad5337
+GitCommit: dd8cf6be1e8a824236e6717cb948695b7740e77c
 Directory: 5.0/alpine3.20
 
-Tags: 5.1.3, 5.1, 5, latest, 5.1.3-bookworm, 5.1-bookworm, 5-bookworm, bookworm
+Tags: 5.1.4, 5.1, 5, latest, 5.1.4-bookworm, 5.1-bookworm, 5-bookworm, bookworm
 Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: f44d7a06e867841594aaaf45fddf59a77fad5337
+GitCommit: 47d999427ba69310da16e625ad8908a75a556178
 Directory: 5.1/bookworm
 
-Tags: 5.1.3-alpine3.19, 5.1-alpine3.19, 5-alpine3.19, alpine3.19
+Tags: 5.1.4-alpine3.19, 5.1-alpine3.19, 5-alpine3.19, alpine3.19
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: f44d7a06e867841594aaaf45fddf59a77fad5337
+GitCommit: 47d999427ba69310da16e625ad8908a75a556178
 Directory: 5.1/alpine3.19
 
-Tags: 5.1.3-alpine3.20, 5.1-alpine3.20, 5-alpine3.20, alpine3.20, 5.1.3-alpine, 5.1-alpine, 5-alpine, alpine
+Tags: 5.1.4-alpine3.20, 5.1-alpine3.20, 5-alpine3.20, alpine3.20, 5.1.4-alpine, 5.1-alpine, 5-alpine, alpine
 Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: f44d7a06e867841594aaaf45fddf59a77fad5337
+GitCommit: 47d999427ba69310da16e625ad8908a75a556178
 Directory: 5.1/alpine3.20
diff --git a/_bashbrew-list b/_bashbrew-list
index 20926cc..adf0e15 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,21 +8,21 @@ redmine:5.0-alpine
 redmine:5.0-alpine3.19
 redmine:5.0-alpine3.20
 redmine:5.0-bookworm
-redmine:5.0.9
-redmine:5.0.9-alpine
-redmine:5.0.9-alpine3.19
-redmine:5.0.9-alpine3.20
-redmine:5.0.9-bookworm
+redmine:5.0.10
+redmine:5.0.10-alpine
+redmine:5.0.10-alpine3.19
+redmine:5.0.10-alpine3.20
+redmine:5.0.10-bookworm
 redmine:5.1
 redmine:5.1-alpine
 redmine:5.1-alpine3.19
 redmine:5.1-alpine3.20
 redmine:5.1-bookworm
-redmine:5.1.3
-redmine:5.1.3-alpine
-redmine:5.1.3-alpine3.19
-redmine:5.1.3-alpine3.20
-redmine:5.1.3-bookworm
+redmine:5.1.4
+redmine:5.1.4-alpine
+redmine:5.1.4-alpine3.19
+redmine:5.1.4-alpine3.20
+redmine:5.1.4-bookworm
 redmine:alpine
 redmine:alpine3.19
 redmine:alpine3.20
diff --git a/redmine_5.0-alpine/Dockerfile b/redmine_5.0-alpine/Dockerfile
index f958325..c8591be 100644
--- a/redmine_5.0-alpine/Dockerfile
+++ b/redmine_5.0-alpine/Dockerfile
@@ -73,9 +73,9 @@ RUN set -eux; \
 	chown redmine:redmine "$HOME"; \
 	chmod 1777 "$HOME"
 
-ENV REDMINE_VERSION 5.0.9
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.0.9.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 a7d9b05ff258ab2c106ba5d45589eeaec3e7ebb35427aa73a037ff3ae71251df
+ENV REDMINE_VERSION 5.0.10
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.0.10.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 cb0df0f6feb5a3198e59e36b239e9a1110011ed7078316bd1c8058247f5b9506
 
 RUN set -eux; \
 	wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
diff --git a/redmine_5.0-alpine/docker-entrypoint.sh b/redmine_5.0-alpine/docker-entrypoint.sh
index ff3f94b..28fe8ce 100755
--- a/redmine_5.0-alpine/docker-entrypoint.sh
+++ b/redmine_5.0-alpine/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 
 isLikelyRedmine=
 case "$1" in
-	rails | rake | passenger ) isLikelyRedmine=1 ;;
+	rails | rake ) isLikelyRedmine=1 ;;
 esac
 
 _fix_permissions() {
@@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then
 
 	# remove PID file to enable restarting the container
 	rm -f tmp/pids/server.pid
-
-	if [ "$1" = 'passenger' ]; then
-		# Don't fear the reaper.
-		set -- tini -- "$@"
-	fi
 fi
 
 exec "$@"
diff --git a/redmine_5.0-alpine3.19/Dockerfile b/redmine_5.0-alpine3.19/Dockerfile
index 17a2b89..0324c59 100644
--- a/redmine_5.0-alpine3.19/Dockerfile
+++ b/redmine_5.0-alpine3.19/Dockerfile
@@ -73,9 +73,9 @@ RUN set -eux; \
 	chown redmine:redmine "$HOME"; \
 	chmod 1777 "$HOME"
 
-ENV REDMINE_VERSION 5.0.9
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.0.9.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 a7d9b05ff258ab2c106ba5d45589eeaec3e7ebb35427aa73a037ff3ae71251df
+ENV REDMINE_VERSION 5.0.10
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.0.10.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 cb0df0f6feb5a3198e59e36b239e9a1110011ed7078316bd1c8058247f5b9506
 
 RUN set -eux; \
 	wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
diff --git a/redmine_5.0-alpine3.19/docker-entrypoint.sh b/redmine_5.0-alpine3.19/docker-entrypoint.sh
index ff3f94b..28fe8ce 100755
--- a/redmine_5.0-alpine3.19/docker-entrypoint.sh
+++ b/redmine_5.0-alpine3.19/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 
 isLikelyRedmine=
 case "$1" in
-	rails | rake | passenger ) isLikelyRedmine=1 ;;
+	rails | rake ) isLikelyRedmine=1 ;;
 esac
 
 _fix_permissions() {
@@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then
 
 	# remove PID file to enable restarting the container
 	rm -f tmp/pids/server.pid
-
-	if [ "$1" = 'passenger' ]; then
-		# Don't fear the reaper.
-		set -- tini -- "$@"
-	fi
 fi
 
 exec "$@"
diff --git a/redmine_5.0-bookworm/Dockerfile b/redmine_5.0-bookworm/Dockerfile
index ea0b4b1..29096fe 100644
--- a/redmine_5.0-bookworm/Dockerfile
+++ b/redmine_5.0-bookworm/Dockerfile
@@ -76,9 +76,9 @@ RUN set -eux; \
 	chown redmine:redmine "$HOME"; \
 	chmod 1777 "$HOME"
 
-ENV REDMINE_VERSION 5.0.9
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.0.9.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 a7d9b05ff258ab2c106ba5d45589eeaec3e7ebb35427aa73a037ff3ae71251df
+ENV REDMINE_VERSION 5.0.10
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.0.10.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 cb0df0f6feb5a3198e59e36b239e9a1110011ed7078316bd1c8058247f5b9506
 
 RUN set -eux; \
 # if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
diff --git a/redmine_5.0-bookworm/docker-entrypoint.sh b/redmine_5.0-bookworm/docker-entrypoint.sh
index ff3f94b..28fe8ce 100755
--- a/redmine_5.0-bookworm/docker-entrypoint.sh
+++ b/redmine_5.0-bookworm/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 
 isLikelyRedmine=
 case "$1" in
-	rails | rake | passenger ) isLikelyRedmine=1 ;;
+	rails | rake ) isLikelyRedmine=1 ;;
 esac
 
 _fix_permissions() {
@@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then
 
 	# remove PID file to enable restarting the container
 	rm -f tmp/pids/server.pid
-
-	if [ "$1" = 'passenger' ]; then
-		# Don't fear the reaper.
-		set -- tini -- "$@"
-	fi
 fi
 
 exec "$@"
diff --git a/redmine_alpine/Dockerfile b/redmine_alpine/Dockerfile
index edb73c9..1faf1ef 100644
--- a/redmine_alpine/Dockerfile
+++ b/redmine_alpine/Dockerfile
@@ -73,9 +73,9 @@ RUN set -eux; \
 	chown redmine:redmine "$HOME"; \
 	chmod 1777 "$HOME"
 
-ENV REDMINE_VERSION 5.1.3
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.1.3.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 8a22320fd9c940e6598f3ad5fb7a3933195c86068eee994ba6fcdc22c5cecb59
+ENV REDMINE_VERSION 5.1.4
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.1.4.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 f5738d6a107f231b8f4b0ae5410e0c45742d75e0ef30c4b31a27c0ac9dafd51c
 
 RUN set -eux; \
 	wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
diff --git a/redmine_alpine/docker-entrypoint.sh b/redmine_alpine/docker-entrypoint.sh
index ff3f94b..28fe8ce 100755
--- a/redmine_alpine/docker-entrypoint.sh
+++ b/redmine_alpine/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 
 isLikelyRedmine=
 case "$1" in
-	rails | rake | passenger ) isLikelyRedmine=1 ;;
+	rails | rake ) isLikelyRedmine=1 ;;
 esac
 
 _fix_permissions() {
@@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then
 
 	# remove PID file to enable restarting the container
 	rm -f tmp/pids/server.pid
-
-	if [ "$1" = 'passenger' ]; then
-		# Don't fear the reaper.
-		set -- tini -- "$@"
-	fi
 fi
 
 exec "$@"
diff --git a/redmine_alpine3.19/Dockerfile b/redmine_alpine3.19/Dockerfile
index 2997495..2d7da9d 100644
--- a/redmine_alpine3.19/Dockerfile
+++ b/redmine_alpine3.19/Dockerfile
@@ -73,9 +73,9 @@ RUN set -eux; \
 	chown redmine:redmine "$HOME"; \
 	chmod 1777 "$HOME"
 
-ENV REDMINE_VERSION 5.1.3
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.1.3.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 8a22320fd9c940e6598f3ad5fb7a3933195c86068eee994ba6fcdc22c5cecb59
+ENV REDMINE_VERSION 5.1.4
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.1.4.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 f5738d6a107f231b8f4b0ae5410e0c45742d75e0ef30c4b31a27c0ac9dafd51c
 
 RUN set -eux; \
 	wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
diff --git a/redmine_alpine3.19/docker-entrypoint.sh b/redmine_alpine3.19/docker-entrypoint.sh
index ff3f94b..28fe8ce 100755
--- a/redmine_alpine3.19/docker-entrypoint.sh
+++ b/redmine_alpine3.19/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 
 isLikelyRedmine=
 case "$1" in
-	rails | rake | passenger ) isLikelyRedmine=1 ;;
+	rails | rake ) isLikelyRedmine=1 ;;
 esac
 
 _fix_permissions() {
@@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then
 
 	# remove PID file to enable restarting the container
 	rm -f tmp/pids/server.pid
-
-	if [ "$1" = 'passenger' ]; then
-		# Don't fear the reaper.
-		set -- tini -- "$@"
-	fi
 fi
 
 exec "$@"
diff --git a/redmine_bookworm/Dockerfile b/redmine_bookworm/Dockerfile
index 68cc00e..0b86210 100644
--- a/redmine_bookworm/Dockerfile
+++ b/redmine_bookworm/Dockerfile
@@ -76,9 +76,9 @@ RUN set -eux; \
 	chown redmine:redmine "$HOME"; \
 	chmod 1777 "$HOME"
 
-ENV REDMINE_VERSION 5.1.3
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.1.3.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 8a22320fd9c940e6598f3ad5fb7a3933195c86068eee994ba6fcdc22c5cecb59
+ENV REDMINE_VERSION 5.1.4
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.1.4.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 f5738d6a107f231b8f4b0ae5410e0c45742d75e0ef30c4b31a27c0ac9dafd51c
 
 RUN set -eux; \
 # if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
diff --git a/redmine_bookworm/docker-entrypoint.sh b/redmine_bookworm/docker-entrypoint.sh
index ff3f94b..28fe8ce 100755
--- a/redmine_bookworm/docker-entrypoint.sh
+++ b/redmine_bookworm/docker-entrypoint.sh
@@ -26,7 +26,7 @@ file_env() {
 
 isLikelyRedmine=
 case "$1" in
-	rails | rake | passenger ) isLikelyRedmine=1 ;;
+	rails | rake ) isLikelyRedmine=1 ;;
 esac
 
 _fix_permissions() {
@@ -155,11 +155,6 @@ if [ -n "$isLikelyRedmine" ]; then
 
 	# remove PID file to enable restarting the container
 	rm -f tmp/pids/server.pid
-
-	if [ "$1" = 'passenger' ]; then
-		# Don't fear the reaper.
-		set -- tini -- "$@"
-	fi
 fi
 
 exec "$@"

Relevant Maintainers:

@tianon tianon merged commit 3ab7f36 into docker-library:master Nov 4, 2024
@tianon tianon deleted the redmine branch November 4, 2024 20:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants