From b8e324ea446861a3afdb7c9fc2a49cf9742b5a54 Mon Sep 17 00:00:00 2001 From: Priya Wadhwa Date: Wed, 1 Sep 2021 18:10:31 -0400 Subject: [PATCH] use registry --- BUILD | 132 ++++++++++++++++----------------- cloudbuild.yaml | 3 + hack/print-workspace-status.sh | 1 + 3 files changed, 70 insertions(+), 66 deletions(-) diff --git a/BUILD b/BUILD index 88a5325fa..adbd98123 100644 --- a/BUILD +++ b/BUILD @@ -19,12 +19,12 @@ ALL_DISTROS = [ ] STATIC = dict({ - "gcr.io/{PROJECT_ID}/static:{COMMIT_SHA}": "//base:static_root_amd64_debian10", - "gcr.io/{PROJECT_ID}/static-debian10:{COMMIT_SHA}": "//base:static_root_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/static:{COMMIT_SHA}": "//base:static_root_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/static-debian10:{COMMIT_SHA}": "//base:static_root_amd64_debian10", }) STATIC.update({ - "gcr.io/{PROJECT_ID}/static:" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_debian10" + "{REGISTRY}/{PROJECT_ID}/static:" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_debian10" for arch in ARCHITECTURES for (tag_base, label, user) in [ ("latest", "static", "root"), @@ -35,7 +35,7 @@ STATIC.update({ }) STATIC.update({ - "gcr.io/{PROJECT_ID}/static-" + distro + ":" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_" + distro + "{REGISTRY}/{PROJECT_ID}/static-" + distro + ":" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_" + distro for arch in ARCHITECTURES for (tag_base, label, user) in [ ("latest", "static", "root"), @@ -47,12 +47,12 @@ STATIC.update({ }) BASE = { - "gcr.io/{PROJECT_ID}/base:{COMMIT_SHA}": "//base:base_root_amd64_debian10", - "gcr.io/{PROJECT_ID}/base-debian10:{COMMIT_SHA}": "//base:base_root_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/base:{COMMIT_SHA}": "//base:base_root_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/base-debian10:{COMMIT_SHA}": "//base:base_root_amd64_debian10", } BASE.update({ - "gcr.io/{PROJECT_ID}/base:" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_debian10" + "{REGISTRY}/{PROJECT_ID}/base:" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_debian10" for arch in ARCHITECTURES for (tag_base, label, user) in [ ("latest", "base", "root"), @@ -63,7 +63,7 @@ BASE.update({ }) BASE.update({ - "gcr.io/{PROJECT_ID}/base-" + distro + ":" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_" + distro + "{REGISTRY}/{PROJECT_ID}/base-" + distro + ":" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_" + distro for arch in ARCHITECTURES for (tag_base, label, user) in [ ("latest", "base", "root"), @@ -75,12 +75,12 @@ BASE.update({ }) CC = { - "gcr.io/{PROJECT_ID}/cc:{COMMIT_SHA}": "//cc:cc_root_amd64_debian10", - "gcr.io/{PROJECT_ID}/cc-debian10:{COMMIT_SHA}": "//cc:cc_root_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/cc:{COMMIT_SHA}": "//cc:cc_root_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/cc-debian10:{COMMIT_SHA}": "//cc:cc_root_amd64_debian10", } CC.update({ - "gcr.io/{PROJECT_ID}/cc:" + tag_base + "-" + arch: "//cc:" + label + "_" + user + "_" + arch + "_debian10" + "{REGISTRY}/{PROJECT_ID}/cc:" + tag_base + "-" + arch: "//cc:" + label + "_" + user + "_" + arch + "_debian10" for arch in ARCHITECTURES for (tag_base, label, user) in [ ("latest", "cc", "root"), @@ -91,7 +91,7 @@ CC.update({ }) CC.update({ - "gcr.io/{PROJECT_ID}/cc-" + distro + ":" + tag_base + "-" + arch: "//cc:" + label + "_" + user + "_" + arch + "_" + distro + "{REGISTRY}/{PROJECT_ID}/cc-" + distro + ":" + tag_base + "-" + arch: "//cc:" + label + "_" + user + "_" + arch + "_" + distro for arch in ARCHITECTURES for (tag_base, label, user) in [ ("latest", "cc", "root"), @@ -103,7 +103,7 @@ CC.update({ }) PYTHON3 = { - "gcr.io/{PROJECT_ID}/python3:" + tag_base + "-" + arch: "//experimental/python3:" + label + "_" + user + "_" + arch + "_debian10" + "{REGISTRY}/{PROJECT_ID}/python3:" + tag_base + "-" + arch: "//experimental/python3:" + label + "_" + user + "_" + arch + "_debian10" for arch in BASE_ARCHITECTURES for (tag_base, label, user) in [ ("latest", "python3", "root"), @@ -114,7 +114,7 @@ PYTHON3 = { } PYTHON3.update({ - "gcr.io/{PROJECT_ID}/python3-" + distro + ":" + tag_base + "-" + arch: "//experimental/python3:" + label + "_" + user + "_" + arch + "_" + distro + "{REGISTRY}/{PROJECT_ID}/python3-" + distro + ":" + tag_base + "-" + arch: "//experimental/python3:" + label + "_" + user + "_" + arch + "_" + distro for arch in BASE_ARCHITECTURES for (tag_base, label, user) in [ ("latest", "python3", "root"), @@ -126,7 +126,7 @@ PYTHON3.update({ }) PYTHON27 = { - "gcr.io/{PROJECT_ID}/python2.7:" + tag_base + "-" + arch: "//experimental/python2.7:" + label + "_" + arch + "_debian10" + "{REGISTRY}/{PROJECT_ID}/python2.7:" + tag_base + "-" + arch: "//experimental/python2.7:" + label + "_" + arch + "_debian10" for arch in BASE_ARCHITECTURES for (tag_base, label) in [ ("latest", "python27"), @@ -135,7 +135,7 @@ PYTHON27 = { } PYTHON27.update({ - "gcr.io/{PROJECT_ID}/python2.7-" + distro + ":" + tag_base + "-" + arch: "//experimental/python2.7:" + label + "_" + arch + "_" + distro + "{REGISTRY}/{PROJECT_ID}/python2.7-" + distro + ":" + tag_base + "-" + arch: "//experimental/python2.7:" + label + "_" + arch + "_" + distro for arch in BASE_ARCHITECTURES for (tag_base, label) in [ ("latest", "python27"), @@ -145,59 +145,59 @@ PYTHON27.update({ }) NODEJS = { - "gcr.io/{PROJECT_ID}/nodejs:latest-amd64": "//nodejs:nodejs14_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs:latest-arm64": "//nodejs:nodejs14_arm64_debian10", - "gcr.io/{PROJECT_ID}/nodejs:debug-amd64": "//nodejs:nodejs14_debug_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs:debug-arm64": "//nodejs:nodejs14_debug_arm64_debian10", - "gcr.io/{PROJECT_ID}/nodejs-debian10:latest": "//nodejs:nodejs14_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs-debian10:debug": "//nodejs:nodejs14_debug_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs:10": "//nodejs:nodejs10_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs:12": "//nodejs:nodejs12_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs:14": "//nodejs:nodejs14_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs:10-debug": "//nodejs:nodejs10_debug_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs:12-debug": "//nodejs:nodejs12_debug_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs:14-debug": "//nodejs:nodejs14_debug_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs-debian10:10": "//nodejs:nodejs10_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs-debian10:12": "//nodejs:nodejs12_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs-debian10:14": "//nodejs:nodejs14_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs-debian10:10-debug": "//nodejs:nodejs10_debug_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs-debian10:12-debug": "//nodejs:nodejs12_debug_amd64_debian10", - "gcr.io/{PROJECT_ID}/nodejs-debian10:14-debug": "//nodejs:nodejs14_debug_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:latest-amd64": "//nodejs:nodejs14_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:latest-arm64": "//nodejs:nodejs14_arm64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:debug-amd64": "//nodejs:nodejs14_debug_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:debug-arm64": "//nodejs:nodejs14_debug_arm64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs-debian10:latest": "//nodejs:nodejs14_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs-debian10:debug": "//nodejs:nodejs14_debug_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:10": "//nodejs:nodejs10_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:12": "//nodejs:nodejs12_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:14": "//nodejs:nodejs14_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:10-debug": "//nodejs:nodejs10_debug_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:12-debug": "//nodejs:nodejs12_debug_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs:14-debug": "//nodejs:nodejs14_debug_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs-debian10:10": "//nodejs:nodejs10_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs-debian10:12": "//nodejs:nodejs12_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs-debian10:14": "//nodejs:nodejs14_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs-debian10:10-debug": "//nodejs:nodejs10_debug_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs-debian10:12-debug": "//nodejs:nodejs12_debug_amd64_debian10", + "{REGISTRY}/{PROJECT_ID}/nodejs-debian10:14-debug": "//nodejs:nodejs14_debug_amd64_debian10", } JAVA = { - "gcr.io/{PROJECT_ID}/java:base": "//java:java_base_root_debian10", - "gcr.io/{PROJECT_ID}/java:base-nonroot": "//java:java_base_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java:base-debug": "//java:java_base_debug_root_debian10", - "gcr.io/{PROJECT_ID}/java:base-debug-nonroot": "//java:java_base_debug_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java:latest": "//java:java11_root_debian10", - "gcr.io/{PROJECT_ID}/java:nonroot": "//java:java11_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java:debug": "//java:java11_debug_root_debian10", - "gcr.io/{PROJECT_ID}/java:debug-nonroot": "//java:java11_debug_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java:11": "//java:java11_root_debian10", - "gcr.io/{PROJECT_ID}/java:11-nonroot": "//java:java11_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java:11-debug": "//java:java11_debug_root_debian10", - "gcr.io/{PROJECT_ID}/java:11-debug-nonroot": "//java:java11_debug_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:base": "//java:java_base_root_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:base-nonroot": "//java:java_base_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:base-debug": "//java:java_base_debug_root_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:base-debug-nonroot": "//java:java_base_debug_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:latest": "//java:java11_root_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:nonroot": "//java:java11_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:11": "//java:java11_root_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:11-nonroot": "//java:java11_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:debug": "//java:java11_debug_root_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:debug-nonroot": "//java:java11_debug_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:11-debug": "//java:java11_debug_root_debian10", - "gcr.io/{PROJECT_ID}/java-debian10:11-debug-nonroot": "//java:java11_debug_nonroot_debian10", - "gcr.io/{PROJECT_ID}/java/jetty:latest": "//java/jetty:jetty_java11_debian10", - "gcr.io/{PROJECT_ID}/java/jetty:debug": "//java/jetty:jetty_java11_debug_debian10", - "gcr.io/{PROJECT_ID}/java/jetty:java11": "//java/jetty:jetty_java11_debian10", - "gcr.io/{PROJECT_ID}/java/jetty:java11-debug": "//java/jetty:jetty_java11_debug_debian10", - "gcr.io/{PROJECT_ID}/java-debian10/jetty:latest": "//java/jetty:jetty_java11_debian10", - "gcr.io/{PROJECT_ID}/java-debian10/jetty:java11": "//java/jetty:jetty_java11_debian10", - "gcr.io/{PROJECT_ID}/java-debian10/jetty:debug": "//java/jetty:jetty_java11_debug_debian10", - "gcr.io/{PROJECT_ID}/java-debian10/jetty:java11-debug": "//java/jetty:jetty_java11_debug_debian10", + "{REGISTRY}/{PROJECT_ID}/java:base": "//java:java_base_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java:base-nonroot": "//java:java_base_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java:base-debug": "//java:java_base_debug_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java:base-debug-nonroot": "//java:java_base_debug_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java:latest": "//java:java11_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java:nonroot": "//java:java11_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java:debug": "//java:java11_debug_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java:debug-nonroot": "//java:java11_debug_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java:11": "//java:java11_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java:11-nonroot": "//java:java11_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java:11-debug": "//java:java11_debug_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java:11-debug-nonroot": "//java:java11_debug_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:base": "//java:java_base_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:base-nonroot": "//java:java_base_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:base-debug": "//java:java_base_debug_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:base-debug-nonroot": "//java:java_base_debug_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:latest": "//java:java11_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:nonroot": "//java:java11_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:11": "//java:java11_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:11-nonroot": "//java:java11_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:debug": "//java:java11_debug_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:debug-nonroot": "//java:java11_debug_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:11-debug": "//java:java11_debug_root_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10:11-debug-nonroot": "//java:java11_debug_nonroot_debian10", + "{REGISTRY}/{PROJECT_ID}/java/jetty:latest": "//java/jetty:jetty_java11_debian10", + "{REGISTRY}/{PROJECT_ID}/java/jetty:debug": "//java/jetty:jetty_java11_debug_debian10", + "{REGISTRY}/{PROJECT_ID}/java/jetty:java11": "//java/jetty:jetty_java11_debian10", + "{REGISTRY}/{PROJECT_ID}/java/jetty:java11-debug": "//java/jetty:jetty_java11_debug_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10/jetty:latest": "//java/jetty:jetty_java11_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10/jetty:java11": "//java/jetty:jetty_java11_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10/jetty:debug": "//java/jetty:jetty_java11_debug_debian10", + "{REGISTRY}/{PROJECT_ID}/java-debian10/jetty:java11-debug": "//java/jetty:jetty_java11_debug_debian10", } ALL = {} diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 66ea75afc..89ad74b3f 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -9,6 +9,7 @@ steps: env: - PROJECT_ID=${PROJECT_ID} - COMMIT_SHA=${COMMIT_SHA} + - REGISTRY=gcr.io entrypoint: sh args: - -c @@ -45,6 +46,7 @@ steps: env: - PROJECT_ID=${PROJECT_ID} - COMMIT_SHA=${COMMIT_SHA} + - REGISTRY=gcr.io entrypoint: ./cloudbuild_docker.sh - name: ubuntu @@ -54,6 +56,7 @@ steps: env: - PROJECT_ID=${PROJECT_ID} - COMMIT_SHA=${COMMIT_SHA} + - REGISTRY=gcr.io entrypoint: sh args: - ./cloudbuild_cosign.sh diff --git a/hack/print-workspace-status.sh b/hack/print-workspace-status.sh index 6a6060652..c69bebfa8 100755 --- a/hack/print-workspace-status.sh +++ b/hack/print-workspace-status.sh @@ -16,4 +16,5 @@ fi cat <