Update redmine #18241
Merged
Update redmine #18241
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@2ac7919: Merge pull request docker-library/redmine#356 from infosiftr/double-quoted-adapter
Diff for 57dcbfc:diff --git a/_bashbrew-cat b/_bashbrew-cat
index 6511b04..614be3a 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -3,45 +3,45 @@ GitRepo: https://github.com/docker-library/redmine.git
Tags: 5.0.10, 5.0, 5.0.10-bookworm, 5.0-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bd201100bc2bafda763ea6638e0695fd4bde1f97
+GitCommit: 2ac79199f72a9628d9cb9ee1dafac2dd2856487c
Directory: 5.0/bookworm
Tags: 5.0.10-alpine3.20, 5.0-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bd201100bc2bafda763ea6638e0695fd4bde1f97
+GitCommit: 2ac79199f72a9628d9cb9ee1dafac2dd2856487c
Directory: 5.0/alpine3.20
Tags: 5.0.10-alpine3.21, 5.0-alpine3.21, 5.0.10-alpine, 5.0-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bd201100bc2bafda763ea6638e0695fd4bde1f97
+GitCommit: 2ac79199f72a9628d9cb9ee1dafac2dd2856487c
Directory: 5.0/alpine3.21
Tags: 5.1.5, 5.1, 5, 5.1.5-bookworm, 5.1-bookworm, 5-bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bd201100bc2bafda763ea6638e0695fd4bde1f97
+GitCommit: 2ac79199f72a9628d9cb9ee1dafac2dd2856487c
Directory: 5.1/bookworm
Tags: 5.1.5-alpine3.20, 5.1-alpine3.20, 5-alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bd201100bc2bafda763ea6638e0695fd4bde1f97
+GitCommit: 2ac79199f72a9628d9cb9ee1dafac2dd2856487c
Directory: 5.1/alpine3.20
Tags: 5.1.5-alpine3.21, 5.1-alpine3.21, 5-alpine3.21, 5.1.5-alpine, 5.1-alpine, 5-alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bd201100bc2bafda763ea6638e0695fd4bde1f97
+GitCommit: 2ac79199f72a9628d9cb9ee1dafac2dd2856487c
Directory: 5.1/alpine3.21
Tags: 6.0.2, 6.0, 6, latest, 6.0.2-bookworm, 6.0-bookworm, 6-bookworm, bookworm
Architectures: amd64, arm32v5, arm32v7, arm64v8, i386, mips64le, ppc64le, s390x
-GitCommit: bd201100bc2bafda763ea6638e0695fd4bde1f97
+GitCommit: 2ac79199f72a9628d9cb9ee1dafac2dd2856487c
Directory: 6.0/bookworm
Tags: 6.0.2-alpine3.20, 6.0-alpine3.20, 6-alpine3.20, alpine3.20
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bd201100bc2bafda763ea6638e0695fd4bde1f97
+GitCommit: 2ac79199f72a9628d9cb9ee1dafac2dd2856487c
Directory: 6.0/alpine3.20
Tags: 6.0.2-alpine3.21, 6.0-alpine3.21, 6-alpine3.21, alpine3.21, 6.0.2-alpine, 6.0-alpine, 6-alpine, alpine
Architectures: amd64, arm32v6, arm32v7, arm64v8, i386, ppc64le, riscv64, s390x
-GitCommit: bd201100bc2bafda763ea6638e0695fd4bde1f97
+GitCommit: 2ac79199f72a9628d9cb9ee1dafac2dd2856487c
Directory: 6.0/alpine3.21
diff --git a/redmine_5-alpine/docker-entrypoint.sh b/redmine_5-alpine/docker-entrypoint.sh
index 28fe8ce..62c56ea 100755
--- a/redmine_5-alpine/docker-entrypoint.sh
+++ b/redmine_5-alpine/docker-entrypoint.sh
@@ -127,7 +127,12 @@ if [ -n "$isLikelyRedmine" ]; then
env="REDMINE_DB_${var^^}"
val="${!env}"
[ -n "$val" ] || continue
- echo " $var: \"$val\"" >> config/database.yml
+ if [ "$var" != 'adapter' ]; then
+ # https://github.com/docker-library/redmine/issues/353 🙃
+ val='"'"$val"'"'
+ # (only add double quotes to every value *except* `adapter: xxx`)
+ fi
+ echo " $var: $val" >> config/database.yml
done
fi
diff --git a/redmine_5-alpine3.20/docker-entrypoint.sh b/redmine_5-alpine3.20/docker-entrypoint.sh
index 28fe8ce..62c56ea 100755
--- a/redmine_5-alpine3.20/docker-entrypoint.sh
+++ b/redmine_5-alpine3.20/docker-entrypoint.sh
@@ -127,7 +127,12 @@ if [ -n "$isLikelyRedmine" ]; then
env="REDMINE_DB_${var^^}"
val="${!env}"
[ -n "$val" ] || continue
- echo " $var: \"$val\"" >> config/database.yml
+ if [ "$var" != 'adapter' ]; then
+ # https://github.com/docker-library/redmine/issues/353 🙃
+ val='"'"$val"'"'
+ # (only add double quotes to every value *except* `adapter: xxx`)
+ fi
+ echo " $var: $val" >> config/database.yml
done
fi
diff --git a/redmine_5-bookworm/docker-entrypoint.sh b/redmine_5-bookworm/docker-entrypoint.sh
index 28fe8ce..62c56ea 100755
--- a/redmine_5-bookworm/docker-entrypoint.sh
+++ b/redmine_5-bookworm/docker-entrypoint.sh
@@ -127,7 +127,12 @@ if [ -n "$isLikelyRedmine" ]; then
env="REDMINE_DB_${var^^}"
val="${!env}"
[ -n "$val" ] || continue
- echo " $var: \"$val\"" >> config/database.yml
+ if [ "$var" != 'adapter' ]; then
+ # https://github.com/docker-library/redmine/issues/353 🙃
+ val='"'"$val"'"'
+ # (only add double quotes to every value *except* `adapter: xxx`)
+ fi
+ echo " $var: $val" >> config/database.yml
done
fi
diff --git a/redmine_5.0-alpine/docker-entrypoint.sh b/redmine_5.0-alpine/docker-entrypoint.sh
index 28fe8ce..62c56ea 100755
--- a/redmine_5.0-alpine/docker-entrypoint.sh
+++ b/redmine_5.0-alpine/docker-entrypoint.sh
@@ -127,7 +127,12 @@ if [ -n "$isLikelyRedmine" ]; then
env="REDMINE_DB_${var^^}"
val="${!env}"
[ -n "$val" ] || continue
- echo " $var: \"$val\"" >> config/database.yml
+ if [ "$var" != 'adapter' ]; then
+ # https://github.com/docker-library/redmine/issues/353 🙃
+ val='"'"$val"'"'
+ # (only add double quotes to every value *except* `adapter: xxx`)
+ fi
+ echo " $var: $val" >> config/database.yml
done
fi
diff --git a/redmine_5.0-alpine3.20/docker-entrypoint.sh b/redmine_5.0-alpine3.20/docker-entrypoint.sh
index 28fe8ce..62c56ea 100755
--- a/redmine_5.0-alpine3.20/docker-entrypoint.sh
+++ b/redmine_5.0-alpine3.20/docker-entrypoint.sh
@@ -127,7 +127,12 @@ if [ -n "$isLikelyRedmine" ]; then
env="REDMINE_DB_${var^^}"
val="${!env}"
[ -n "$val" ] || continue
- echo " $var: \"$val\"" >> config/database.yml
+ if [ "$var" != 'adapter' ]; then
+ # https://github.com/docker-library/redmine/issues/353 🙃
+ val='"'"$val"'"'
+ # (only add double quotes to every value *except* `adapter: xxx`)
+ fi
+ echo " $var: $val" >> config/database.yml
done
fi
diff --git a/redmine_5.0-bookworm/docker-entrypoint.sh b/redmine_5.0-bookworm/docker-entrypoint.sh
index 28fe8ce..62c56ea 100755
--- a/redmine_5.0-bookworm/docker-entrypoint.sh
+++ b/redmine_5.0-bookworm/docker-entrypoint.sh
@@ -127,7 +127,12 @@ if [ -n "$isLikelyRedmine" ]; then
env="REDMINE_DB_${var^^}"
val="${!env}"
[ -n "$val" ] || continue
- echo " $var: \"$val\"" >> config/database.yml
+ if [ "$var" != 'adapter' ]; then
+ # https://github.com/docker-library/redmine/issues/353 🙃
+ val='"'"$val"'"'
+ # (only add double quotes to every value *except* `adapter: xxx`)
+ fi
+ echo " $var: $val" >> config/database.yml
done
fi
diff --git a/redmine_alpine/docker-entrypoint.sh b/redmine_alpine/docker-entrypoint.sh
index 28fe8ce..62c56ea 100755
--- a/redmine_alpine/docker-entrypoint.sh
+++ b/redmine_alpine/docker-entrypoint.sh
@@ -127,7 +127,12 @@ if [ -n "$isLikelyRedmine" ]; then
env="REDMINE_DB_${var^^}"
val="${!env}"
[ -n "$val" ] || continue
- echo " $var: \"$val\"" >> config/database.yml
+ if [ "$var" != 'adapter' ]; then
+ # https://github.com/docker-library/redmine/issues/353 🙃
+ val='"'"$val"'"'
+ # (only add double quotes to every value *except* `adapter: xxx`)
+ fi
+ echo " $var: $val" >> config/database.yml
done
fi
diff --git a/redmine_alpine3.20/docker-entrypoint.sh b/redmine_alpine3.20/docker-entrypoint.sh
index 28fe8ce..62c56ea 100755
--- a/redmine_alpine3.20/docker-entrypoint.sh
+++ b/redmine_alpine3.20/docker-entrypoint.sh
@@ -127,7 +127,12 @@ if [ -n "$isLikelyRedmine" ]; then
env="REDMINE_DB_${var^^}"
val="${!env}"
[ -n "$val" ] || continue
- echo " $var: \"$val\"" >> config/database.yml
+ if [ "$var" != 'adapter' ]; then
+ # https://github.com/docker-library/redmine/issues/353 🙃
+ val='"'"$val"'"'
+ # (only add double quotes to every value *except* `adapter: xxx`)
+ fi
+ echo " $var: $val" >> config/database.yml
done
fi
diff --git a/redmine_bookworm/docker-entrypoint.sh b/redmine_bookworm/docker-entrypoint.sh
index 28fe8ce..62c56ea 100755
--- a/redmine_bookworm/docker-entrypoint.sh
+++ b/redmine_bookworm/docker-entrypoint.sh
@@ -127,7 +127,12 @@ if [ -n "$isLikelyRedmine" ]; then
env="REDMINE_DB_${var^^}"
val="${!env}"
[ -n "$val" ] || continue
- echo " $var: \"$val\"" >> config/database.yml
+ if [ "$var" != 'adapter' ]; then
+ # https://github.com/docker-library/redmine/issues/353 🙃
+ val='"'"$val"'"'
+ # (only add double quotes to every value *except* `adapter: xxx`)
+ fi
+ echo " $var: $val" >> config/database.yml
done
fiRelevant Maintainers: |
yosifkit
approved these changes
Jan 15, 2025
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:
adapter:indatabase.ymlredmine#356 from infosiftr/double-quoted-adapter