[zookeeper] Docker images updates - 2023-09-14-124856

GoogleCloudPlatform · Sep 14, 2023 · a50922a · a50922a
1 parent 40d9fe9
commit a50922a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/docker/zookeeper/3/debian11/3.8/Dockerfile b/docker/zookeeper/3/debian11/3.8/Dockerfile
@@ -24,7 +24,7 @@ RUN set -eux; \
 
 # Install Gosu from official repository
 # /usr/sbin/gosu
-ENV GOSU_VERSION 1.16
+ENV GOSU_VERSION 
 RUN set -eux; \
 	apt-get update; \
 	DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
@@ -47,7 +47,7 @@ RUN set -eux; \
 	wget -q -O /usr/sbin/gosu.asc "https://github.com/tianon/gosu/releases/download/$GOSU_VERSION/gosu-$dpkgArch.asc"; \
 	GNUPGHOME="$(mktemp -d)"; \
 	export GNUPGHOME; \
-	gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys B42F6819007F00F88E364FD4036A9C25BF357DD4; \
+	gpg --batch --keyserver hkps://keys.openpgp.org --recv-keys ; \
 	gpg --batch --verify /usr/sbin/gosu.asc /usr/sbin/gosu; \
 	gpgconf --kill all; \
 	rm -rf "$GNUPGHOME" /usr/sbin/gosu.asc; \
@@ -75,7 +75,7 @@ RUN set -eux; \
     # Verify that gosu binary works
     # gosu nobody true
 
-ENV GPG_KEYS 52A7EA3EECAE05B0A8306471790761798F6E35FC
+ENV GPG_KEYS BBE7232D7991050B54C8EA0ADC08637CA615D22C
 
 ARG SHORT_DISTRO_NAME="zookeeper-${ZK_VERSION}"
 ARG DISTRO_NAME="apache-zookeeper-${ZK_VERSION}-bin"

diff --git a/docker/zookeeper/versions.yaml b/docker/zookeeper/versions.yaml
@@ -22,11 +22,8 @@ versions:
   from: marketplace.gcr.io/google/c2d-debian11
   packages:
     zookeeper:
-      gpg: 52A7EA3EECAE05B0A8306471790761798F6E35FC
+      gpg: BBE7232D7991050B54C8EA0ADC08637CA615D22C
       version: 3.8.2
-    gosu:
-      version: 1.16
-      gpg: B42F6819007F00F88E364FD4036A9C25BF357DD4
   repo: zookeeper3
   tags:
   - 3.8.2-debian11
@@ -52,3 +49,4 @@ versions:
   - exporter-1
   - exporter
   templateSubDir: exporter
+