Skip to content
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

feat: Always build base image from scratch #1600

Draft
wants to merge 1 commit into
base: eero/bye-bye-baseimage-1
Choose a base branch
from
Draft

feat: Always build base image from scratch #1600

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
68 changes: 28 additions & 40 deletions ic-os/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ def icos_build(
vuln_scan = True,
visibility = None,
tags = None,
build_local_base_image = False,
ic_version = "//bazel:version.txt"):
"""
Generic ICOS build tooling.
Expand All @@ -35,7 +34,6 @@ def icos_build(
vuln_scan: if True, create targets for vulnerability scanning
visibility: See Bazel documentation
tags: See Bazel documentation
build_local_base_image: if True, build the base images from scratch. Do not download the docker.io base image.
ic_version: the label pointing to the target that returns IC version
"""

Expand Down Expand Up @@ -70,45 +68,35 @@ def icos_build(

# -------------------- Build the container image --------------------

if build_local_base_image:
base_image_tag = "base-image-" + name # Reuse for build_container_filesystem_tar
package_files_arg = "PACKAGE_FILES=packages.common"
if "dev" in mode:
package_files_arg += " packages.dev"

build_container_base_image(
name = "base_image.tar",
context_files = [image_deps["container_context_files"]],
image_tag = base_image_tag,
dockerfile = image_deps["base_dockerfile"],
build_args = [package_files_arg],
target_compatible_with = ["@platforms//os:linux"],
tags = ["manual"],
)
# Reused in rootfs-tree.tar
base_image_tag = "base-image-" + name

build_container_filesystem(
name = "rootfs-tree.tar",
context_files = [image_deps["container_context_files"]],
component_files = image_deps["component_files"],
dockerfile = image_deps["dockerfile"],
build_args = image_deps["build_args"],
file_build_arg = image_deps["file_build_arg"],
base_image_tar_file = ":base_image.tar",
base_image_tar_file_tag = base_image_tag,
target_compatible_with = ["@platforms//os:linux"],
tags = ["manual"],
)
else:
build_container_filesystem(
name = "rootfs-tree.tar",
context_files = [image_deps["container_context_files"]],
component_files = image_deps["component_files"],
dockerfile = image_deps["dockerfile"],
build_args = image_deps["build_args"],
file_build_arg = image_deps["file_build_arg"],
target_compatible_with = ["@platforms//os:linux"],
tags = ["manual"],
)
package_files_arg = "PACKAGE_FILES=packages.common"
if "dev" in mode:
package_files_arg += " packages.dev"

build_container_base_image(
name = "base_image.tar",
context_files = [image_deps["container_context_files"]],
image_tag = base_image_tag,
dockerfile = image_deps["base_dockerfile"],
build_args = [package_files_arg],
target_compatible_with = ["@platforms//os:linux"],
tags = ["manual"],
)

build_container_filesystem(
name = "rootfs-tree.tar",
context_files = [image_deps["container_context_files"]],
component_files = image_deps["component_files"],
dockerfile = image_deps["dockerfile"],
build_args = image_deps["build_args"],
file_build_arg = image_deps["file_build_arg"],
base_image_tar_file = ":base_image.tar",
base_image_tar_file_tag = base_image_tag,
target_compatible_with = ["@platforms//os:linux"],
tags = ["manual"],
)

# Extract SElinux file_contexts to use later when building ext4 filesystems
tar_extract(
Expand Down
11 changes: 0 additions & 11 deletions ic-os/guestos/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,18 +81,10 @@ def image_deps(mode, malicious = False):
"build_args": dev_build_args,
"file_build_arg": dev_file_build_arg,
},
"local-base-dev": {
"build_args": dev_build_args,
"file_build_arg": dev_file_build_arg,
},
"dev-malicious": {
"build_args": dev_build_args,
"file_build_arg": dev_file_build_arg,
},
"local-base-prod": {
"build_args": prod_build_args,
"file_build_arg": prod_file_build_arg,
},
"prod": {
"build_args": prod_build_args,
"file_build_arg": prod_file_build_arg,
Expand All @@ -106,9 +98,6 @@ def image_deps(mode, malicious = False):
"dev": {
"//ic-os/guestos/context:allow_console_root": "/etc/allow_console_root:0644",
},
"local-base-dev": {
"//ic-os/guestos/context:allow_console_root": "/etc/allow_console_root:0644",
},
}

deps["rootfs"].update(extra_rootfs_deps.get(mode, {}))
Expand Down
16 changes: 0 additions & 16 deletions ic-os/guestos/envs/local-base-dev/BUILD.bazel
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions ic-os/guestos/envs/local-base-prod/BUILD.bazel
View file
Open in desktop

This file was deleted.

8 changes: 0 additions & 8 deletions ic-os/hostos/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,14 +61,6 @@ def image_deps(mode, _malicious = False):
"build_args": dev_build_args,
"file_build_arg": dev_file_build_arg,
},
"local-base-dev": {
"build_args": dev_build_args,
"file_build_arg": dev_file_build_arg,
},
"local-base-prod": {
"build_args": prod_build_args,
"file_build_arg": prod_file_build_arg,
},
"prod": {
"build_args": prod_build_args,
"file_build_arg": prod_file_build_arg,
Expand Down
17 changes: 0 additions & 17 deletions ic-os/hostos/envs/local-base-dev/BUILD.bazel
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ic-os/hostos/envs/local-base-prod/BUILD.bazel
View file
Open in desktop

This file was deleted.

16 changes: 0 additions & 16 deletions ic-os/setupos/defs.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,14 +56,6 @@ def image_deps(mode, _malicious = False):
"build_args": dev_build_args,
"file_build_arg": dev_file_build_arg,
},
"local-base-dev": {
"build_args": dev_build_args,
"file_build_arg": dev_file_build_arg,
},
"local-base-prod": {
"build_args": prod_build_args,
"file_build_arg": prod_file_build_arg,
},
"prod": {
"build_args": prod_build_args,
"file_build_arg": prod_file_build_arg,
Expand All @@ -81,14 +73,6 @@ def _custom_partitions(mode):
guest_image = Label("//ic-os/guestos/envs/dev:disk-img.tar.zst")
host_image = Label("//ic-os/hostos/envs/dev:disk-img.tar.zst")
nns_url = "https://dfinity.org"
elif mode == "local-base-dev":
guest_image = Label("//ic-os/guestos/envs/local-base-dev:disk-img.tar.zst")
host_image = Label("//ic-os/hostos/envs/local-base-dev:disk-img.tar.zst")
nns_url = "https://dfinity.org"
elif mode == "local-base-prod":
guest_image = Label("//ic-os/guestos/envs/local-base-prod:disk-img.tar.zst")
host_image = Label("//ic-os/hostos/envs/local-base-prod:disk-img.tar.zst")
nns_url = "https://icp-api.io,https://icp0.io,https://ic0.app"
elif mode == "prod":
guest_image = Label("//ic-os/guestos/envs/prod:disk-img.tar.zst")
host_image = Label("//ic-os/hostos/envs/prod:disk-img.tar.zst")
Expand Down
24 changes: 0 additions & 24 deletions ic-os/setupos/envs/local-base-dev/BUILD.bazel
View file
Open in desktop

This file was deleted.

22 changes: 0 additions & 22 deletions ic-os/setupos/envs/local-base-prod/BUILD.bazel
View file
Open in desktop

This file was deleted.