Merge branch 'master' into miani-k8s-kafka-20240918

GoogleCloudPlatform · Sep 18, 2024 · 3003adc · 3003adc
2 parents 1a19b54 + 967a588
commit 3003adc
Show file tree

Hide file tree

Showing 10 changed files with 20 additions and 20 deletions.
diff --git a/docker/zookeeper/3/debian11/3.8/Dockerfile → docker/zookeeper/3/debian12/3.8/Dockerfile b/docker/zookeeper/3/debian11/3.8/Dockerfile → docker/zookeeper/3/debian12/3.8/Dockerfile
@@ -1,10 +1,10 @@
-FROM marketplace.gcr.io/google/c2d-debian11 as ospo
+FROM marketplace.gcr.io/google/debian12 as ospo
 
 # Download Licenses and restricted source-code
 COPY components.csv /components.csv
 COPY source_code.txt /source_code.txt
 
-RUN apt update && apt -y install ca-certificates
+RUN apt update && apt -y install curl ca-certificates
 
 RUN curl -o /download-licenses.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-licenses.sh \
 		&& curl -o /download-ref-repos.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-ref-repos.sh \
@@ -15,11 +15,11 @@ RUN mkdir -p /usr/src/licenses \
 		&& /download-licenses.sh /components.csv /usr/src/licenses \
 		&& /download-ref-repos.sh /source_code.txt /usr/src
 
-FROM marketplace.gcr.io/google/c2d-debian11
+FROM marketplace.gcr.io/google/debian12
 
 COPY --from=ospo /usr/src /usr/src
 
-ARG ZK_VERSION=3.8.3
+ARG ZK_VERSION=3.8.4
 
 ENV ZOO_CONF_DIR=/conf \
     ZOO_DATA_DIR=/data \
@@ -86,15 +86,15 @@ RUN set -eux; \
         ca-certificates \
         dirmngr \
         gnupg \
-        netcat \
+        netcat-traditional \
         openssl \
         wget; \
     rm -rf /var/lib/apt/lists/*
 
     # Verify that gosu binary works
     # gosu nobody true
 
-ENV GPG_KEYS 3F7A1D16FA4217B1DC75E1C9FFE35B7F15DFA1BA
+ENV GPG_KEYS AF3D175EC05DB249738D01AC8D8C3C3ED0B02E66
 
 ARG SHORT_DISTRO_NAME="zookeeper-${ZK_VERSION}"
 ARG DISTRO_NAME="apache-zookeeper-${ZK_VERSION}-bin"

diff --git a/...r/zookeeper/3/debian11/3.8/components.csv → ...r/zookeeper/3/debian12/3.8/components.csv b/...r/zookeeper/3/debian11/3.8/components.csv → ...r/zookeeper/3/debian12/3.8/components.csv
diff --git a/...eeper/3/debian11/3.8/docker-entrypoint.sh → ...eeper/3/debian12/3.8/docker-entrypoint.sh b/...eeper/3/debian11/3.8/docker-entrypoint.sh → ...eeper/3/debian12/3.8/docker-entrypoint.sh
diff --git a/.../zookeeper/3/debian11/3.8/source_code.txt → .../zookeeper/3/debian12/3.8/source_code.txt b/.../zookeeper/3/debian11/3.8/source_code.txt → .../zookeeper/3/debian12/3.8/source_code.txt
diff --git a/docker/zookeeper/exporter/Dockerfile b/docker/zookeeper/exporter/Dockerfile
@@ -1,4 +1,4 @@
-FROM marketplace.gcr.io/google/c2d-debian11 as exporter-builder
+FROM marketplace.gcr.io/google/debian12 as exporter-builder
 
 ENV EXPORTER_VERSION 1.1.0
 ENV EXPORTER_SHA256 c7446aa33d3505fc8b4a92327c89a543f217ebb246c76880ea796f2893d40418
@@ -12,7 +12,7 @@ RUN set -eu \
     && echo "${EXPORTER_SHA256} /zookeeper_exporter" | sha256sum -c \
     && chmod +x /zookeeper_exporter
 
-FROM marketplace.gcr.io/google/c2d-debian11
+FROM marketplace.gcr.io/google/debian12
 
 RUN set -eu \
     # Installing utilities

diff --git a/...er/templates/debian11/Dockerfile.template → ...r/templates/zookeeper/Dockerfile.template b/...er/templates/debian11/Dockerfile.template → ...r/templates/zookeeper/Dockerfile.template
@@ -7,7 +7,7 @@ FROM {{ .From }} as ospo
 COPY components.csv /components.csv
 COPY source_code.txt /source_code.txt
 
-RUN apt update && apt -y install ca-certificates
+RUN apt update && apt -y install curl ca-certificates
 
 RUN curl -o /download-licenses.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-licenses.sh \
 		&& curl -o /download-ref-repos.sh -L https://raw.githubusercontent.com/GoogleCloudPlatform/click-to-deploy/master/scripts/download-ref-repos.sh \
@@ -89,7 +89,7 @@ RUN set -eux; \
         ca-certificates \
         dirmngr \
         gnupg \
-        netcat \
+        netcat-traditional \
         openssl \
         wget; \
     rm -rf /var/lib/apt/lists/*

diff --git a/...okeeper/templates/debian11/components.csv → ...keeper/templates/zookeeper/components.csv b/...okeeper/templates/debian11/components.csv → ...keeper/templates/zookeeper/components.csv
diff --git a/...r/templates/debian11/docker-entrypoint.sh → .../templates/zookeeper/docker-entrypoint.sh b/...r/templates/debian11/docker-entrypoint.sh → .../templates/zookeeper/docker-entrypoint.sh
diff --git a/...keeper/templates/debian11/source_code.txt → ...eeper/templates/zookeeper/source_code.txt b/...keeper/templates/debian11/source_code.txt → ...eeper/templates/zookeeper/source_code.txt
diff --git a/docker/zookeeper/versions.yaml b/docker/zookeeper/versions.yaml
@@ -16,31 +16,31 @@
 cloudbuild:
   enable_parallel: false
 versions:
-- dir: 3/debian11/3.8
+- dir: 3/debian12/3.8
   excludeTests:
   - tests/functional_tests/exporter_test.yaml
-  from: marketplace.gcr.io/google/c2d-debian11
+  from: marketplace.gcr.io/google/debian12
   packages:
     zookeeper:
-      gpg: 3F7A1D16FA4217B1DC75E1C9FFE35B7F15DFA1BA
-      version: 3.8.3
+      gpg: AF3D175EC05DB249738D01AC8D8C3C3ED0B02E66
+      version: 3.8.4
     gosu:
       version: '1.17'
       gpg: B42F6819007F00F88E364FD4036A9C25BF357DD4
   repo: zookeeper3
   tags:
-  - 3.8.3-debian11
-  - 3.8-debian11
-  - 3-debian11
-  - 3.8.3
+  - 3.8.4-debian12
+  - 3.8-debian12
+  - 3-debian12
+  - 3.8.4
   - '3.8'
   - '3'
   - latest
-  templateSubDir: debian11
+  templateSubDir: zookeeper
 - dir: exporter
   excludeTests:
   - tests/functional_tests/running_test.yaml
-  from: marketplace.gcr.io/google/c2d-debian11
+  from: marketplace.gcr.io/google/debian12
   packages:
     zookeeper_exporter:
       sha256: c7446aa33d3505fc8b4a92327c89a543f217ebb246c76880ea796f2893d40418