diff --git a/ic-os/defs.bzl b/ic-os/defs.bzl index 4ba8a8a53d1..4b3971d55ea 100644 --- a/ic-os/defs.bzl +++ b/ic-os/defs.bzl @@ -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. @@ -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 """ @@ -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( diff --git a/ic-os/guestos/defs.bzl b/ic-os/guestos/defs.bzl index a8d8fbfb275..8a5c3f2b2b1 100644 --- a/ic-os/guestos/defs.bzl +++ b/ic-os/guestos/defs.bzl @@ -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, @@ -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, {})) diff --git a/ic-os/guestos/envs/local-base-dev/BUILD.bazel b/ic-os/guestos/envs/local-base-dev/BUILD.bazel deleted file mode 100644 index bd312d282cb..00000000000 --- a/ic-os/guestos/envs/local-base-dev/BUILD.bazel +++ /dev/null @@ -1,16 +0,0 @@ -load("//ic-os:defs.bzl", "icos_build") -load("//ic-os/guestos:defs.bzl", "image_deps") - -# The macro contains several targets. -# Check -# //ic-os/guestos/BUILD.bazel for examples -# or //ic-os/defs.bzl for the full list of targets. -icos_build( - name = "local-base-dev", - build_local_base_image = True, - ic_version = "//bazel:rc_only_version.txt", - image_deps_func = image_deps, - tags = ["manual"], - upload_prefix = None, # Do not upload locally built base images - visibility = ["//visibility:public"], -) diff --git a/ic-os/guestos/envs/local-base-prod/BUILD.bazel b/ic-os/guestos/envs/local-base-prod/BUILD.bazel deleted file mode 100644 index 5cd3ae08f07..00000000000 --- a/ic-os/guestos/envs/local-base-prod/BUILD.bazel +++ /dev/null @@ -1,15 +0,0 @@ -load("//ic-os:defs.bzl", "icos_build") -load("//ic-os/guestos:defs.bzl", "image_deps") - -# The macro contains several targets. -# Check -# //ic-os/guestos/BUILD.bazel for examples -# or //ic-os/defs.bzl for the full list of targets. -icos_build( - name = "local-base-prod", - build_local_base_image = True, - image_deps_func = image_deps, - tags = ["manual"], - upload_prefix = None, # Do not upload locally built base images - visibility = ["//visibility:public"], -) diff --git a/ic-os/hostos/defs.bzl b/ic-os/hostos/defs.bzl index 2e4551e622d..d69ddc703d4 100644 --- a/ic-os/hostos/defs.bzl +++ b/ic-os/hostos/defs.bzl @@ -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, diff --git a/ic-os/hostos/envs/local-base-dev/BUILD.bazel b/ic-os/hostos/envs/local-base-dev/BUILD.bazel deleted file mode 100644 index 5e8ea3188f2..00000000000 --- a/ic-os/hostos/envs/local-base-dev/BUILD.bazel +++ /dev/null @@ -1,17 +0,0 @@ -load("//ic-os:defs.bzl", "icos_build") -load("//ic-os/hostos:defs.bzl", "image_deps") - -# The macro contains several targets. -# Check -# //ic-os/hostos/BUILD.bazel for examples -# or //ic-os/defs.bzl for the full list of targets. -icos_build( - name = "local-base-dev", - build_local_base_image = True, - ic_version = "//bazel:rc_only_version.txt", - image_deps_func = image_deps, - tags = ["manual"], - upload_prefix = None, # Do not upload locally built base images - visibility = ["//visibility:public"], - vuln_scan = False, -) diff --git a/ic-os/hostos/envs/local-base-prod/BUILD.bazel b/ic-os/hostos/envs/local-base-prod/BUILD.bazel deleted file mode 100644 index f1904cc31eb..00000000000 --- a/ic-os/hostos/envs/local-base-prod/BUILD.bazel +++ /dev/null @@ -1,16 +0,0 @@ -load("//ic-os:defs.bzl", "icos_build") -load("//ic-os/hostos:defs.bzl", "image_deps") - -# The macro contains several targets. -# Check -# //ic-os/hostos/BUILD.bazel for examples -# or //ic-os/defs.bzl for the full list of targets. -icos_build( - name = "local-base-prod", - build_local_base_image = True, - image_deps_func = image_deps, - tags = ["manual"], - upload_prefix = None, # Do not upload locally built base images - visibility = ["//visibility:public"], - vuln_scan = False, -) diff --git a/ic-os/setupos/defs.bzl b/ic-os/setupos/defs.bzl index 2081c76833f..5f864c3ad49 100644 --- a/ic-os/setupos/defs.bzl +++ b/ic-os/setupos/defs.bzl @@ -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, @@ -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") diff --git a/ic-os/setupos/envs/local-base-dev/BUILD.bazel b/ic-os/setupos/envs/local-base-dev/BUILD.bazel deleted file mode 100644 index 32ccc91e125..00000000000 --- a/ic-os/setupos/envs/local-base-dev/BUILD.bazel +++ /dev/null @@ -1,24 +0,0 @@ -load("//ic-os:defs.bzl", "icos_build") -load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") -load("//ic-os/setupos:defs.bzl", "image_deps") - -# The macro contains several targets. -# Check -# //ic-os/setupos/BUILD.bazel for examples -# or //ic-os/defs.bzl for the full list of targets. -icos_build( - name = "local-base-dev", - build_local_base_image = True, - ic_version = "//bazel:rc_only_version.txt", - image_deps_func = image_deps, - tags = ["manual"], - upgrades = False, - upload_prefix = None, # Do not upload locally built base images - visibility = ["//visibility:public"], - vuln_scan = False, -) - -launch_bare_metal( - name = "launch_bare_metal", - image_zst_file = ":disk-img.tar.zst", -) diff --git a/ic-os/setupos/envs/local-base-prod/BUILD.bazel b/ic-os/setupos/envs/local-base-prod/BUILD.bazel deleted file mode 100644 index 3b564fe8583..00000000000 --- a/ic-os/setupos/envs/local-base-prod/BUILD.bazel +++ /dev/null @@ -1,22 +0,0 @@ -load("//ic-os:defs.bzl", "icos_build") -load("//ic-os/dev-tools/bare_metal_deployment:tools.bzl", "launch_bare_metal") -load("//ic-os/setupos:defs.bzl", "image_deps") - -# The macro contains several targets. -# Check -# //ic-os/setupos/BUILD.bazel for examples -# or //ic-os/defs.bzl for the full list of targets. -icos_build( - name = "local-base-prod", - build_local_base_image = True, - image_deps_func = image_deps, - tags = ["manual"], - upgrades = False, - upload_prefix = None, # Do not upload locally built base images - vuln_scan = False, -) - -launch_bare_metal( - name = "launch_bare_metal", - image_zst_file = ":disk-img.tar.zst", -)