Merge pull request #234 from apache/remove-gosu

replace gosu with setpriv
apache · Mar 17, 2023 · bdaa368 · bdaa368
2 parents 9453eee + bf802ba
commit bdaa368
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 16 deletions.
diff --git a/3.2.2/Dockerfile b/3.2.2/Dockerfile
@@ -28,13 +28,12 @@ RUN set -ex; \
      ; \
     rm -rf /var/lib/apt/lists/*
 
-# grab gosu for easy step-down from root and tini for signal handling and zombie reaping
+# grab tini for signal handling and zombie reaping
 # see https://github.com/apache/couchdb-docker/pull/28#discussion_r141112407
 RUN set -eux; \
     apt-get update; \
-    apt-get install -y --no-install-recommends gosu tini; \
+    apt-get install -y --no-install-recommends tini; \
     rm -rf /var/lib/apt/lists/*; \
-    gosu nobody true; \
     tini --version
 
 # http://docs.couchdb.org/en/latest/install/unix.html#installing-the-apache-couchdb-packages

diff --git a/3.2.2/docker-entrypoint.sh b/3.2.2/docker-entrypoint.sh
@@ -114,7 +114,7 @@ EOWARN
 	fi
 
 	if [ "$(id -u)" = '0' ]; then
-		exec gosu couchdb "$@"
+		exec setpriv --reuid=couchdb --regid=couchdb --clear-groups "$@"
 	fi
 fi
 

diff --git a/3.3.1/Dockerfile b/3.3.1/Dockerfile
@@ -28,13 +28,12 @@ RUN set -ex; \
      ; \
     rm -rf /var/lib/apt/lists/*
 
-# grab gosu for easy step-down from root and tini for signal handling and zombie reaping
+# grab tini for signal handling and zombie reaping
 # see https://github.com/apache/couchdb-docker/pull/28#discussion_r141112407
 RUN set -eux; \
     apt-get update; \
-    apt-get install -y --no-install-recommends gosu tini; \
+    apt-get install -y --no-install-recommends tini; \
     rm -rf /var/lib/apt/lists/*; \
-    gosu nobody true; \
     tini --version
 
 # http://docs.couchdb.org/en/latest/install/unix.html#installing-the-apache-couchdb-packages

diff --git a/3.3.1/docker-entrypoint.sh b/3.3.1/docker-entrypoint.sh
@@ -114,7 +114,7 @@ EOWARN
 	fi
 
 	if [ "$(id -u)" = '0' ]; then
-		exec gosu couchdb "$@"
+		exec setpriv --reuid=couchdb --regid=couchdb --clear-groups "$@"
 	fi
 fi
 

diff --git a/dev-cluster/Dockerfile b/dev-cluster/Dockerfile
@@ -30,13 +30,12 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
     openssl && \
   rm -rf /var/lib/apt/lists/*
 
-# grab gosu for easy step-down from root and tini for signal handling
+# grab tini for signal handling
 # see https://github.com/apache/couchdb-docker/pull/28#discussion_r141112407
 RUN set -eux; \
     apt-get update; \
-    apt-get install -y --no-install-recommends gosu tini; \
+    apt-get install -y --no-install-recommends tini; \
     rm -rf /var/lib/apt/lists/*; \
-    gosu nobody true; \
     tini --version
 
 RUN apt-get update -y && apt-get install -y --no-install-recommends \

diff --git a/dev/Dockerfile b/dev/Dockerfile
@@ -31,15 +31,13 @@ RUN apt-get update -y && apt-get install -y \
     && apt-get update -y && apt-get install -y --no-install-recommends libmozjs-60-0 \
     && rm -rf /var/lib/apt/lists/*
 
-# grab gosu for easy step-down from root and tini for signal handling
+# grab tini for signal handling
 # see https://github.com/apache/couchdb-docker/pull/28#discussion_r141112407
-ENV GOSU_VERSION 1.10
 ENV TINI_VERSION 0.16.1
 RUN set -eux; \
     apt-get update; \
-    apt-get install -y --no-install-recommends gosu tini; \
+    apt-get install -y --no-install-recommends tini; \
     rm -rf /var/lib/apt/lists/*; \
-    gosu nobody true; \
     tini --version
 
 # Dependencies only needed during build time. This layer will also be cached

diff --git a/dev/docker-entrypoint.sh b/dev/docker-entrypoint.sh
@@ -104,7 +104,7 @@ EOWARN
 	fi
 
 
-	exec gosu couchdb "$@"
+	exec setpriv --reuid=couchdb --regid=couchdb --clear-groups "$@"
 fi
 
 exec "$@"
-Original file line number
+Diff line change
@@ Expand Up / @@ -114,7 +114,7 @@ EOWARN @@
     	fi
     	if [ "$(id -u)" = '0' ]; then
-    		exec gosu couchdb "$@"
+    		exec setpriv --reuid=couchdb --regid=couchdb --clear-groups "$@"
     	fi
     fi
@@ Expand Down @@