Merge pull request #1896 from GoogleContainerTools/rework_build_1

Rework build into reusable pieces

Author: loosebazooka

.github/workflows/image-check.yaml

@@ -69,6 +69,12 @@ jobs:
             ./verbose.log
             ./report.log
 
+      - name: Write diff to job output for forks
+        if: ${{ github.event.pull_request.head.repo.fork && steps.diff.outputs.changed_targets }}
+        run: |
+          echo "This pull request has modified the following images:"
+          echo ${{ steps.diff.outputs.changed_targets }}
+
       - uses: peter-evans/find-comment@v4
         id: fc
         if: ${{ !github.event.pull_request.head.repo.fork }}

BUILD

@@ -1,5 +1,5 @@
 load("//:checksums.bzl", "ARCHITECTURES", "BASE_ARCHITECTURES")
-load("//base:distro.bzl", "DISTROS", "PREVIEW_DISTROS")
+load("//:distro.bzl", "DISTROS", "PREVIEW_DISTROS")
 load("//private/oci:defs.bzl", "sign_and_push_all")
 load("//nodejs:node_arch.bzl", "node_arch")
 
@@ -16,27 +16,27 @@ STATIC_VARIANTS = [
 ]
 
 STATIC = {
-    "{REGISTRY}/{PROJECT_ID}/static:" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_" + DEFAULT_DISTRO
+    "{REGISTRY}/{PROJECT_ID}/static:" + tag_base + "-" + arch: "//static:" + label + "_" + user + "_" + arch + "_" + DEFAULT_DISTRO
     for arch in ARCHITECTURES
     for (tag_base, label, user) in STATIC_VARIANTS
 }
 
 # oci_image_index
 STATIC |= {
-    "{REGISTRY}/{PROJECT_ID}/static:" + tag_base: "//base:" + label + "_" + user + "_" + DEFAULT_DISTRO
+    "{REGISTRY}/{PROJECT_ID}/static:" + tag_base: "//static:" + label + "_" + user + "_" + DEFAULT_DISTRO
     for (tag_base, label, user) in STATIC_VARIANTS
 }
 
 STATIC |= {
-    "{REGISTRY}/{PROJECT_ID}/static-" + distro + ":" + tag_base + "-" + arch: "//base:" + label + "_" + user + "_" + arch + "_" + distro
+    "{REGISTRY}/{PROJECT_ID}/static-" + distro + ":" + tag_base + "-" + arch: "//static:" + label + "_" + user + "_" + arch + "_" + distro
     for arch in ARCHITECTURES
     for (tag_base, label, user) in STATIC_VARIANTS
     for distro in DISTROS + PREVIEW_DISTROS
 }
 
 # oci_image_index
 STATIC |= {
-    "{REGISTRY}/{PROJECT_ID}/static-" + distro + ":" + tag_base: "//base:" + label + "_" + user + "_" + distro
+    "{REGISTRY}/{PROJECT_ID}/static-" + distro + ":" + tag_base: "//static:" + label + "_" + user + "_" + distro
     for (tag_base, label, user) in STATIC_VARIANTS
     for distro in DISTROS + PREVIEW_DISTROS
 }
@@ -45,8 +45,8 @@ STATIC |= {
 BASE_VARIANTS = [
     ("latest", "base", "root"),
     ("nonroot", "base", "nonroot"),
-    ("debug", "debug", "root"),
-    ("debug-nonroot", "debug", "nonroot"),
+    ("debug", "base_debug", "root"),
+    ("debug-nonroot", "base_debug", "nonroot"),
 ]
 
 BASE = {
@@ -113,8 +113,8 @@ BASE_NOSSL |= {
 CC_VARIANTS = [
     ("latest", "cc", "root"),
     ("nonroot", "cc", "nonroot"),
-    ("debug", "debug", "root"),
-    ("debug-nonroot", "debug", "nonroot"),
+    ("debug", "cc_debug", "root"),
+    ("debug-nonroot", "cc_debug", "nonroot"),
 ]
 
 CC = {

base/BUILD

@@ -1,9 +1,46 @@
-load(":base.bzl", "base_images")
-load(":distro.bzl", "DISTROS", "PREVIEW_DISTROS")
+load(":base.bzl", "base_image", "base_image_index", "base_nossl_image", "base_nossl_image_index")
+load("//:distro.bzl", "DISTROS", "PREVIEW_DISTROS")
+load("//:checksums.bzl", "ARCHITECTURES")
 
 package(default_visibility = ["//visibility:public"])
 
+BASE_DISTROS = DISTROS + PREVIEW_DISTROS
+
+BASE_ARCHITECTURES = ARCHITECTURES
+
+# base nossl
+[
+    base_nossl_image(
+        arch = arch,
+        distro = distro,
+    )
+    for distro in BASE_DISTROS
+    for arch in BASE_ARCHITECTURES
+]
+
+[
+    base_nossl_image_index(
+        architectures = BASE_ARCHITECTURES,
+        distro = distro,
+    )
+    for distro in BASE_DISTROS
+]
+
+# base (with libssl)
+
+[
+    base_image(
+        arch = arch,
+        distro = distro,
+    )
+    for distro in BASE_DISTROS
+    for arch in BASE_ARCHITECTURES
+]
+
 [
-    base_images(distro = distro)
-    for distro in DISTROS + PREVIEW_DISTROS
+    base_image_index(
+        architectures = BASE_ARCHITECTURES,
+        distro = distro,
+    )
+    for distro in BASE_DISTROS
 ]