Skip to content

fix: use dedicated buildx builder instance in cloud build #5881

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

Merged
cuixq merged 2 commits into from
Aug 21, 2026
+57 −15
Merged

fix: use dedicated buildx builder instance in cloud build #5881

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6e3e0b1
fix: use dedicated buildx builder instance in cloud build
cuixq Aug 20, 2026
b4d0f1b
Merge branch 'master' into fix
cuixq Aug 21, 2026
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
70 changes: 57 additions & 13 deletions deployment/build-and-stage.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,16 +89,27 @@ steps:
waitFor: ['build-oss-fuzz-importer', 'cloud-build-queue']

# Build/push go images
- name: 'gcr.io/cloud-builders/docker'
args: ['buildx', 'create', '--name', 'osv-builder', '--use', '--driver-opt', 'network=host']
id: 'setup-buildx'
waitFor: ['setup']
volumes:
- name: 'docker-config'
path: '/root/.docker'

- name: 'gcr.io/cloud-builders/docker'
entrypoint: 'bash'
args: ['-c', 'docker pull gcr.io/oss-vdb/importer:latest || exit 0']
id: 'pull-importer'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/importer:latest', '-t', 'gcr.io/oss-vdb/importer:$COMMIT_SHA', '--target', 'importer', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/importer:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/importer:latest', '-t', 'gcr.io/oss-vdb/importer:$COMMIT_SHA', '--target', 'importer', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/importer:latest', '--pull', '.']
dir: 'go'
id: 'build-importer'
waitFor: ['pull-importer']
waitFor: ['pull-importer', 'setup-buildx']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/importer']
waitFor: ['build-importer', 'cloud-build-queue']
Expand All @@ -109,10 +120,13 @@ steps:
id: 'pull-osv-worker'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/osv-worker:latest', '-t', 'gcr.io/oss-vdb/osv-worker:$COMMIT_SHA', '--target', 'worker', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/osv-worker:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/osv-worker:latest', '-t', 'gcr.io/oss-vdb/osv-worker:$COMMIT_SHA', '--target', 'worker', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/osv-worker:latest', '--pull', '.']
dir: 'go'
id: 'build-osv-worker'
waitFor: ['pull-osv-worker', 'build-importer']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/osv-worker']
waitFor: ['build-osv-worker', 'cloud-build-queue']
Expand All @@ -123,10 +137,13 @@ steps:
id: 'pull-exporter'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/exporter:latest', '-t', 'gcr.io/oss-vdb/exporter:$COMMIT_SHA', '--target', 'exporter', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/exporter:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/exporter:latest', '-t', 'gcr.io/oss-vdb/exporter:$COMMIT_SHA', '--target', 'exporter', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/exporter:latest', '--pull', '.']
dir: 'go'
id: 'build-exporter'
waitFor: ['pull-exporter', 'build-osv-worker']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/exporter']
waitFor: ['build-exporter', 'cloud-build-queue']
Expand All @@ -137,10 +154,13 @@ steps:
id: 'pull-record-checker'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/record-checker:latest', '-t', 'gcr.io/oss-vdb/record-checker:$COMMIT_SHA', '--target', 'recordchecker', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/record-checker:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/record-checker:latest', '-t', 'gcr.io/oss-vdb/record-checker:$COMMIT_SHA', '--target', 'recordchecker', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/record-checker:latest', '--pull', '.']
dir: 'go'
id: 'build-record-checker'
waitFor: ['pull-record-checker', 'build-exporter']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/record-checker']
waitFor: ['build-record-checker', 'cloud-build-queue']
Expand All @@ -151,10 +171,13 @@ steps:
id: 'pull-relations'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/relations:latest', '-t', 'gcr.io/oss-vdb/relations:$COMMIT_SHA', '--target', 'relations', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/relations:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/relations:latest', '-t', 'gcr.io/oss-vdb/relations:$COMMIT_SHA', '--target', 'relations', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/relations:latest', '--pull', '.']
dir: 'go'
id: 'build-relations'
waitFor: ['pull-relations', 'build-record-checker']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/relations']
waitFor: ['build-relations', 'cloud-build-queue']
Expand All @@ -165,10 +188,13 @@ steps:
id: 'pull-generatesitemap'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/generatesitemap:latest', '-t', 'gcr.io/oss-vdb/generatesitemap:$COMMIT_SHA', '--target', 'generatesitemap', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/generatesitemap:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/generatesitemap:latest', '-t', 'gcr.io/oss-vdb/generatesitemap:$COMMIT_SHA', '--target', 'generatesitemap', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/generatesitemap:latest', '--pull', '.']
dir: 'go'
id: 'build-generatesitemap'
waitFor: ['pull-generatesitemap', 'build-relations']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/generatesitemap']
waitFor: ['build-generatesitemap', 'cloud-build-queue']
Expand All @@ -179,10 +205,13 @@ steps:
id: 'pull-custommetrics'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/custommetrics:latest', '-t', 'gcr.io/oss-vdb/custommetrics:$COMMIT_SHA', '--target', 'custommetrics', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/custommetrics:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/custommetrics:latest', '-t', 'gcr.io/oss-vdb/custommetrics:$COMMIT_SHA', '--target', 'custommetrics', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/custommetrics:latest', '--pull', '.']
dir: 'go'
id: 'build-custommetrics'
waitFor: ['pull-custommetrics', 'build-generatesitemap']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/custommetrics']
waitFor: ['build-custommetrics', 'cloud-build-queue']
Expand All @@ -193,10 +222,13 @@ steps:
id: 'pull-gitter'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/gitter:latest', '-t', 'gcr.io/oss-vdb/gitter:$COMMIT_SHA', '--target', 'gitter', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/gitter:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/gitter:latest', '-t', 'gcr.io/oss-vdb/gitter:$COMMIT_SHA', '--target', 'gitter', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/gitter:latest', '--pull', '.']
dir: 'go'
id: 'build-gitter'
waitFor: ['pull-gitter', 'build-custommetrics']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/gitter']
waitFor: ['build-gitter', 'cloud-build-queue']
Expand All @@ -207,10 +239,13 @@ steps:
id: 'pull-osv-server'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/osv-server:latest', '-t', 'gcr.io/oss-vdb/osv-server:$COMMIT_SHA', '--target', 'api', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/osv-server:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/osv-server:latest', '-t', 'gcr.io/oss-vdb/osv-server:$COMMIT_SHA', '--target', 'api', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/osv-server:latest', '--pull', '.']
dir: 'go'
id: 'build-osv-server'
waitFor: ['pull-osv-server', 'build-gitter']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/osv-server']
waitFor: ['build-osv-server', 'cloud-build-queue']
Expand Down Expand Up @@ -241,10 +276,13 @@ steps:

# Build/push osv-linter images to gcr.io/oss-vdb-test.
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb-test/osv-linter:latest', '-t', 'gcr.io/oss-vdb-test/osv-linter:$COMMIT_SHA', '--build-context', 'bindings=../bindings', '-f', 'cmd/osv-linter-worker/Dockerfile', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb-test/osv-linter:latest', '-t', 'gcr.io/oss-vdb-test/osv-linter:$COMMIT_SHA', '--build-context', 'bindings=../bindings', '-f', 'cmd/osv-linter-worker/Dockerfile', '.']
dir: 'go'
id: 'build-osv-linter'
waitFor: ['build-worker', 'build-gitter']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb-test/osv-linter']
waitFor: ['build-osv-linter', 'cloud-build-queue']
Expand Down Expand Up @@ -363,10 +401,13 @@ steps:
id: 'pull-first-package-finder'
waitFor: ['setup']
- name: gcr.io/cloud-builders/docker
args: ['buildx', 'build', '-t', 'gcr.io/oss-vdb/run_first_package_finder:latest', '-t', 'gcr.io/oss-vdb/run_first_package_finder:$COMMIT_SHA', '--target', 'first_package_finder', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/run_first_package_finder:latest', '--pull', '.']
args: ['buildx', 'build', '--load', '-t', 'gcr.io/oss-vdb/run_first_package_finder:latest', '-t', 'gcr.io/oss-vdb/run_first_package_finder:$COMMIT_SHA', '--target', 'first_package_finder', '--build-context', 'bindings=../bindings', '-f', 'Dockerfile', '--cache-from', 'gcr.io/oss-vdb/run_first_package_finder:latest', '--pull', '.']
dir: 'go'
id: 'build-first-package-finder'
waitFor: ['pull-first-package-finder', 'build-osv-linter']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: gcr.io/cloud-builders/docker
args: ['push', '--all-tags', 'gcr.io/oss-vdb/run_first_package_finder']
waitFor: ['build-first-package-finder', 'cloud-build-queue']
Expand Down Expand Up @@ -408,11 +449,14 @@ steps:
id: 'pull-website'
waitFor: ['setup']
- name: 'gcr.io/cloud-builders/docker'
args: ['buildx', 'build', '--build-arg', 'BUILDKIT_INLINE_CACHE=1',
args: ['buildx', 'build', '--load', '--build-arg', 'BUILDKIT_INLINE_CACHE=1',
'-t', 'gcr.io/oss-vdb/osv-website:latest', '-t', 'gcr.io/oss-vdb/osv-website:$COMMIT_SHA',
'-f', 'gcp/website/Dockerfile', '--cache-from', 'gcr.io/oss-vdb/osv-website:latest', '--pull', '.']
id: 'build-website'
waitFor: ['pull-website', 'build-first-package-finder']
volumes:
- name: 'docker-config'
path: '/root/.docker'
- name: 'gcr.io/cloud-builders/docker'
args: ['push', '--all-tags', 'gcr.io/oss-vdb/osv-website']
waitFor: ['build-website', 'cloud-build-queue']
Expand Down
1 change: 0 additions & 1 deletion go/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# syntax=docker/dockerfile:1.4
# Copyright 2026 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
1 change: 0 additions & 1 deletion go/cmd/osv-linter-worker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
# syntax=docker/dockerfile:1.4
# Copyright 2024 Google LLC
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand Down
Loading