Merge branch 'master' into manikowski-docker-airflow-19082024

GoogleCloudPlatform · Sep 4, 2024 · db81cca · db81cca
2 parents c3cbf8b + 742527a
commit db81cca
Show file tree

Hide file tree

Showing 31 changed files with 777 additions and 378 deletions.
diff --git a/docker/activemq/5/debian11/5.18/Dockerfile → docker/activemq/5/debian12/5.18/Dockerfile b/docker/activemq/5/debian11/5.18/Dockerfile → docker/activemq/5/debian12/5.18/Dockerfile
@@ -1,12 +1,12 @@
 
 
-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 ca-certificates curl
 
 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 \
@@ -17,7 +17,7 @@ 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
 

diff --git a/...r/activemq/5/debian11/5.18/components.csv → ...r/activemq/5/debian12/5.18/components.csv b/...r/activemq/5/debian11/5.18/components.csv → ...r/activemq/5/debian12/5.18/components.csv
diff --git a/...vemq/5/debian11/5.18/docker-entrypoint.sh → ...vemq/5/debian12/5.18/docker-entrypoint.sh b/...vemq/5/debian11/5.18/docker-entrypoint.sh → ...vemq/5/debian12/5.18/docker-entrypoint.sh
diff --git a/.../activemq/5/debian11/5.18/source_code.txt → .../activemq/5/debian12/5.18/source_code.txt b/.../activemq/5/debian11/5.18/source_code.txt → .../activemq/5/debian12/5.18/source_code.txt
diff --git a/docker/activemq/6/debian11/6.1/Dockerfile → docker/activemq/6/debian12/6.1/Dockerfile b/docker/activemq/6/debian11/6.1/Dockerfile → docker/activemq/6/debian12/6.1/Dockerfile
@@ -1,12 +1,12 @@
 
 
-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 ca-certificates curl
 
 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 \
@@ -17,7 +17,7 @@ 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
 

diff --git a/...er/activemq/6/debian11/6.1/components.csv → ...er/activemq/6/debian12/6.1/components.csv b/...er/activemq/6/debian11/6.1/components.csv → ...er/activemq/6/debian12/6.1/components.csv
diff --git a/...ivemq/6/debian11/6.1/docker-entrypoint.sh → ...ivemq/6/debian12/6.1/docker-entrypoint.sh b/...ivemq/6/debian11/6.1/docker-entrypoint.sh → ...ivemq/6/debian12/6.1/docker-entrypoint.sh
diff --git a/...r/activemq/6/debian11/6.1/source_code.txt → ...r/activemq/6/debian12/6.1/source_code.txt b/...r/activemq/6/debian11/6.1/source_code.txt → ...r/activemq/6/debian12/6.1/source_code.txt
diff --git a/docker/activemq/templates/Dockerfile.template b/docker/activemq/templates/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 ca-certificates curl
 
 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 \

diff --git a/docker/activemq/versions.yaml b/docker/activemq/versions.yaml
@@ -16,33 +16,33 @@
 cloudbuild:
   enable_parallel: false
 versions:
-- dir: 6/debian11/6.1
-  from: marketplace.gcr.io/google/c2d-debian11
+- dir: 6/debian12/6.1
+  from: marketplace.gcr.io/google/debian12
   packages:
     activemq:
       version: 6.1.3
       major: '6'
   repo: activemq6
   tags:
-  - 6.1.3-debian11
-  - 6.1-debian11
-  - 6-debian11
+  - 6.1.3-debian12
+  - 6.1-debian12
+  - 6-debian12
   - 6.1.3
   - '6.1'
   - '6'
   - latest
 
-- dir: 5/debian11/5.18
-  from: marketplace.gcr.io/google/c2d-debian11
+- dir: 5/debian12/5.18
+  from: marketplace.gcr.io/google/debian12
   packages:
     activemq:
       version: 5.18.5
       major: '5'
   repo: activemq5
   tags:
-  - 5.18.5-debian11
-  - 5.18-debian11
-  - 5-debian11
+  - 5.18.5-debian12
+  - 5.18-debian12
+  - 5-debian12
   - 5.18.5
   - '5.18'
   - '5'

diff --git a/docker/cert-manager/1/debian11/1.13/Dockerfile b/docker/cert-manager/1/debian11/1.13/Dockerfile
diff --git a/docker/cert-manager/1/debian11/1.13/components.csv b/docker/cert-manager/1/debian11/1.13/components.csv
diff --git a/docker/cert-manager/1/debian11/1.13/download-licenses.sh b/docker/cert-manager/1/debian11/1.13/download-licenses.sh