Revert "Update redmine" #9838
Merged
Revert "Update redmine" #9838
Conversation
This file contains 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
|
(thanks @J0WI 🤦) |
Diff for a067377:diff --git a/_bashbrew-cat b/_bashbrew-cat
index e1bf5f3..7cbfb2c 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,28 +1,28 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/redmine.git
-Tags: 4.0.8, 4.0
+Tags: 4.0.7, 4.0
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ae11c0c35e0920781464c4afdac9096eec355c8b
+GitCommit: f5895d1d4bff53a590b6048e294dc96b26206883
Directory: 4.0
-Tags: 4.0.8-alpine, 4.0-alpine
-GitCommit: ae11c0c35e0920781464c4afdac9096eec355c8b
+Tags: 4.0.7-alpine, 4.0-alpine
+GitCommit: e224c25360a7a576ec53fd105b403d2ce4b92d5b
Directory: 4.0/alpine
-Tags: 4.0.8-passenger, 4.0-passenger
+Tags: 4.0.7-passenger, 4.0-passenger
GitCommit: 7fdd6777cc21b0d1974884e6e54208d16a991b19
Directory: 4.0/passenger
-Tags: 4.1.2, 4.1, 4, latest
+Tags: 4.1.1, 4.1, 4, latest
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: ea093b382fbdb883daf868c5ea4a9c1fd27f3aca
+GitCommit: f5895d1d4bff53a590b6048e294dc96b26206883
Directory: 4.1
-Tags: 4.1.2-alpine, 4.1-alpine, 4-alpine, alpine
-GitCommit: ea093b382fbdb883daf868c5ea4a9c1fd27f3aca
+Tags: 4.1.1-alpine, 4.1-alpine, 4-alpine, alpine
+GitCommit: e224c25360a7a576ec53fd105b403d2ce4b92d5b
Directory: 4.1/alpine
-Tags: 4.1.2-passenger, 4.1-passenger, 4-passenger, passenger
+Tags: 4.1.1-passenger, 4.1-passenger, 4-passenger, passenger
GitCommit: 7fdd6777cc21b0d1974884e6e54208d16a991b19
Directory: 4.1/passenger
diff --git a/_bashbrew-list b/_bashbrew-list
index 1a019b6..e051978 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -4,15 +4,15 @@ redmine:4-passenger
redmine:4.0
redmine:4.0-alpine
redmine:4.0-passenger
-redmine:4.0.8
-redmine:4.0.8-alpine
-redmine:4.0.8-passenger
+redmine:4.0.7
+redmine:4.0.7-alpine
+redmine:4.0.7-passenger
redmine:4.1
redmine:4.1-alpine
redmine:4.1-passenger
-redmine:4.1.2
-redmine:4.1.2-alpine
-redmine:4.1.2-passenger
+redmine:4.1.1
+redmine:4.1.1-alpine
+redmine:4.1.1-passenger
redmine:alpine
redmine:latest
redmine:passenger
diff --git a/redmine_4.0-alpine/Dockerfile b/redmine_4.0-alpine/Dockerfile
index a0508b7..0512d4b 100644
--- a/redmine_4.0-alpine/Dockerfile
+++ b/redmine_4.0-alpine/Dockerfile
@@ -37,12 +37,12 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.0.8
-ENV REDMINE_DOWNLOAD_SHA256 c06ebd75ab87b23d766b37a9e49c9e456756ed91f85b33a584a66f47f888038a
+ENV REDMINE_VERSION 4.0.7
+ENV REDMINE_DOWNLOAD_MD5 baad690fdccd7f0282d53beb0ee2c47b
RUN set -eux; \
wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
- echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
+ echo "$REDMINE_DOWNLOAD_MD5 *redmine.tar.gz" | md5sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
@@ -88,14 +88,10 @@ RUN set -eux; \
rm /usr/local/bundle/gems/rbpdf-font-1.19.*/lib/fonts/ttf2ufm/ttf2ufm; \
\
runDeps="$( \
- find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
- | sort -u \
- | grep -v '^/usr/local/' \
- | xargs -rn1 basename \
- | grep -v 'ld-musl-' \
- | sed -e 's/^/so:/' \
+ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/bundle/gems \
+ | tr ',' '\n' \
| 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_4.0/Dockerfile b/redmine_4.0/Dockerfile
index 61abc32..7199493 100644
--- a/redmine_4.0/Dockerfile
+++ b/redmine_4.0/Dockerfile
@@ -77,12 +77,12 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.0.8
-ENV REDMINE_DOWNLOAD_SHA256 c06ebd75ab87b23d766b37a9e49c9e456756ed91f85b33a584a66f47f888038a
+ENV REDMINE_VERSION 4.0.7
+ENV REDMINE_DOWNLOAD_MD5 baad690fdccd7f0282d53beb0ee2c47b
RUN set -eux; \
wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
- echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
+ echo "$REDMINE_DOWNLOAD_MD5 *redmine.tar.gz" | md5sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
diff --git a/redmine_alpine/Dockerfile b/redmine_alpine/Dockerfile
index abd7f42..18ea43d 100644
--- a/redmine_alpine/Dockerfile
+++ b/redmine_alpine/Dockerfile
@@ -38,12 +38,12 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.1.2
-ENV REDMINE_DOWNLOAD_SHA256 7e22397351c53fe8fe4444c01c4e0640d9cefb17b9ac765b846df27627cd228e
+ENV REDMINE_VERSION 4.1.1
+ENV REDMINE_DOWNLOAD_MD5 a15a25dec7b866e213bbd4b041f05f17
RUN set -eux; \
wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
- echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
+ echo "$REDMINE_DOWNLOAD_MD5 *redmine.tar.gz" | md5sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
@@ -87,14 +87,10 @@ RUN set -eux; \
rm /usr/local/bundle/gems/rbpdf-font-1.19.*/lib/fonts/ttf2ufm/ttf2ufm; \
\
runDeps="$( \
- find /usr/local -type f -executable -exec ldd '{}' ';' \
- | awk '/=>/ { print $(NF-1) }' \
- | sort -u \
- | grep -v '^/usr/local/' \
- | xargs -rn1 basename \
- | grep -v 'ld-musl-' \
- | sed -e 's/^/so:/' \
+ scanelf --needed --nobanner --format '%n#p' --recursive /usr/local/bundle/gems \
+ | tr ',' '\n' \
| 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_latest/Dockerfile b/redmine_latest/Dockerfile
index bd25ff5..9cbd5da 100644
--- a/redmine_latest/Dockerfile
+++ b/redmine_latest/Dockerfile
@@ -78,12 +78,12 @@ RUN set -eux; \
chown redmine:redmine "$HOME"; \
chmod 1777 "$HOME"
-ENV REDMINE_VERSION 4.1.2
-ENV REDMINE_DOWNLOAD_SHA256 7e22397351c53fe8fe4444c01c4e0640d9cefb17b9ac765b846df27627cd228e
+ENV REDMINE_VERSION 4.1.1
+ENV REDMINE_DOWNLOAD_MD5 a15a25dec7b866e213bbd4b041f05f17
RUN set -eux; \
wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
- echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
+ echo "$REDMINE_DOWNLOAD_MD5 *redmine.tar.gz" | md5sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
mkdir -p log public/plugin_assets sqlite tmp/pdf tmp/pids; \
|
|
@tianon the update is still important due https://redmine.org/projects/redmine/wiki/Security_Advisories |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Reverts #9837
See docker-library/redmine#230