Replace su-exec with gosu

See docker-library/postgres@cefde5f + docker-library/postgres@3e9b4ea + linked PR for more details/discussion.
docker-library · Jun 18, 2024 · f44d7a0 · f44d7a0
1 parent 00027a1
commit f44d7a0
Show file tree

Hide file tree

Showing 13 changed files with 158 additions and 25 deletions.
diff --git a/5.0/alpine3.19/Dockerfile b/5.0/alpine3.19/Dockerfile
diff --git a/5.0/alpine3.19/docker-entrypoint.sh b/5.0/alpine3.19/docker-entrypoint.sh
diff --git a/5.0/alpine3.20/Dockerfile b/5.0/alpine3.20/Dockerfile
diff --git a/5.0/alpine3.20/docker-entrypoint.sh b/5.0/alpine3.20/docker-entrypoint.sh
diff --git a/5.0/bookworm/Dockerfile b/5.0/bookworm/Dockerfile
diff --git a/5.1/alpine3.19/Dockerfile b/5.1/alpine3.19/Dockerfile
diff --git a/5.1/alpine3.19/docker-entrypoint.sh b/5.1/alpine3.19/docker-entrypoint.sh
diff --git a/5.1/alpine3.20/Dockerfile b/5.1/alpine3.20/Dockerfile
diff --git a/5.1/alpine3.20/docker-entrypoint.sh b/5.1/alpine3.20/docker-entrypoint.sh
diff --git a/5.1/bookworm/Dockerfile b/5.1/bookworm/Dockerfile
diff --git a/Dockerfile-alpine.template b/Dockerfile-alpine.template
@@ -10,7 +10,6 @@ RUN set -eux; \
 		bash \
 		ca-certificates \
 		findutils \
-		su-exec \
 		tini \
 		tzdata \
 		wget \
@@ -28,6 +27,36 @@ RUN set -eux; \
 		imagemagick \
 	;
 
+# grab gosu for easy step-down from root
+# https://github.com/tianon/gosu/releases
+ENV GOSU_VERSION 1.17
+RUN set -eux; \
+	\
+	apk add --no-cache --virtual .gosu-deps \
+		ca-certificates \
+		dpkg \
+		gnupg \
+	; \
+	\
+	dpkgArch="$(dpkg --print-architecture | awk -F- '{ print $NF }')"; \
+	wget -O /usr/local/bin/gosu "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch"; \
+	wget -O /usr/local/bin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
+	export GNUPGHOME="$(mktemp -d)"; \
+	gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
+	gpg --batch --verify /usr/local/bin/gosu.asc /usr/local/bin/gosu; \
+	gpgconf --kill all; \
+	rm -rf "$GNUPGHOME" /usr/local/bin/gosu.asc; \
+	\
+	apk del --no-network .gosu-deps; \
+	\
+# smoke test
+	chmod +x /usr/local/bin/gosu; \
+	gosu --version; \
+	gosu nobody true
+{{ if [ "5.0", "5.1" ] | index(env.version) then ( -}}
+RUN set -eux; ln -svf gosu /usr/local/bin/su-exec; su-exec nobody true # backwards compatibility (removed in Redmine 5.2+)
+{{ ) else "" end -}}
+
 ENV RAILS_ENV production
 WORKDIR /usr/src/redmine
 
@@ -75,7 +104,7 @@ RUN set -eux; \
 		zlib-dev \
 	; \
 	\
-	su-exec redmine bundle config --local without 'development test'; \
+	gosu redmine bundle config --local without 'development test'; \
 # https://github.com/redmine/redmine/commit/23dc108e70a0794f444803ac827a690085dcd557
 # ("gem puma" already exists in the Gemfile, but under "group :test" and we want it all the time)
 	puma="$(grep -E "^[[:space:]]*gem [:'\"]puma['\",[:space:]].*\$" Gemfile)"; \
@@ -87,7 +116,7 @@ RUN set -eux; \
 		echo "$adapter:" >> ./config/database.yml; \
 		echo "  adapter: $adapter" >> ./config/database.yml; \
 	done; \
-	su-exec redmine bundle install --jobs "$(nproc)"; \
+	gosu redmine bundle install --jobs "$(nproc)"; \
 	rm ./config/database.yml; \
 # fix permissions for running as an arbitrary user
 	chmod -R ugo=rwX Gemfile.lock "$GEM_HOME"; \

diff --git a/Dockerfile-debian.template b/Dockerfile-debian.template
@@ -58,7 +58,6 @@ RUN set -eux; \
 	gosu --version; \
 	gosu nobody true
 
-
 ENV RAILS_ENV production
 WORKDIR /usr/src/redmine
 

diff --git a/apply-templates.sh b/apply-templates.sh
@@ -53,12 +53,9 @@ for version; do
 
 		mkdir -p "$dir"
 
-		cp -f docker-entrypoint.sh "$dir/"
-
 		case "$variant" in
 			alpine*)
 				template='Dockerfile-alpine.template'
-				sed -i -e 's/gosu/su-exec/g' "$dir/docker-entrypoint.sh"
 				;;
 			*)
 				template='Dockerfile-debian.template'
@@ -69,5 +66,7 @@ for version; do
 			generated_warning
 			gawk -f "$jqt" "$template"
 		} > "$dir/Dockerfile"
+
+		cp -a docker-entrypoint.sh "$dir/"
 	done
 done