From 273882068ef163a236a5451b6fe7b4fd2cef33c7 Mon Sep 17 00:00:00 2001 From: Oliver Chang Date: Thu, 16 Sep 2021 11:12:25 +1000 Subject: [PATCH] Tag all base images with :v1. (#6436) To guard against major/breaking image migrations in the future. Part of #6324. --- infra/build/functions/base_images.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/infra/build/functions/base_images.py b/infra/build/functions/base_images.py index de186afc4..593323fc3 100644 --- a/infra/build/functions/base_images.py +++ b/infra/build/functions/base_images.py @@ -34,6 +34,7 @@ BASE_IMAGES = [ ] BASE_PROJECT = 'oss-fuzz-base' TAG_PREFIX = f'gcr.io/{BASE_PROJECT}/' +MAJOR_VERSION = 'v1' def _get_base_image_steps(images, tag_prefix=TAG_PREFIX): @@ -47,11 +48,14 @@ def _get_base_image_steps(images, tag_prefix=TAG_PREFIX): }] for base_image in images: + image = tag_prefix + base_image steps.append({ 'args': [ 'build', '-t', - tag_prefix + base_image, + image, + '-t', + f'{image}:{MAJOR_VERSION}', '.', ], 'dir': 'oss-fuzz/infra/base-images/' + base_image, @@ -77,7 +81,7 @@ def run_build(steps, images): 'options': { 'machineType': 'N1_HIGHCPU_32' }, - 'images': images + 'images': images + [f'{image}:{MAJOR_VERSION}' for image in images] } cloudbuild = build('cloudbuild', 'v1',