Skip to content

Commit 922b31e

Browse files
committed
1 parent a57cd24 commit 922b31e

File tree

8 files changed

+83
-1
lines changed

8 files changed

+83
-1
lines changed

5.0/alpine3.20/Dockerfile

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

5.0/alpine3.21/Dockerfile

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

5.0/bookworm/Dockerfile

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

5.1/alpine3.20/Dockerfile

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

5.1/alpine3.21/Dockerfile

+9
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

5.1/bookworm/Dockerfile

+11
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Dockerfile-alpine.template

+12-1
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ RUN set -eux; \
5353
chmod +x /usr/local/bin/gosu; \
5454
gosu --version; \
5555
gosu nobody true
56-
{{ if [ "5.0", "5.1" ] | index(env.version) then ( -}}
56+
{{ if env.version | IN("5.0", "5.1") then ( -}}
5757
RUN set -eux; ln -svf gosu /usr/local/bin/su-exec; su-exec nobody true # backwards compatibility (removed in Redmine 5.2+)
5858
{{ ) else "" end -}}
5959

@@ -78,6 +78,17 @@ RUN set -eux; \
7878
wget -O redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
7979
echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
8080
tar -xf redmine.tar.gz --strip-components=1; \
81+
{{ if .version | IN("5.0.10", "5.1.5") then ( -}}
82+
# https://www.redmine.org/issues/42113 (aka https://github.com/rails/rails/issues/54260)
83+
# 5.1: https://github.com/redmine/redmine/commit/c7b1f00fc1b42fd9f77b8e6574dae453ced642b4
84+
# 5.0: https://github.com/redmine/redmine/commit/f27570120b7a672249bfebfe4d62da506785e146
85+
apk add --no-cache patch; \
86+
wget -O 42113.patch 'https://github.com/redmine/redmine/commit/c7b1f00fc1b42fd9f77b8e6574dae453ced642b4.patch?full_index=1'; \
87+
echo 'e352699be3995ff6e3b0066a478e377922fa95ce9fe4729240cd98dcee3c8575 *42113.patch' | sha256sum -c -; \
88+
patch -p1 < 42113.patch; \
89+
rm 42113.patch; \
90+
apk del --no-network patch; \
91+
{{ ) else "" end -}}
8192
rm redmine.tar.gz files/delete.me log/delete.me; \
8293
mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
8394
chown -R redmine:redmine ./; \

Dockerfile-debian.template

+13
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,19 @@ RUN set -eux; \
8080
curl -fL -o redmine.tar.gz "$REDMINE_DOWNLOAD_URL"; \
8181
echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
8282
tar -xf redmine.tar.gz --strip-components=1; \
83+
{{ if .version | IN("5.0.10", "5.1.5") then ( -}}
84+
# https://www.redmine.org/issues/42113 (aka https://github.com/rails/rails/issues/54260)
85+
# 5.1: https://github.com/redmine/redmine/commit/c7b1f00fc1b42fd9f77b8e6574dae453ced642b4
86+
# 5.0: https://github.com/redmine/redmine/commit/f27570120b7a672249bfebfe4d62da506785e146
87+
apt-get update; \
88+
apt-get install -y --no-install-recommends patch; \
89+
wget -O 42113.patch 'https://github.com/redmine/redmine/commit/c7b1f00fc1b42fd9f77b8e6574dae453ced642b4.patch?full_index=1'; \
90+
echo 'e352699be3995ff6e3b0066a478e377922fa95ce9fe4729240cd98dcee3c8575 *42113.patch' | sha256sum -c -; \
91+
patch -p1 < 42113.patch; \
92+
rm 42113.patch; \
93+
apt-get purge -y --auto-remove patch; \
94+
rm -rf /var/lib/apt/lists/*; \
95+
{{ ) else "" end -}}
8396
rm redmine.tar.gz files/delete.me log/delete.me; \
8497
mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
8598
chown -R redmine:redmine ./; \

0 commit comments

Comments
 (0)