indexer: Push image saved from built container

Author: oliverchang

infra/build/functions/build_lib.py

@@ -139,7 +139,10 @@ def get_targets_list_url(bucket, project, sanitizer):
   return url
 
 
-def dockerify_run_step(step, build, use_architecture_image_name=False):
+def dockerify_run_step(step,
+                       build,
+                       use_architecture_image_name=False,
+                       container_name=None):
   """Modify a docker run step to run using gcr.io/cloud-builders/docker. This
   allows us to specify which architecture to run the image on."""
   image = step['name']
@@ -154,6 +157,10 @@ def dockerify_run_step(step, build, use_architecture_image_name=False):
       'run', '--platform', platform, '-v', '/workspace:/workspace',
       '--privileged', '--cap-add=all'
   ]
+
+  if container_name:
+    new_args.extend(['--name', container_name])
+
   for env_var in step.get('env', {}):
     new_args.extend(['-e', env_var])
   new_args += ['-t', image]

infra/build/functions/build_project.py

@@ -503,6 +503,10 @@ def get_build_steps_for_project(project,
   return build_steps
 
 
+def _indexer_built_image_name(name: str):
+  return f'us-central1-docker.pkg.dev/oss-fuzz/indexer/{name}'
+
+
 def get_indexer_build_steps(project_name,
                             project_yaml,
                             dockerfile,
@@ -550,11 +554,31 @@ def get_indexer_build_steps(project_name,
   }
   build_lib.dockerify_run_step(index_step,
                                build,
-                               use_architecture_image_name=build.is_arm)
+                               use_architecture_image_name=build.is_arm,
+                               container_name='indexed-container')
+
+  save_container_step = {
+      'name':
+          build_lib.DOCKER_TOOL_IMAGE,
+      'args': [
+          'container', 'commit', 'indexer-container',
+          _indexer_built_image_name(project.name)
+      ],
+  }
+  push_image_step = {
+      'name': build_lib.DOCKER_TOOL_IMAGE,
+      'args': [
+          'push',
+          _indexer_built_image_name(project.name),
+      ],
+      'allowFailure': True,
+  }
 
   # TODO: Don't upload anything if we're in trial build.
   build_steps.extend([
       index_step,
+      save_container_step,
+      push_image_step,
       {
           # TODO(metzman): Make sure not to incldue other tars, and support .tar.gz
           'name': get_uploader_image(),