Skip to content

Rework build into reusable pieces #1896

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
loosebazooka merged 1 commit into from
Oct 24, 2025
Merged

Rework build into reusable pieces #1896

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
6 changes: 6 additions & 0 deletions .github/workflows/image-check.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
18 changes: 9 additions & 9 deletions BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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")

Expand All @@ -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
}
Expand All @@ -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 = {
Expand Down Expand Up @@ -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 = {
Expand Down
45 changes: 41 additions & 4 deletions base/BUILD
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
]
Loading
Loading