From c66cdc979e91ee837c8e43a135198d745c2e7aa3 Mon Sep 17 00:00:00 2001 From: Armando Miani Date: Wed, 20 Nov 2024 11:46:53 +0100 Subject: [PATCH] Add annotations to containers (#11) * Add annotations to containers * Upgrade docker image * fix: reorder attributes in versions.yaml --- 1/debian11/1.3/Dockerfile | 2 +- versions.yaml | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/1/debian11/1.3/Dockerfile b/1/debian11/1.3/Dockerfile index 9b7b906..1e6fbf1 100644 --- a/1/debian11/1.3/Dockerfile +++ b/1/debian11/1.3/Dockerfile @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -FROM gcr.io/google-appengine/debian11 +FROM marketplace.gcr.io/google/debian11 ENV NFS_VERSION 1:1.3.4-6 diff --git a/versions.yaml b/versions.yaml index d7a063d..731dde2 100644 --- a/versions.yaml +++ b/versions.yaml @@ -1,4 +1,4 @@ -# Copyright 2018 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,11 +13,17 @@ # limitations under the License. _variables: - from: &from gcr.io/google-appengine/debian11 + from: &from marketplace.gcr.io/google/debian11 +cloudbuild: + docker_image: gcr.io/cloud-builders/docker:24.0.9 + enable_parallel: false versions: - dir: '1/debian11/1.3' repo: nfs-server1 + annotations: + - key: com.googleapis.cloudmarketplace.product.service.name + value: services/ffece19b-8fdf-4cc5-b916-9d55e27926ef.cloudpartnerservices.goog tags: - '1.3.4-debian11' - '1.3-debian11'