Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[trial-builds] Speed up first trial build by using real image as cache #9535

Merged
merged 6 commits into from
Feb 7, 2023
Merged

[trial-builds] Speed up first trial build by using real image as cache #9535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f51b102
Try speeding up trial builds
jonathanmetzman Jan 31, 2023
c46ccd9
tmp
jonathanmetzman Jan 31, 2023
2823783
fix
jonathanmetzman Jan 31, 2023
231e221
fmt
jonathanmetzman Jan 31, 2023
d1076d4
fix
jonathanmetzman Feb 6, 2023
a724275
fix
jonathanmetzman Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infra/base-images/base-image/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

# Base image for all other images.

ARG parent_image=ubuntu:20.04
ARG parent_image=ubuntu:20.04@sha256:4a45212e9518f35983a976eead0de5eecc555a2f047134e9dd2cfc589076a00d

FROM $parent_image

Expand Down
2 changes: 1 addition & 1 deletion infra/build/functions/build_and_push_test_images.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ def gcb_build_and_push_images(test_image_suffix):
directory = os.path.join('infra', 'base-images', base_image)
step = build_lib.get_docker_build_step([main_tag, test_tag],
directory,
buildkit_cache_image=test_tag,
use_buildkit_cache=True,
src_root='.')
steps.append(step)

Expand Down
16 changes: 7 additions & 9 deletions infra/build/functions/build_lib.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ def _make_image_name_architecture_specific(image_name, architecture):

def get_docker_build_step(image_names,
directory,
buildkit_cache_image=None,
use_buildkit_cache=False,
src_root='oss-fuzz',
architecture='x86_64'):
"""Returns the docker build step."""
Expand All @@ -398,17 +398,15 @@ def get_docker_build_step(image_names,
'args': args,
'dir': directory,
}
# Handle buildkit args
# Note that we mutate "args" after making it a value in step.

if buildkit_cache_image is not None:
if use_buildkit_cache:
env = ['DOCKER_BUILDKIT=1']
step['env'] = env
assert buildkit_cache_image in args
additional_args = [
'--build-arg', 'BUILDKIT_INLINE_CACHE=1', '--cache-from',
buildkit_cache_image
]
args.extend(additional_args)
args.extend(['--build-arg', 'BUILDKIT_INLINE_CACHE=1'])
for image in image_names:
args.extend(['--cache-from', image])

args.append('.')

return step
Expand Down