Merge pull request #356 from infosiftr/double-quoted-adapter

Remove quoting from `adapter:` in `database.yml`
docker-library · Jan 15, 2025 · 2ac7919 · 2ac7919
2 parents c4cea8d + 2fcbcc3
commit 2ac7919
Show file tree

Hide file tree

Showing 10 changed files with 60 additions and 10 deletions.
diff --git a/5.0/alpine3.20/docker-entrypoint.sh b/5.0/alpine3.20/docker-entrypoint.sh
diff --git a/5.0/alpine3.21/docker-entrypoint.sh b/5.0/alpine3.21/docker-entrypoint.sh
diff --git a/5.0/bookworm/docker-entrypoint.sh b/5.0/bookworm/docker-entrypoint.sh
diff --git a/5.1/alpine3.20/docker-entrypoint.sh b/5.1/alpine3.20/docker-entrypoint.sh
diff --git a/5.1/alpine3.21/docker-entrypoint.sh b/5.1/alpine3.21/docker-entrypoint.sh
diff --git a/5.1/bookworm/docker-entrypoint.sh b/5.1/bookworm/docker-entrypoint.sh
diff --git a/6.0/alpine3.20/docker-entrypoint.sh b/6.0/alpine3.20/docker-entrypoint.sh
diff --git a/6.0/alpine3.21/docker-entrypoint.sh b/6.0/alpine3.21/docker-entrypoint.sh
diff --git a/6.0/bookworm/docker-entrypoint.sh b/6.0/bookworm/docker-entrypoint.sh
diff --git a/docker-entrypoint.sh b/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