Skip to content

feat: parameterize repo name for common/cloudbuild configs. #477

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

Open
jinseopkim0 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: parameterize repo name for common/cloudbuild configs. #477

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 9 additions & 2 deletions common/cloudbuild-airlock.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,13 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# GCB config for generating docker images using airlock.
#
# _IMAGE_NAME: Name of the image. E.g. python-multi
# _IMAGE_SOURCE_PATH: Path to Dockerfile. E.g. python/googleapis/python-multi
# _PROJECT_ID: Name of GCB project. E.g. cloud-sdk-release-custom-pool
# _REPO_NAME: Name of the Artifact Registry Repo. E.g. release-images-dev

timeout: 7200s # 2 hours
steps:
- name: 'gcr.io/cloud-builders/docker'
Expand All @@ -31,12 +38,12 @@ steps:
# https://docs.docker.com/build/builders/drivers/#loading-to-local-image-store
args: ["buildx", "build", "--add-host=metadata.google.internal:169.254.169.254",
"--load",
"-t", "us-central1-docker.pkg.dev/${_PROJECT_ID}/release-images-dev/${_IMAGE_NAME}", "."]
"-t", "us-central1-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}", "."]
dir: '${_IMAGE_SOURCE_PATH}'
id: '${_IMAGE_NAME}'
waitFor: ["buildx-create"]
options:
machineType: 'E2_HIGHCPU_8'
requestedVerifyOption: VERIFIED # For provenance attestation generation
images:
- us-central1-docker.pkg.dev/${_PROJECT_ID}/release-images-dev/${_IMAGE_NAME}
- us-central1-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}
9 changes: 5 additions & 4 deletions common/cloudbuild-structure-test.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,26 +12,27 @@
# See the License for the specific language governing permissions and
# limitations under the License.

# GCB config for generating docker images.
# GCB config for generating docker images and running structure_test.
#
# Parameters
# _IMAGE_NAME: Name of the image. E.g. python-multi
# _IMAGE_SOURCE_PATH: Path to Dockerfile. E.g. python/googleapis/python-multi
# _PROJECT_ID: Name of GCB project. E.g. cloud-sdk-release-custom-pool
# _REPO_NAME: Name of the Artifact Registry Repo. E.g. release-images-dev

timeout: 7200s # 2 hours
steps:
- name: gcr.io/cloud-builders/docker
args: [
'build', '-t',
'us-central1-docker.pkg.dev/${_PROJECT_ID}/release-images-dev/${_IMAGE_NAME}',
'us-central1-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}',
'.']
dir: '${_IMAGE_SOURCE_PATH}'
id: '${_IMAGE_NAME}'
waitFor: ['-']
- name: gcr.io/gcp-runtimes/structure_test
args: [
"-i", "us-central1-docker.pkg.dev/${_PROJECT_ID}/release-images-dev/${_IMAGE_NAME}",
"-i", "us-central1-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}",
"--config", "${_STRUCTURE_TEST_CONFIG}", "-v"]
waitFor: ["${_IMAGE_NAME}"]

Expand All @@ -40,4 +41,4 @@ options:
requestedVerifyOption: VERIFIED # For provenance attestation generation

images:
- us-central1-docker.pkg.dev/${_PROJECT_ID}/release-images-dev/${_IMAGE_NAME}
- us-central1-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}
5 changes: 3 additions & 2 deletions common/cloudbuild.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,14 @@
# _IMAGE_NAME: Name of the image. E.g. python-multi
# _IMAGE_SOURCE_PATH: Path to Dockerfile. E.g. python/googleapis/python-multi
# _PROJECT_ID: Name of GCB project. E.g. cloud-sdk-release-custom-pool
# _REPO_NAME: Name of the Artifact Registry Repo. E.g. release-images-dev

timeout: 7200s # 2 hours
steps:
- name: gcr.io/cloud-builders/docker
args: [
'build', '-t',
'us-central1-docker.pkg.dev/${_PROJECT_ID}/release-images-dev/${_IMAGE_NAME}',
'us-central1-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}',
'.']
dir: '${_IMAGE_SOURCE_PATH}'
id: '${_IMAGE_NAME}'
Expand All @@ -35,4 +36,4 @@ options:
requestedVerifyOption: VERIFIED # For provenance attestation generation

images:
- us-central1-docker.pkg.dev/${_PROJECT_ID}/release-images-dev/${_IMAGE_NAME}
- us-central1-docker.pkg.dev/${_PROJECT_ID}/${_REPO_NAME}/${_IMAGE_NAME}