Merge branch 'master' into vm-updates-tomcat-2024-11-08-094118

GoogleCloudPlatform · Nov 27, 2024 · 0e30ae9 · 0e30ae9
2 parents 575050f + a3f92c0
commit 0e30ae9
Show file tree

Hide file tree

Showing 45 changed files with 517 additions and 351 deletions.
diff --git a/docker/activemq/versions.yaml b/docker/activemq/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 6/debian12/6.1
@@ -39,6 +40,9 @@ versions:
       version: 5.18.5
       major: '5'
   repo: activemq5
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/5e73b3d2-94bf-4217-8af3-5db683773cfd.cloudpartnerservices.goog
   tags:
   - 5.18.5-debian12
   - 5.18-debian12

diff --git a/docker/airflow/versions.yaml b/docker/airflow/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 2/debian12/2.10
@@ -27,6 +28,9 @@ versions:
       gpg: B42F6819007F00F88E364FD4036A9C25BF357DD4
       version: '1.17'
   repo: airflow2
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/a0ce6574-4b44-48a4-8a72-69c53ba93d3e.cloudpartnerservices.goog
   tags:
   - 2.10.3-debian12
   - 2.10-debian12

diff --git a/docker/argo-workflows/versions.yaml b/docker/argo-workflows/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 3/debian12/3.5
@@ -26,6 +27,9 @@ versions:
     golang:
       version: 1.21
   repo: argo-workflows3
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/dea629ec-49b1-439e-928d-1b08fa253321.cloudpartnerservices.goog
   tags:
   - 3.5.10-debian12
   - 3.5-debian12

diff --git a/docker/c2d-debian/versions.yaml b/docker/c2d-debian/versions.yaml
@@ -19,6 +19,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 11/debian11
@@ -27,10 +28,14 @@ versions:
     debian11:
       version: 11.5.0
   repo: c2d-debian11
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/33c85580-241e-4bb8-a170-b1532293916b.cloudpartnerservices.goog
   tags:
   - '11.5.0'
   - '11.5'
   - '11'
+  - latest
   templateSubDir: debian11
 - dir: 12/debian12
   from: marketplace.gcr.io/google/debian12

diff --git a/docker/cert-manager/versions.yaml b/docker/cert-manager/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
   machineType: E2_HIGHCPU_32
 versions:
@@ -23,6 +24,9 @@ versions:
     cert-manager:
       version: 1.15.3
   repo: cert-manager1
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/bde1bd76-14f1-46d2-99ad-f484cff10720.cloudpartnerservices.goog
   tags:
   - 1.15.3-debian12
   - 1.15-debian12

diff --git a/docker/django/versions.yaml b/docker/django/versions.yaml
@@ -21,6 +21,8 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 5/debian12/5.1
@@ -29,6 +31,9 @@ versions:
     django:
       version: 5.1.1
   repo: django5
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/88b938b9-1b2f-466d-943c-0f432e1e3fa8.cloudpartnerservices.goog
   tags:
   - 5.1.1-debian12
   - 5.1-debian12
@@ -45,6 +50,9 @@ versions:
     uwsgi_exporter:
       version: 1.3.0
   repo: uwsgi-exporter1
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/b068f3d2-c82d-4419-bded-155768bcd791.cloudpartnerservices.goog
   tags:
   - 1.3.0
   - '1.3'

diff --git a/docker/drupal/versions.yaml b/docker/drupal/versions.yaml
@@ -16,6 +16,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 10/php8/debian12/10.3/apache
@@ -28,6 +29,9 @@ versions:
       md5: 7b0f59c9fc1e3a0b753343cd0893eea6
       version: 10.3.6
   repo: drupal10-php8-apache
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/2091b012-066a-46f0-8d26-63c5b7db70a4.cloudpartnerservices.goog
   tags:
   - 10.3.6-debian12
   - 10.3-debian12
@@ -45,6 +49,9 @@ versions:
     drupal:
       md5: 1f7a37ba42ee22948ffc11bfe4541dbd
       version: 10.2.8
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/2091b012-066a-46f0-8d26-63c5b7db70a4.cloudpartnerservices.goog
   repo: drupal10-php8-apache
   tags:
   - 10.2.8-debian12
@@ -69,4 +76,3 @@ versions:
   - '9.5'
   - '9'
   - latest
-
diff --git a/docker/falco/versions.yaml b/docker/falco/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 0/debian11/0.36
@@ -22,6 +23,9 @@ versions:
     falco:
       version: 0.36.2
   repo: falco0
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/5b7a25d4-ece2-4ae3-b8c3-652b2af4a5ec.cloudpartnerservices.goog
   tags:
   - 0.36.2-debian11
   - 0.36-debian11
@@ -35,6 +39,9 @@ versions:
   packages:
     falco:
       version: 0.34.1
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/5b7a25d4-ece2-4ae3-b8c3-652b2af4a5ec.cloudpartnerservices.goog
   repo: falco0
   tags:
   - 0.34.1-debian11
@@ -48,10 +55,12 @@ versions:
       sha256: 5bd3367a0f0839ec96a32ad36d86a0c113476a12424771925cf8b5c2da87be65
       version: 0.8.6
   repo: falco-exporter0
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/14a94703-d67c-403c-8e1f-f5ad256e6cac.cloudpartnerservices.goog
   tags:
   - 0.8.6
   - '0.8'
   - '0'
   - latest
   templateSubDir: exporter
-
diff --git a/docker/gitea/versions.yaml b/docker/gitea/versions.yaml
@@ -19,6 +19,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
   machineType: 'E2_HIGHCPU_32'
 versions:
@@ -30,6 +31,9 @@ versions:
     golang:
       version: '1.23'
   repo: gitea1
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/83c38401-9081-4bfd-8d88-f247f9c37ce9.cloudpartnerservices.goog
   tags:
   - 1.22.2-debian12
   - 1.22-debian12

diff --git a/docker/harbor/versions.yaml b/docker/harbor/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 2/debian12/2.11
@@ -22,6 +23,9 @@ versions:
     harbor:
       version: 2.11.1
   repo: harbor2
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/70c685e1-3aac-4626-9773-b0152237081b.cloudpartnerservices.goog
   tags:
   - 2.11.1-debian12
   - 2.11-debian12
@@ -35,10 +39,12 @@ versions:
   packages:
     harbor:
       version: 2.7.4
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/70c685e1-3aac-4626-9773-b0152237081b.cloudpartnerservices.goog
   repo: harbor2
   tags:
   - 2.7.4-debian12
   - 2.7-debian12
   - 2.7.4
   - '2.7'
-
diff --git a/docker/kafka/versions.yaml b/docker/kafka/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 3/debian12/3.7
@@ -26,6 +27,9 @@ versions:
     scala:
       version: '2.13'
   repo: kafka3
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/ccea51e8-0540-4d1b-890e-2a1b04da0383.cloudpartnerservices.goog
   tags:
   - 3.7.0-debian12
   - 3.7-debian12
@@ -44,6 +48,9 @@ versions:
       version: 3.6.1
     scala:
       version: '2.13'
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/ccea51e8-0540-4d1b-890e-2a1b04da0383.cloudpartnerservices.goog
   repo: kafka3
   tags:
   - 3.6.1-debian12
@@ -59,6 +66,9 @@ versions:
     kafka_exporter:
       version: 1.8.0
   repo: kafka-exporter1
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/a0c4026b-e814-4954-b5e5-c8bd9ee32753.cloudpartnerservices.goog
   tags:
   - 1.8.0
   - '1.8'

diff --git a/docker/keycloak/versions.yaml b/docker/keycloak/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 23/debian11/23.0
@@ -62,6 +63,9 @@ versions:
     sshdcommon:
       version: 2.9.2
   repo: keycloak21
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/86f72fc8-e5a0-4d16-8a93-218c7696748d.cloudpartnerservices.goog
   tags:
   - 21.1.2-debian11
   - 21.1-debian11

diff --git a/docker/prometheus-operator/versions.yaml b/docker/prometheus-operator/versions.yaml
@@ -19,6 +19,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 0/debian12/0.77
@@ -29,6 +30,9 @@ versions:
     golang:
       version: 1.23.1
   repo: prometheus-operator0
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/c7c58b15-e370-4ba7-b1ec-5d8e2c4df4df.cloudpartnerservices.goog
   tags:
   - 0.77.1-debian12
   - 0.77-debian12
@@ -44,6 +48,9 @@ versions:
       version: 0.69.1
     golang:
       version: 1.23.1
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/c7c58b15-e370-4ba7-b1ec-5d8e2c4df4df.cloudpartnerservices.goog
   repo: prometheus-operator0
   tags:
   - 0.69.1-debian12

diff --git a/docker/solr/versions.yaml b/docker/solr/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 9/debian12/9.6
@@ -23,6 +24,9 @@ versions:
       gpg: 50E3EE1C91C7E0CB4DFB007B369424FC98F3F6EC
       version: 9.6.1
   repo: solr9
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/4af7481b-2d9f-4f98-bb26-cceb6db72414.cloudpartnerservices.goog
   tags:
   - 9.6.1-debian12
   - 9.6-debian12

diff --git a/docker/spark/versions.yaml b/docker/spark/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
   machine_type: 'E2_HIGHCPU_32'
 versions:
@@ -25,6 +26,9 @@ versions:
     spark:
       version: 3.5.2
   repo: spark3
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/ad1bf2fb-7561-4833-8b24-ae3cc489a86f.cloudpartnerservices.goog
   tags:
   - 3.5.2-debian12
   - 3.5-debian12

diff --git a/docker/superset/versions.yaml b/docker/superset/versions.yaml
@@ -14,6 +14,7 @@
 
 
 cloudbuild:
+  docker_image: gcr.io/cloud-builders/docker:24.0.9
   enable_parallel: false
 versions:
 - dir: 4/debian12/4.0
@@ -22,6 +23,9 @@ versions:
     superset:
       version: 4.0.2
   repo: superset4
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: null
   tags:
   - 4.0.2-debian11
   - 4.0-debian11
@@ -41,6 +45,9 @@ versions:
     statsd_exporter:
       version: 0.27.1
   repo: statsd-exporter0
+  annotations:
+  - key: com.googleapis.cloudmarketplace.product.service.name
+    value: services/eef49bfe-eedd-4301-9165-8f2418cfecac.cloudpartnerservices.goog
   tags:
   - 0.27.1
   - '0.27'