Update redmine #11455
Merged
Update redmine #11455
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
Changes: - docker-library/redmine@b3342bd: Merge pull request docker-library/redmine#249 from infosiftr/bullseye-alpine3.15 - docker-library/redmine@9999693: Add missing variable (and better preamble to catch those issues in the future) - docker-library/redmine@5ceec0a: Switch from wget back to curl (to fix certificate issues) - docker-library/redmine@6befd08: Fix "passenger" tagging bug - docker-library/redmine@609e8f9: Update to Debian Bullseye, Alpine 3.15
Diff for 5b37ebb:diff --git a/_bashbrew-cat b/_bashbrew-cat
index af12f61..60b8d61 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,39 +1,42 @@
Maintainers: Tianon Gravi <admwiggin@gmail.com> (@tianon), Joseph Ferguson <yosifkit@gmail.com> (@yosifkit)
GitRepo: https://github.com/docker-library/redmine.git
-Tags: 4.0.9, 4.0, 4.0.9-buster, 4.0-buster
+Tags: 4.0.9, 4.0, 4.0.9-bullseye, 4.0-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 02809f9dead7b26e490f84107c7a2170f11fd2b9
+GitCommit: 5ceec0a28815d3a9ff740439bb5f1f8bd764290b
Directory: 4.0
-Tags: 4.0.9-alpine, 4.0-alpine, 4.0.9-alpine3.13, 4.0-alpine3.13
-GitCommit: 02809f9dead7b26e490f84107c7a2170f11fd2b9
+Tags: 4.0.9-alpine, 4.0-alpine, 4.0.9-alpine3.15, 4.0-alpine3.15
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 609e8f990721fbda2a0e911cef76f4b0487a9d04
Directory: 4.0/alpine
Tags: 4.0.9-passenger, 4.0-passenger
GitCommit: 5444fd564ffba5c871a4d964b54c5559ee52e61e
Directory: 4.0/passenger
-Tags: 4.1.5, 4.1, 4.1.5-buster, 4.1-buster
+Tags: 4.1.5, 4.1, 4.1.5-bullseye, 4.1-bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 5c6ee97401c76351a5e228548717dfc4130f4179
+GitCommit: 5ceec0a28815d3a9ff740439bb5f1f8bd764290b
Directory: 4.1
-Tags: 4.1.5-alpine, 4.1-alpine, 4.1.5-alpine3.13, 4.1-alpine3.13
-GitCommit: 5c6ee97401c76351a5e228548717dfc4130f4179
+Tags: 4.1.5-alpine, 4.1-alpine, 4.1.5-alpine3.15, 4.1-alpine3.15
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 609e8f990721fbda2a0e911cef76f4b0487a9d04
Directory: 4.1/alpine
Tags: 4.1.5-passenger, 4.1-passenger
GitCommit: 5444fd564ffba5c871a4d964b54c5559ee52e61e
Directory: 4.1/passenger
-Tags: 4.2.3, 4.2, 4, latest, 4.2.3-buster, 4.2-buster, 4-buster, buster
+Tags: 4.2.3, 4.2, 4, latest, 4.2.3-bullseye, 4.2-bullseye, 4-bullseye, bullseye
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, ppc64le, s390x
-GitCommit: 282e53760ea23d3415bb1e45d2a0d930f47575c3
+GitCommit: 5ceec0a28815d3a9ff740439bb5f1f8bd764290b
Directory: 4.2
-Tags: 4.2.3-alpine, 4.2-alpine, 4-alpine, alpine, 4.2.3-alpine3.13, 4.2-alpine3.13, 4-alpine3.13, alpine3.13
-GitCommit: 282e53760ea23d3415bb1e45d2a0d930f47575c3
+Tags: 4.2.3-alpine, 4.2-alpine, 4-alpine, alpine, 4.2.3-alpine3.15, 4.2-alpine3.15, 4-alpine3.15, alpine3.15
+Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, s390x
+GitCommit: 609e8f990721fbda2a0e911cef76f4b0487a9d04
Directory: 4.2/alpine
Tags: 4.2.3-passenger, 4.2-passenger, 4-passenger, passenger
diff --git a/_bashbrew-list b/_bashbrew-list
index 192de09..bdbc138 100644
--- a/_bashbrew-list
+++ b/_bashbrew-list
@@ -1,40 +1,40 @@
redmine:4
redmine:4-alpine
-redmine:4-alpine3.13
-redmine:4-buster
+redmine:4-alpine3.15
+redmine:4-bullseye
redmine:4-passenger
redmine:4.0
redmine:4.0-alpine
-redmine:4.0-alpine3.13
-redmine:4.0-buster
+redmine:4.0-alpine3.15
+redmine:4.0-bullseye
redmine:4.0-passenger
redmine:4.0.9
redmine:4.0.9-alpine
-redmine:4.0.9-alpine3.13
-redmine:4.0.9-buster
+redmine:4.0.9-alpine3.15
+redmine:4.0.9-bullseye
redmine:4.0.9-passenger
redmine:4.1
redmine:4.1-alpine
-redmine:4.1-alpine3.13
-redmine:4.1-buster
+redmine:4.1-alpine3.15
+redmine:4.1-bullseye
redmine:4.1-passenger
redmine:4.1.5
redmine:4.1.5-alpine
-redmine:4.1.5-alpine3.13
-redmine:4.1.5-buster
+redmine:4.1.5-alpine3.15
+redmine:4.1.5-bullseye
redmine:4.1.5-passenger
redmine:4.2
redmine:4.2-alpine
-redmine:4.2-alpine3.13
-redmine:4.2-buster
+redmine:4.2-alpine3.15
+redmine:4.2-bullseye
redmine:4.2-passenger
redmine:4.2.3
redmine:4.2.3-alpine
-redmine:4.2.3-alpine3.13
-redmine:4.2.3-buster
+redmine:4.2.3-alpine3.15
+redmine:4.2.3-bullseye
redmine:4.2.3-passenger
redmine:alpine
-redmine:alpine3.13
-redmine:buster
+redmine:alpine3.15
+redmine:bullseye
redmine:latest
redmine:passenger
diff --git a/redmine_4.0-alpine3.13/Dockerfile b/redmine_4.0-alpine3.15/Dockerfile
similarity index 99%
rename from redmine_4.0-alpine3.13/Dockerfile
rename to redmine_4.0-alpine3.15/Dockerfile
index d6e0940..75a36aa 100644
--- a/redmine_4.0-alpine3.13/Dockerfile
+++ b/redmine_4.0-alpine3.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6-alpine3.13
+FROM ruby:2.6-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
diff --git a/redmine_4.0-alpine3.13/docker-entrypoint.sh b/redmine_4.0-alpine3.15/docker-entrypoint.sh
similarity index 100%
rename from redmine_4.0-alpine3.13/docker-entrypoint.sh
rename to redmine_4.0-alpine3.15/docker-entrypoint.sh
diff --git a/redmine_4.0-buster/Dockerfile b/redmine_4.0-bullseye/Dockerfile
similarity index 92%
rename from redmine_4.0-buster/Dockerfile
rename to redmine_4.0-bullseye/Dockerfile
index e388d09..739e79c 100644
--- a/redmine_4.0-buster/Dockerfile
+++ b/redmine_4.0-bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6-slim-buster
+FROM ruby:2.6-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
@@ -8,6 +8,7 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
ca-certificates \
+ curl \
wget \
\
bzr \
@@ -43,7 +44,8 @@ ENV REDMINE_VERSION 4.0.9
ENV REDMINE_DOWNLOAD_SHA256 04a772b0b8f8ce6493614a7cb22ed82cb9b43c75dcdbeb5c2f925bae98e0d5df
RUN set -eux; \
- wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
+# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
+ curl -fL -o redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
@@ -60,9 +62,9 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
+ default-libmysqlclient-dev \
freetds-dev \
gcc \
- libmariadbclient-dev \
libpq-dev \
libsqlite3-dev \
make \
diff --git a/redmine_4.0-buster/docker-entrypoint.sh b/redmine_4.0-bullseye/docker-entrypoint.sh
similarity index 100%
rename from redmine_4.0-buster/docker-entrypoint.sh
rename to redmine_4.0-bullseye/docker-entrypoint.sh
diff --git a/redmine_4.1-alpine3.13/Dockerfile b/redmine_4.1-alpine3.15/Dockerfile
similarity index 99%
rename from redmine_4.1-alpine3.13/Dockerfile
rename to redmine_4.1-alpine3.15/Dockerfile
index b424ea8..eaaefa3 100644
--- a/redmine_4.1-alpine3.13/Dockerfile
+++ b/redmine_4.1-alpine3.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6-alpine3.13
+FROM ruby:2.6-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
diff --git a/redmine_4.1-alpine3.13/docker-entrypoint.sh b/redmine_4.1-alpine3.15/docker-entrypoint.sh
similarity index 100%
rename from redmine_4.1-alpine3.13/docker-entrypoint.sh
rename to redmine_4.1-alpine3.15/docker-entrypoint.sh
diff --git a/redmine_4.1-buster/Dockerfile b/redmine_4.1-bullseye/Dockerfile
similarity index 92%
rename from redmine_4.1-buster/Dockerfile
rename to redmine_4.1-bullseye/Dockerfile
index 00e2332..02feaab 100644
--- a/redmine_4.1-buster/Dockerfile
+++ b/redmine_4.1-bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.6-slim-buster
+FROM ruby:2.6-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
@@ -8,6 +8,7 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
ca-certificates \
+ curl \
wget \
\
bzr \
@@ -46,7 +47,8 @@ ENV REDMINE_VERSION 4.1.5
ENV REDMINE_DOWNLOAD_SHA256 624dfeab7db5cda35a03d791b5fa83a836717ca280856c51cd089ed638f8678e
RUN set -eux; \
- wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
+# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
+ curl -fL -o redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
@@ -63,9 +65,9 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
+ default-libmysqlclient-dev \
freetds-dev \
gcc \
- libmariadbclient-dev \
libpq-dev \
libsqlite3-dev \
make \
diff --git a/redmine_4.1-buster/docker-entrypoint.sh b/redmine_4.1-bullseye/docker-entrypoint.sh
similarity index 100%
rename from redmine_4.1-buster/docker-entrypoint.sh
rename to redmine_4.1-bullseye/docker-entrypoint.sh
diff --git a/redmine_alpine3.13/Dockerfile b/redmine_alpine3.15/Dockerfile
similarity index 99%
rename from redmine_alpine3.13/Dockerfile
rename to redmine_alpine3.15/Dockerfile
index d15e183..b5a9591 100644
--- a/redmine_alpine3.13/Dockerfile
+++ b/redmine_alpine3.15/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7-alpine3.13
+FROM ruby:2.7-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
diff --git a/redmine_alpine3.13/docker-entrypoint.sh b/redmine_alpine3.15/docker-entrypoint.sh
similarity index 100%
rename from redmine_alpine3.13/docker-entrypoint.sh
rename to redmine_alpine3.15/docker-entrypoint.sh
diff --git a/redmine_buster/Dockerfile b/redmine_bullseye/Dockerfile
similarity index 92%
rename from redmine_buster/Dockerfile
rename to redmine_bullseye/Dockerfile
index b88c93f..c31eea7 100644
--- a/redmine_buster/Dockerfile
+++ b/redmine_bullseye/Dockerfile
@@ -1,4 +1,4 @@
-FROM ruby:2.7-slim-buster
+FROM ruby:2.7-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
@@ -8,6 +8,7 @@ RUN set -eux; \
apt-get update; \
apt-get install -y --no-install-recommends \
ca-certificates \
+ curl \
wget \
\
bzr \
@@ -46,7 +47,8 @@ ENV REDMINE_VERSION 4.2.3
ENV REDMINE_DOWNLOAD_SHA256 72f633dc954217948558889ca85325fe6410cd18a2d8b39358e5d75932a47a0c
RUN set -eux; \
- wget -O redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
+# if we use wget here, we get certificate issues (https://github.com/docker-library/redmine/pull/249#issuecomment-984176479)
+ curl -fL -o redmine.tar.gz "https://www.redmine.org/releases/redmine-${REDMINE_VERSION}.tar.gz"; \
echo "$REDMINE_DOWNLOAD_SHA256 *redmine.tar.gz" | sha256sum -c -; \
tar -xf redmine.tar.gz --strip-components=1; \
rm redmine.tar.gz files/delete.me log/delete.me; \
@@ -63,9 +65,9 @@ RUN set -eux; \
savedAptMark="$(apt-mark showmanual)"; \
apt-get update; \
apt-get install -y --no-install-recommends \
+ default-libmysqlclient-dev \
freetds-dev \
gcc \
- libmariadbclient-dev \
libpq-dev \
libsqlite3-dev \
make \
diff --git a/redmine_buster/docker-entrypoint.sh b/redmine_bullseye/docker-entrypoint.sh
similarity index 100%
rename from redmine_buster/docker-entrypoint.sh
rename to redmine_bullseye/docker-entrypoint.shRelevant Maintainers: |
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.
Changes: