Update redmine #12139
Merged
Update redmine #12139
Conversation
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
Changes: - docker-library/redmine@a570aa6: Merge pull request docker-library/redmine#261 from infosiftr/5.0 - docker-library/redmine@540786b: Add 5.0.0 - docker-library/redmine@24906a7: Update to 4.1.7 - docker-library/redmine@bc22e39: Update to 4.2.5
Diff for f99dcad:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 98d7678..13e04da 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,30 +1,40 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/redmine.git
-Tags: 4.1.6, 4.1, 4.1.6-bullseye, 4.1-bullseye
+Tags: 4.1.7, 4.1, 4.1.7-bullseye, 4.1-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 13ee124e971c77a890c91f61017e905584898f94
+GitCommit: 540786b2e371dcfb74be6da6bc2a77f75d9d6b07
Directory: 4.1
-Tags: 4.1.6-alpine, 4.1-alpine, 4.1.6-alpine3.15, 4.1-alpine3.15
+Tags: 4.1.7-alpine, 4.1-alpine, 4.1.7-alpine3.15, 4.1-alpine3.15
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 13ee124e971c77a890c91f61017e905584898f94
+GitCommit: 540786b2e371dcfb74be6da6bc2a77f75d9d6b07
Directory: 4.1/alpine
-Tags: 4.1.6-passenger, 4.1-passenger
+Tags: 4.1.7-passenger, 4.1-passenger
GitCommit: 5444fd564ffba5c871a4d964b54c5559ee52e61e
Directory: 4.1/passenger
-Tags: 4.2.4, 4.2, 4, latest, 4.2.4-bullseye, 4.2-bullseye, 4-bullseye, bullseye
+Tags: 4.2.5, 4.2, 4, 4.2.5-bullseye, 4.2-bullseye, 4-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 44dd05cfc2ad228cb4699674160b89783ab5b756
+GitCommit: 540786b2e371dcfb74be6da6bc2a77f75d9d6b07
Directory: 4.2
-Tags: 4.2.4-alpine, 4.2-alpine, 4-alpine, alpine, 4.2.4-alpine3.15, 4.2-alpine3.15, 4-alpine3.15, alpine3.15
+Tags: 4.2.5-alpine, 4.2-alpine, 4-alpine, 4.2.5-alpine3.15, 4.2-alpine3.15, 4-alpine3.15
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 44dd05cfc2ad228cb4699674160b89783ab5b756
+GitCommit: 540786b2e371dcfb74be6da6bc2a77f75d9d6b07
Directory: 4.2/alpine
-Tags: 4.2.4-passenger, 4.2-passenger, 4-passenger, passenger
+Tags: 4.2.5-passenger, 4.2-passenger, 4-passenger
GitCommit: 5444fd564ffba5c871a4d964b54c5559ee52e61e
Directory: 4.2/passenger
+
+Tags: 5.0.0, 5.0, 5, latest, 5.0.0-bullseye, 5.0-bullseye, 5-bullseye, bullseye
+Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 540786b2e371dcfb74be6da6bc2a77f75d9d6b07
+Directory: 5.0
+
+Tags: 5.0.0-alpine, 5.0-alpine, 5-alpine, alpine, 5.0.0-alpine3.15, 5.0-alpine3.15, 5-alpine3.15, alpine3.15
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 540786b2e371dcfb74be6da6bc2a77f75d9d6b07
+Directory: 5.0/alpine
diff --git a/_bashbrew-list b/_bashbrew-list
index 1db03c3..ecc41e7 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -8,23 +8,34 @@ redmine:4.1-alpine
redmine:4.1-alpine3.15
redmine:4.1-bullseye
redmine:4.1-passenger
-redmine:4.1.6
-redmine:4.1.6-alpine
-redmine:4.1.6-alpine3.15
-redmine:4.1.6-bullseye
-redmine:4.1.6-passenger
+redmine:4.1.7
+redmine:4.1.7-alpine
+redmine:4.1.7-alpine3.15
+redmine:4.1.7-bullseye
+redmine:4.1.7-passenger
redmine:4.2
redmine:4.2-alpine
redmine:4.2-alpine3.15
redmine:4.2-bullseye
redmine:4.2-passenger
-redmine:4.2.4
-redmine:4.2.4-alpine
-redmine:4.2.4-alpine3.15
-redmine:4.2.4-bullseye
-redmine:4.2.4-passenger
+redmine:4.2.5
+redmine:4.2.5-alpine
+redmine:4.2.5-alpine3.15
+redmine:4.2.5-bullseye
+redmine:4.2.5-passenger
+redmine:5
+redmine:5-alpine
+redmine:5-alpine3.15
+redmine:5-bullseye
+redmine:5.0
+redmine:5.0-alpine
+redmine:5.0-alpine3.15
+redmine:5.0-bullseye
+redmine:5.0.0
+redmine:5.0.0-alpine
+redmine:5.0.0-alpine3.15
+redmine:5.0.0-bullseye
redmine:alpine
redmine:alpine3.15
redmine:bullseye
redmine:latest
-redmine:passenger
diff --git a/redmine_alpine3.15/Dockerfile b/redmine_4-alpine3.15/Dockerfile
similarity index 88%
copy from redmine_alpine3.15/Dockerfile
copy to redmine_4-alpine3.15/Dockerfile
index eb054dd..1734dcb 100644
--- a/redmine_alpine3.15/Dockerfile
+++ b/redmine_4-alpine3.15/Dockerfile
@@ -39,9 +39,9 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.2.4
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.2.4.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 cf649f5d4ff783582f82bebd4a5099ef63acb3d5573bbe6b4bf64f293c61c9ce
+ENV REDMINE_VERSION 4.2.5
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.2.5.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 d97084b0eaad7266056814a0c0aec2737f4d23b8f67ce90c01a79b2eb5605984
RUN set -eux; \
wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
@@ -75,6 +75,10 @@ RUN set -eux; \
; \
\
su-exec redmine bundle config --local without 'development test'; \
+# https://github.com/redmine/redmine/commit/23dc108e70a0794f444803ac827a690085dcd557
+# ("gem puma" already exists in the Gemfile, but under "group :test" and we want it all the time)
+ puma="$(grep -E "^[[:space:]]*gem [:'\"]puma['\",[:space:]].*\$" Gemfile)"; \
+ { echo; echo "$puma"; } | sed -re 's/^[[:space:]]+//' >> Gemfile; \
# fill up "database.yml" with bogus entries so the redmine Gemfile will pre-install all database adapter dependencies
# https://github.com/redmine/redmine/blob/e9f9767089a4e3efbd73c35fc55c5c7eb85dd7d3/Gemfile#L50-L79
echo '# the following entries only exist to force `bundle install` to pre-install all database adapter dependencies -- they can be safely removed/ignored' > ./config/database.yml; \
diff --git a/redmine_4.1-alpine3.15/docker-entrypoint.sh b/redmine_4-alpine3.15/docker-entrypoint.sh
similarity index 100%
copy from redmine_4.1-alpine3.15/docker-entrypoint.sh
copy to redmine_4-alpine3.15/docker-entrypoint.sh
diff --git a/redmine_bullseye/Dockerfile b/redmine_4-bullseye/Dockerfile
similarity index 89%
copy from redmine_bullseye/Dockerfile
copy to redmine_4-bullseye/Dockerfile
index 94ebb5a..69e33d9 100644
--- a/redmine_bullseye/Dockerfile
+++ b/redmine_4-bullseye/Dockerfile
@@ -43,9 +43,9 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.2.4
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.2.4.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 cf649f5d4ff783582f82bebd4a5099ef63acb3d5573bbe6b4bf64f293c61c9ce
+ENV REDMINE_VERSION 4.2.5
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.2.5.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 d97084b0eaad7266056814a0c0aec2737f4d23b8f67ce90c01a79b2eb5605984
RUN set -eux; \
# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
@@ -77,6 +77,10 @@ RUN set -eux; \
rm -rf /var/lib/apt/lists/*; \
\
gosu redmine bundle config --local without 'development test'; \
+# https://github.com/redmine/redmine/commit/23dc108e70a0794f444803ac827a690085dcd557
+# ("gem puma" already exists in the Gemfile, but under "group :test" and we want it all the time)
+ puma="$(grep -E "^[[:space:]]*gem [:'\"]puma['\",[:space:]].*\$" Gemfile)"; \
+ { echo; echo "$puma"; } | sed -re 's/^[[:space:]]+//' >> Gemfile; \
# fill up "database.yml" with bogus entries so the redmine Gemfile will pre-install all database adapter dependencies
# https://github.com/redmine/redmine/blob/e9f9767089a4e3efbd73c35fc55c5c7eb85dd7d3/Gemfile#L50-L79
echo '# the following entries only exist to force `bundle install` to pre-install all database adapter dependencies -- they can be safely removed/ignored' > ./config/database.yml; \
diff --git a/redmine_4.1-bullseye/docker-entrypoint.sh b/redmine_4-bullseye/docker-entrypoint.sh
similarity index 100%
copy from redmine_4.1-bullseye/docker-entrypoint.sh
copy to redmine_4-bullseye/docker-entrypoint.sh
diff --git a/redmine_passenger/Dockerfile b/redmine_4-passenger/Dockerfile
similarity index 100%
rename from redmine_passenger/Dockerfile
rename to redmine_4-passenger/Dockerfile
diff --git a/redmine_4.1-alpine3.15/Dockerfile b/redmine_4.1-alpine3.15/Dockerfile
index c50bc53..1734de8 100644
--- a/redmine_4.1-alpine3.15/Dockerfile
+++ b/redmine_4.1-alpine3.15/Dockerfile
@@ -39,9 +39,9 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.1.6
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.1.6.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 ad78999cb65ba2d1be344fdd582e4f24a9b97c88710ab217a954df437e04072f
+ENV REDMINE_VERSION 4.1.7
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.1.7.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 bf56cade5d0a6623af590652bffe2865208f399fe77746d4e1bbd9d1a995a38a
RUN set -eux; \
wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
@@ -75,6 +75,10 @@ RUN set -eux; \
; \
\
su-exec redmine bundle config --local without 'development test'; \
+# https://github.com/redmine/redmine/commit/23dc108e70a0794f444803ac827a690085dcd557
+# ("gem puma" already exists in the Gemfile, but under "group :test" and we want it all the time)
+ puma="$(grep -E "^[[:space:]]*gem [:'\"]puma['\",[:space:]].*\$" Gemfile)"; \
+ { echo; echo "$puma"; } | sed -re 's/^[[:space:]]+//' >> Gemfile; \
# fill up "database.yml" with bogus entries so the redmine Gemfile will pre-install all database adapter dependencies
# https://github.com/redmine/redmine/blob/e9f9767089a4e3efbd73c35fc55c5c7eb85dd7d3/Gemfile#L50-L79
echo '# the following entries only exist to force `bundle install` to pre-install all database adapter dependencies -- they can be safely removed/ignored' > ./config/database.yml; \
diff --git a/redmine_4.1-bullseye/Dockerfile b/redmine_4.1-bullseye/Dockerfile
index 295a85d..da5ba95 100644
--- a/redmine_4.1-bullseye/Dockerfile
+++ b/redmine_4.1-bullseye/Dockerfile
@@ -43,9 +43,9 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.1.6
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.1.6.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 ad78999cb65ba2d1be344fdd582e4f24a9b97c88710ab217a954df437e04072f
+ENV REDMINE_VERSION 4.1.7
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.1.7.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 bf56cade5d0a6623af590652bffe2865208f399fe77746d4e1bbd9d1a995a38a
RUN set -eux; \
# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
@@ -77,6 +77,10 @@ RUN set -eux; \
rm -rf /var/lib/apt/lists/*; \
\
gosu redmine bundle config --local without 'development test'; \
+# https://github.com/redmine/redmine/commit/23dc108e70a0794f444803ac827a690085dcd557
+# ("gem puma" already exists in the Gemfile, but under "group :test" and we want it all the time)
+ puma="$(grep -E "^[[:space:]]*gem [:'\"]puma['\",[:space:]].*\$" Gemfile)"; \
+ { echo; echo "$puma"; } | sed -re 's/^[[:space:]]+//' >> Gemfile; \
# fill up "database.yml" with bogus entries so the redmine Gemfile will pre-install all database adapter dependencies
# https://github.com/redmine/redmine/blob/e9f9767089a4e3efbd73c35fc55c5c7eb85dd7d3/Gemfile#L50-L79
echo '# the following entries only exist to force `bundle install` to pre-install all database adapter dependencies -- they can be safely removed/ignored' > ./config/database.yml; \
diff --git a/redmine_alpine3.15/Dockerfile b/redmine_alpine3.15/Dockerfile
index eb054dd..63f18cb 100644
--- a/redmine_alpine3.15/Dockerfile
+++ b/redmine_alpine3.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7-alpine3.15
+FROM ruby:3.1-alpine3.15
# 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
@@ -39,9 +39,9 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.2.4
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.2.4.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 cf649f5d4ff783582f82bebd4a5099ef63acb3d5573bbe6b4bf64f293c61c9ce
+ENV REDMINE_VERSION 5.0.0
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.0.0.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 7e840dec846646dae52fff5c631b135d1c915d6e03ea6f01ca8f12ad35803bef
RUN set -eux; \
wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
@@ -75,6 +75,10 @@ RUN set -eux; \
; \
\
su-exec redmine bundle config --local without 'development test'; \
+# https://github.com/redmine/redmine/commit/23dc108e70a0794f444803ac827a690085dcd557
+# ("gem puma" already exists in the Gemfile, but under "group :test" and we want it all the time)
+ puma="$(grep -E "^[[:space:]]*gem [:'\"]puma['\",[:space:]].*\$" Gemfile)"; \
+ { echo; echo "$puma"; } | sed -re 's/^[[:space:]]+//' >> Gemfile; \
# fill up "database.yml" with bogus entries so the redmine Gemfile will pre-install all database adapter dependencies
# https://github.com/redmine/redmine/blob/e9f9767089a4e3efbd73c35fc55c5c7eb85dd7d3/Gemfile#L50-L79
echo '# the following entries only exist to force `bundle install` to pre-install all database adapter dependencies -- they can be safely removed/ignored' > ./config/database.yml; \
diff --git a/redmine_bullseye/Dockerfile b/redmine_bullseye/Dockerfile
index 94ebb5a..2e4db88 100644
--- a/redmine_bullseye/Dockerfile
+++ b/redmine_bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7-slim-bullseye
+FROM ruby:3.1-slim-bullseye
# 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
@@ -43,9 +43,9 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.2.4
-ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-4.2.4.tar.gz
-ENV REDMINE_DOWNLOAD_SHA256 cf649f5d4ff783582f82bebd4a5099ef63acb3d5573bbe6b4bf64f293c61c9ce
+ENV REDMINE_VERSION 5.0.0
+ENV REDMINE_DOWNLOAD_URL https://www.redmine.org/releases/redmine-5.0.0.tar.gz
+ENV REDMINE_DOWNLOAD_SHA256 7e840dec846646dae52fff5c631b135d1c915d6e03ea6f01ca8f12ad35803bef
RUN set -eux; \
# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
@@ -77,6 +77,10 @@ RUN set -eux; \
rm -rf /var/lib/apt/lists/*; \
\
gosu redmine bundle config --local without 'development test'; \
+# https://github.com/redmine/redmine/commit/23dc108e70a0794f444803ac827a690085dcd557
+# ("gem puma" already exists in the Gemfile, but under "group :test" and we want it all the time)
+ puma="$(grep -E "^[[:space:]]*gem [:'\"]puma['\",[:space:]].*\$" Gemfile)"; \
+ { echo; echo "$puma"; } | sed -re 's/^[[:space:]]+//' >> Gemfile; \
# fill up "database.yml" with bogus entries so the redmine Gemfile will pre-install all database adapter dependencies
# https://github.com/redmine/redmine/blob/e9f9767089a4e3efbd73c35fc55c5c7eb85dd7d3/Gemfile#L50-L79
echo '# the following entries only exist to force `bundle install` to pre-install all database adapter dependencies -- they can be safely removed/ignored' > ./config/database.yml; \Relevant Maintainers: |
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: