From 0c092b787f2ee4e0870bb884eeb6d1e04d7610ce Mon Sep 17 00:00:00 2001 From: Navidem Date: Tue, 22 Mar 2022 22:12:19 -0700 Subject: [PATCH] Replace use of sed with docker tag (#7423) * Replace use of sed with docker tag * fix some nits --- infra/build/functions/base_images.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/infra/build/functions/base_images.py b/infra/build/functions/base_images.py index a6004ed1e..895bbb4d7 100644 --- a/infra/build/functions/base_images.py +++ b/infra/build/functions/base_images.py @@ -76,17 +76,17 @@ def _get_introspector_base_images_steps(images, tag_prefix=TAG_PREFIX): 'https://github.com/google/oss-fuzz.git', ], 'name': 'gcr.io/cloud-builders/git', - }] - - steps.extend([{ + }, { + 'name': 'gcr.io/cloud-builders/docker', + 'args': ['pull', 'gcr.io/oss-fuzz-base/base-clang:introspector'], + }, { 'name': - 'gcr.io/oss-fuzz-base/base-runner', + 'gcr.io/cloud-builders/docker', 'args': [ - 'bash', '-c', - (f'sed -i s/base-clang.*/base-clang:{INTROSPECTOR_TAG}/g' - ' oss-fuzz/infra/base-images/base-builder/Dockerfile') - ] - }]) + 'tag', 'gcr.io/oss-fuzz-base/base-clang:introspector', + 'gcr.io/oss-fuzz-base/base-clang:latest' + ], + }] for base_image in images: image = tag_prefix + base_image