From cd048c5aae3a180135b94ea3b84f153ba13f1463 Mon Sep 17 00:00:00 2001 From: Eero Kelly Date: Fri, 26 Apr 2024 18:01:55 +0000 Subject: [PATCH] [NODE-1356] Rename context directory --- gitlab-ci/config/base-images-build.yml | 48 ++-- gitlab-ci/config/zz-generated-gitlab-ci.yaml | 228 +++++++++--------- ...trivy_container_ic_scanner_periodic_job.py | 4 +- ic-os/README.adoc | 8 +- .../{rootfs => context}/BUILD.bazel | 0 .../{rootfs => context}/Dockerfile | 4 +- .../{rootfs => context}/Dockerfile.base | 0 .../{rootfs => context}/README.adoc | 0 .../{rootfs => context}/docker-base.prod | 0 ic-os/boundary-guestos/docs/Build.adoc | 2 +- ic-os/defs.bzl | 2 +- ic-os/docs/Services.adoc | 6 +- ic-os/guestos/{rootfs => context}/BUILD.bazel | 0 ic-os/guestos/{rootfs => context}/Dockerfile | 0 .../{rootfs => context}/Dockerfile.base | 0 ic-os/guestos/{rootfs => context}/README.adoc | 0 .../{rootfs => context}/allow_console_root | 0 .../{rootfs => context}/docker-base.dev | 0 .../{rootfs => context}/docker-base.prod | 0 .../extra_boot_args.template | 0 .../{rootfs => context}/packages.common | 0 .../guestos/{rootfs => context}/packages.dev | 0 ic-os/guestos/defs.bzl | 10 +- ic-os/guestos/docs/Build.adoc | 2 +- ic-os/hostos/{rootfs => context}/BUILD.bazel | 0 ic-os/hostos/{rootfs => context}/Dockerfile | 4 +- .../{rootfs => context}/Dockerfile.base | 0 ic-os/hostos/{rootfs => context}/README.adoc | 0 .../{rootfs => context}/docker-base.dev | 0 .../{rootfs => context}/docker-base.prod | 0 .../{rootfs => context}/extra_boot_args | 0 .../{rootfs => context}/packages.common | 0 ic-os/hostos/{rootfs => context}/packages.dev | 0 ic-os/hostos/defs.bzl | 6 +- ic-os/rootfs/guestos/dev-certs/README.md | 2 +- ic-os/setupos/{rootfs => context}/BUILD.bazel | 0 ic-os/setupos/{rootfs => context}/Dockerfile | 2 +- .../{rootfs => context}/Dockerfile.base | 0 ic-os/setupos/{rootfs => context}/README.adoc | 0 .../{rootfs => context}/docker-base.dev | 0 .../{rootfs => context}/docker-base.prod | 0 .../{rootfs => context}/extra_boot_args | 0 .../{rootfs => context}/packages.common | 0 .../setupos/{rootfs => context}/packages.dev | 0 ic-os/setupos/defs.bzl | 6 +- 45 files changed, 167 insertions(+), 167 deletions(-) rename ic-os/boundary-guestos/{rootfs => context}/BUILD.bazel (100%) rename ic-os/boundary-guestos/{rootfs => context}/Dockerfile (98%) rename ic-os/boundary-guestos/{rootfs => context}/Dockerfile.base (100%) rename ic-os/boundary-guestos/{rootfs => context}/README.adoc (100%) rename ic-os/boundary-guestos/{rootfs => context}/docker-base.prod (100%) rename ic-os/guestos/{rootfs => context}/BUILD.bazel (100%) rename ic-os/guestos/{rootfs => context}/Dockerfile (100%) rename ic-os/guestos/{rootfs => context}/Dockerfile.base (100%) rename ic-os/guestos/{rootfs => context}/README.adoc (100%) rename ic-os/guestos/{rootfs => context}/allow_console_root (100%) rename ic-os/guestos/{rootfs => context}/docker-base.dev (100%) rename ic-os/guestos/{rootfs => context}/docker-base.prod (100%) rename ic-os/guestos/{rootfs => context}/extra_boot_args.template (100%) rename ic-os/guestos/{rootfs => context}/packages.common (100%) rename ic-os/guestos/{rootfs => context}/packages.dev (100%) rename ic-os/hostos/{rootfs => context}/BUILD.bazel (100%) rename ic-os/hostos/{rootfs => context}/Dockerfile (98%) rename ic-os/hostos/{rootfs => context}/Dockerfile.base (100%) rename ic-os/hostos/{rootfs => context}/README.adoc (100%) rename ic-os/hostos/{rootfs => context}/docker-base.dev (100%) rename ic-os/hostos/{rootfs => context}/docker-base.prod (100%) rename ic-os/hostos/{rootfs => context}/extra_boot_args (100%) rename ic-os/hostos/{rootfs => context}/packages.common (100%) rename ic-os/hostos/{rootfs => context}/packages.dev (100%) rename ic-os/setupos/{rootfs => context}/BUILD.bazel (100%) rename ic-os/setupos/{rootfs => context}/Dockerfile (98%) rename ic-os/setupos/{rootfs => context}/Dockerfile.base (100%) rename ic-os/setupos/{rootfs => context}/README.adoc (100%) rename ic-os/setupos/{rootfs => context}/docker-base.dev (100%) rename ic-os/setupos/{rootfs => context}/docker-base.prod (100%) rename ic-os/setupos/{rootfs => context}/extra_boot_args (100%) rename ic-os/setupos/{rootfs => context}/packages.common (100%) rename ic-os/setupos/{rootfs => context}/packages.dev (100%) diff --git a/gitlab-ci/config/base-images-build.yml b/gitlab-ci/config/base-images-build.yml index 6f53f5edef4..0cad02cae6e 100644 --- a/gitlab-ci/config/base-images-build.yml +++ b/gitlab-ci/config/base-images-build.yml @@ -7,16 +7,16 @@ - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev .build-base-image: &build-base-image | set -euo pipefail @@ -50,17 +50,17 @@ build-guestos-base: extends: - .build-base-image-job variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/guestos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/guestos/context" IMAGE: "guestos-base" - REF_FILE: "ic-os/guestos/rootfs/docker-base.prod" + REF_FILE: "ic-os/guestos/context/docker-base.prod" build-guestos-base-dev: extends: - .build-base-image-job variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/guestos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/guestos/context" IMAGE: "guestos-base-dev" - REF_FILE: "ic-os/guestos/rootfs/docker-base.dev" + REF_FILE: "ic-os/guestos/context/docker-base.dev" script: - BUILD_ARGS=(--build-arg "PACKAGE_FILES=packages.common packages.dev") - *build-base-image @@ -69,25 +69,25 @@ build-boundaryos-base: extends: - .build-base-image-job variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/boundary-guestos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/boundary-guestos/context" IMAGE: "boundaryos-base" - REF_FILE: "ic-os/boundary-guestos/rootfs/docker-base.prod" + REF_FILE: "ic-os/boundary-guestos/context/docker-base.prod" build-hostos-base: extends: - .build-base-image-job variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/hostos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/hostos/context" IMAGE: "hostos-base" - REF_FILE: "ic-os/hostos/rootfs/docker-base.prod" + REF_FILE: "ic-os/hostos/context/docker-base.prod" build-hostos-base-dev: extends: - .build-base-image-job variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/hostos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/hostos/context" IMAGE: "hostos-base-dev" - REF_FILE: "ic-os/hostos/rootfs/docker-base.dev" + REF_FILE: "ic-os/hostos/context/docker-base.dev" script: - BUILD_ARGS=(--build-arg "PACKAGE_FILES=packages.common packages.dev") - *build-base-image @@ -96,17 +96,17 @@ build-setupos-base: extends: - .build-base-image-job variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/setupos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/setupos/context" IMAGE: "setupos-base" - REF_FILE: "ic-os/setupos/rootfs/docker-base.prod" + REF_FILE: "ic-os/setupos/context/docker-base.prod" build-setupos-base-dev: extends: - .build-base-image-job variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/setupos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/setupos/context" IMAGE: "setupos-base-dev" - REF_FILE: "ic-os/setupos/rootfs/docker-base.dev" + REF_FILE: "ic-os/setupos/context/docker-base.dev" script: - BUILD_ARGS=(--build-arg "PACKAGE_FILES=packages.common packages.dev") - *build-base-image diff --git a/gitlab-ci/config/zz-generated-gitlab-ci.yaml b/gitlab-ci/config/zz-generated-gitlab-ci.yaml index be745ed0b04..b9981a68df2 100644 --- a/gitlab-ci/config/zz-generated-gitlab-ci.yaml +++ b/gitlab-ci/config/zz-generated-gitlab-ci.yaml @@ -93,16 +93,16 @@ when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - | @@ -140,16 +140,16 @@ when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" ".rules-master-pipeline-and-merge-request": rules: @@ -1414,16 +1414,16 @@ build-base-images-ref-update: when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - | @@ -1472,16 +1472,16 @@ build-boundaryos-base: when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - | @@ -1502,9 +1502,9 @@ build-boundaryos-base: rm -f digestfile fi variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/boundary-guestos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/boundary-guestos/context" IMAGE: boundaryos-base - REF_FILE: ic-os/boundary-guestos/rootfs/docker-base.prod + REF_FILE: ic-os/boundary-guestos/context/docker-base.prod build-determinism: extends: - ".rules-master-pipeline-no-merge-train" @@ -1551,16 +1551,16 @@ build-guestos-base: when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - | @@ -1581,9 +1581,9 @@ build-guestos-base: rm -f digestfile fi variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/guestos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/guestos/context" IMAGE: guestos-base - REF_FILE: ic-os/guestos/rootfs/docker-base.prod + REF_FILE: ic-os/guestos/context/docker-base.prod build-guestos-base-dev: artifacts: paths: @@ -1598,16 +1598,16 @@ build-guestos-base-dev: when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - BUILD_ARGS=(--build-arg "PACKAGE_FILES=packages.common packages.dev") @@ -1629,9 +1629,9 @@ build-guestos-base-dev: rm -f digestfile fi variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/guestos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/guestos/context" IMAGE: guestos-base-dev - REF_FILE: ic-os/guestos/rootfs/docker-base.dev + REF_FILE: ic-os/guestos/context/docker-base.dev build-hostos-base: artifacts: paths: @@ -1646,16 +1646,16 @@ build-hostos-base: when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - | @@ -1676,9 +1676,9 @@ build-hostos-base: rm -f digestfile fi variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/hostos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/hostos/context" IMAGE: hostos-base - REF_FILE: ic-os/hostos/rootfs/docker-base.prod + REF_FILE: ic-os/hostos/context/docker-base.prod build-hostos-base-dev: artifacts: paths: @@ -1693,16 +1693,16 @@ build-hostos-base-dev: when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - BUILD_ARGS=(--build-arg "PACKAGE_FILES=packages.common packages.dev") @@ -1724,9 +1724,9 @@ build-hostos-base-dev: rm -f digestfile fi variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/hostos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/hostos/context" IMAGE: hostos-base-dev - REF_FILE: ic-os/hostos/rootfs/docker-base.dev + REF_FILE: ic-os/hostos/context/docker-base.dev build-ic: artifacts: paths: @@ -1762,16 +1762,16 @@ build-setupos-base: when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - | @@ -1792,9 +1792,9 @@ build-setupos-base: rm -f digestfile fi variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/setupos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/setupos/context" IMAGE: setupos-base - REF_FILE: ic-os/setupos/rootfs/docker-base.prod + REF_FILE: ic-os/setupos/context/docker-base.prod build-setupos-base-dev: artifacts: paths: @@ -1809,16 +1809,16 @@ build-setupos-base-dev: when: manual - changes: - gitlab-ci/config/base-images-build.yml - - ic-os/boundary-guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/Dockerfile.base - - ic-os/guestos/rootfs/packages.common - - ic-os/guestos/rootfs/packages.dev - - ic-os/hostos/rootfs/Dockerfile.base - - ic-os/hostos/rootfs/packages.common - - ic-os/hostos/rootfs/packages.dev - - ic-os/setupos/rootfs/Dockerfile.base - - ic-os/setupos/rootfs/packages.common - - ic-os/setupos/rootfs/packages.dev + - ic-os/boundary-guestos/context/Dockerfile.base + - ic-os/guestos/context/Dockerfile.base + - ic-os/guestos/context/packages.common + - ic-os/guestos/context/packages.dev + - ic-os/hostos/context/Dockerfile.base + - ic-os/hostos/context/packages.common + - ic-os/hostos/context/packages.dev + - ic-os/setupos/context/Dockerfile.base + - ic-os/setupos/context/packages.common + - ic-os/setupos/context/packages.dev if: $CI_PIPELINE_SOURCE == "merge_request_event" script: - BUILD_ARGS=(--build-arg "PACKAGE_FILES=packages.common packages.dev") @@ -1840,9 +1840,9 @@ build-setupos-base-dev: rm -f digestfile fi variables: - CONTEXT: "${CI_PROJECT_DIR}/ic-os/setupos/rootfs" + CONTEXT: "${CI_PROJECT_DIR}/ic-os/setupos/context" IMAGE: setupos-base-dev - REF_FILE: ic-os/setupos/rootfs/docker-base.dev + REF_FILE: ic-os/setupos/context/docker-base.dev cargo-build-release-linux: extends: - ".rules-master-pipeline-and-merge-request-rust-changed" diff --git a/gitlab-ci/src/dependencies/job/bazel_trivy_container_ic_scanner_periodic_job.py b/gitlab-ci/src/dependencies/job/bazel_trivy_container_ic_scanner_periodic_job.py index 9a25bb3cc18..f1eccd85140 100644 --- a/gitlab-ci/src/dependencies/job/bazel_trivy_container_ic_scanner_periodic_job.py +++ b/gitlab-ci/src/dependencies/job/bazel_trivy_container_ic_scanner_periodic_job.py @@ -20,13 +20,13 @@ Project( name="boundary-guestos", path="ic/ic-os/boundary-guestos/envs/prod", - link="https://gitlab.com/dfinity-lab/public/ic/-/tree/master/ic-os/boundary-guestos/rootfs", + link="https://gitlab.com/dfinity-lab/public/ic/-/tree/master/ic-os/boundary-guestos/context", owner=Team.BOUNDARY_NODE_TEAM, ), Project( name="guestos", path="ic/ic-os/guestos/envs/prod", - link="https://gitlab.com/dfinity-lab/public/ic/-/tree/master/ic-os/guestos/rootfs", + link="https://gitlab.com/dfinity-lab/public/ic/-/tree/master/ic-os/guestos/context", owner=Team.NODE_TEAM, ), ], diff --git a/ic-os/README.adoc b/ic-os/README.adoc index 6edb36aa170..b97c53b8605 100644 --- a/ic-os/README.adoc +++ b/ic-os/README.adoc @@ -63,14 +63,14 @@ The docker build process is split into two dockerfiles. This split is necessary *Dockerfile.base* - ic/ic-os/{setupos,hostos,guestos,boundary-guestos}/rootfs/Dockerfile.base + ic/ic-os/{setupos,hostos,guestos,boundary-guestos}/context/Dockerfile.base ** The Dockerfile.base takes care of installing all upstream Ubuntu packages. ** Because the versions of these packages can change at any given time (as updates are published regularly), in order to maintain build determinism, once a week, the CI pipeline builds a new base image for each OS. The result is published on the DFINITY public https://hub.docker.com/u/dfinity[Docker Hub]. *Dockerfile* - ic/ic-os/{setupos,hostos,guestos,boundary-guestos}/rootfs/Dockerfile + ic/ic-os/{setupos,hostos,guestos,boundary-guestos}/context/Dockerfile ** The +Dockerfile+ builds off the published base image and takes care of configuring and assembling the main disk-image. ** Any instruction in this file needs to be reproducible in itself. @@ -86,9 +86,9 @@ This means that some development and testing could be done on the docker image i To add a new package to an IC-OS image you need to: - * Update the list of packages to install in `ic/ic-os/{setupos,hostos,guestos,boundary-guestos}/rootfs/packages.common` + * Update the list of packages to install in `ic/ic-os/{setupos,hostos,guestos,boundary-guestos}/context/packages.common` ** Commit the changes and wait for CI to publish the base image - * Update the base image hash in `ic/ic-os/{setupos,hostos,guestos,boundary-guestos}/rootfs/docker-base.` + * Update the base image hash in `ic/ic-os/{setupos,hostos,guestos,boundary-guestos}/context/docker-base.` == IC-OS Directory Organization diff --git a/ic-os/boundary-guestos/rootfs/BUILD.bazel b/ic-os/boundary-guestos/context/BUILD.bazel similarity index 100% rename from ic-os/boundary-guestos/rootfs/BUILD.bazel rename to ic-os/boundary-guestos/context/BUILD.bazel diff --git a/ic-os/boundary-guestos/rootfs/Dockerfile b/ic-os/boundary-guestos/context/Dockerfile similarity index 98% rename from ic-os/boundary-guestos/rootfs/Dockerfile rename to ic-os/boundary-guestos/context/Dockerfile index f18a2f375f8..7ed259e97ea 100644 --- a/ic-os/boundary-guestos/rootfs/Dockerfile +++ b/ic-os/boundary-guestos/context/Dockerfile @@ -58,7 +58,7 @@ RUN mkdir -p /boot/config \ COPY etc /etc # Change permissions on special files as they are copied. -# See ic-os/guestos/rootfs/Dockerfile for details +# See ic-os/boundary-guestos/context/Dockerfile for details COPY --chmod=644 etc/hosts /etc/hosts COPY --chmod=644 etc/hostname /etc/hostname COPY --chmod=644 etc/resolv.conf /etc/resolv.conf @@ -119,7 +119,7 @@ RUN for SERVICE in /etc/systemd/system/*; do \ # Add user/group entries specified here: /usr/lib/sysusers.d/systemd.conf # E.g., systemd-timesync/coredump RUN systemd-sysusers && \ - # Fix reproducibility issue. Notes in guestos/rootfs/Dockerfile + # Fix reproducibility issue. Notes in boundary-guestos/context/Dockerfile usermod -p '!!' systemd-timesync && \ usermod -p '!!' systemd-coredump && \ # Set /bin/sh to point to /bin/bash instead of the default /bin/dash diff --git a/ic-os/boundary-guestos/rootfs/Dockerfile.base b/ic-os/boundary-guestos/context/Dockerfile.base similarity index 100% rename from ic-os/boundary-guestos/rootfs/Dockerfile.base rename to ic-os/boundary-guestos/context/Dockerfile.base diff --git a/ic-os/boundary-guestos/rootfs/README.adoc b/ic-os/boundary-guestos/context/README.adoc similarity index 100% rename from ic-os/boundary-guestos/rootfs/README.adoc rename to ic-os/boundary-guestos/context/README.adoc diff --git a/ic-os/boundary-guestos/rootfs/docker-base.prod b/ic-os/boundary-guestos/context/docker-base.prod similarity index 100% rename from ic-os/boundary-guestos/rootfs/docker-base.prod rename to ic-os/boundary-guestos/context/docker-base.prod diff --git a/ic-os/boundary-guestos/docs/Build.adoc b/ic-os/boundary-guestos/docs/Build.adoc index 24e2103f2f8..9f882102a74 100644 --- a/ic-os/boundary-guestos/docs/Build.adoc +++ b/ic-os/boundary-guestos/docs/Build.adoc @@ -28,7 +28,7 @@ See notes below on the individual build steps. == Constructing the system using docker -All build instructions are contained in `rootfs/Dockerfile`. +All build instructions are contained in `context/Dockerfile`. The following template directories are simply copied verbatim onto the target system: diff --git a/ic-os/defs.bzl b/ic-os/defs.bzl index a1f15a03e75..9e06fd0653c 100644 --- a/ic-os/defs.bzl +++ b/ic-os/defs.bzl @@ -638,7 +638,7 @@ def boundary_node_icos_build( build_container_filesystem( name = "rootfs-tree.tar", - context_files = ["//ic-os/boundary-guestos/rootfs:context-files"], + context_files = ["//ic-os/boundary-guestos/context:context-files"], rootfs_files = boundary_rootfs_files, config_file = build_container_filesystem_config_file, target_compatible_with = ["@platforms//os:linux"], diff --git a/ic-os/docs/Services.adoc b/ic-os/docs/Services.adoc index 9cffba3f67d..7b258ea65d5 100644 --- a/ic-os/docs/Services.adoc +++ b/ic-os/docs/Services.adoc @@ -3,16 +3,16 @@ == Packages We use Focal (20.04) package repositories for our Ubuntu packages. -To see the full list of packages included in each IC-OS, refer to the rootfs/packages.common file in each respective OS. +To see the full list of packages included in each IC-OS, refer to the context/packages.common file in each respective OS. == Services -In addition to the regular, built-in Ubuntu services, a unique set of systemd services are added or managed for each IC-OS. Some services are enabled in rootfs/Dockerfile, and custom services are defined at rootfs/etc/systemd/services. +In addition to the regular, built-in Ubuntu services, a unique set of systemd services are added or managed for each IC-OS. Some services are enabled in context/Dockerfile, and custom services are defined at rootfs/etc/systemd/services. The specific systemd services for each IC-OS are as follows: [NOTE] -These lists may be out-of-date. For the source of truth, see each OSes `rootfs/Dockerfile` and `rootfs/etc/systemd`. +These lists may be out-of-date. For the source of truth, see each OSes `context/Dockerfile` and `rootfs/etc/systemd`. === SetupOS diff --git a/ic-os/guestos/rootfs/BUILD.bazel b/ic-os/guestos/context/BUILD.bazel similarity index 100% rename from ic-os/guestos/rootfs/BUILD.bazel rename to ic-os/guestos/context/BUILD.bazel diff --git a/ic-os/guestos/rootfs/Dockerfile b/ic-os/guestos/context/Dockerfile similarity index 100% rename from ic-os/guestos/rootfs/Dockerfile rename to ic-os/guestos/context/Dockerfile diff --git a/ic-os/guestos/rootfs/Dockerfile.base b/ic-os/guestos/context/Dockerfile.base similarity index 100% rename from ic-os/guestos/rootfs/Dockerfile.base rename to ic-os/guestos/context/Dockerfile.base diff --git a/ic-os/guestos/rootfs/README.adoc b/ic-os/guestos/context/README.adoc similarity index 100% rename from ic-os/guestos/rootfs/README.adoc rename to ic-os/guestos/context/README.adoc diff --git a/ic-os/guestos/rootfs/allow_console_root b/ic-os/guestos/context/allow_console_root similarity index 100% rename from ic-os/guestos/rootfs/allow_console_root rename to ic-os/guestos/context/allow_console_root diff --git a/ic-os/guestos/rootfs/docker-base.dev b/ic-os/guestos/context/docker-base.dev similarity index 100% rename from ic-os/guestos/rootfs/docker-base.dev rename to ic-os/guestos/context/docker-base.dev diff --git a/ic-os/guestos/rootfs/docker-base.prod b/ic-os/guestos/context/docker-base.prod similarity index 100% rename from ic-os/guestos/rootfs/docker-base.prod rename to ic-os/guestos/context/docker-base.prod diff --git a/ic-os/guestos/rootfs/extra_boot_args.template b/ic-os/guestos/context/extra_boot_args.template similarity index 100% rename from ic-os/guestos/rootfs/extra_boot_args.template rename to ic-os/guestos/context/extra_boot_args.template diff --git a/ic-os/guestos/rootfs/packages.common b/ic-os/guestos/context/packages.common similarity index 100% rename from ic-os/guestos/rootfs/packages.common rename to ic-os/guestos/context/packages.common diff --git a/ic-os/guestos/rootfs/packages.dev b/ic-os/guestos/context/packages.dev similarity index 100% rename from ic-os/guestos/rootfs/packages.dev rename to ic-os/guestos/context/packages.dev diff --git a/ic-os/guestos/defs.bzl b/ic-os/guestos/defs.bzl index 3dcec85b98e..2f18d4496c8 100644 --- a/ic-os/guestos/defs.bzl +++ b/ic-os/guestos/defs.bzl @@ -21,7 +21,7 @@ def image_deps(mode, malicious = False): """ deps = { - "base_dockerfile": "//ic-os/guestos/rootfs:Dockerfile.base", + "base_dockerfile": "//ic-os/guestos/context:Dockerfile.base", # Extra files to be added to rootfs and bootfs "bootfs": {}, @@ -52,7 +52,7 @@ def image_deps(mode, malicious = False): }, # Set various configuration values - "container_context_files": Label("//ic-os/guestos/rootfs:context-files"), + "container_context_files": Label("//ic-os/guestos/context:context-files"), "rootfs_files": rootfs_files, "partition_table": Label("//ic-os/guestos:partitions.csv"), "expanded_size": "50G", @@ -67,7 +67,7 @@ def image_deps(mode, malicious = False): # substitution) as a dependency so that changes to the template file are # reflected in the overall version hash (the root_hash must include the # version hash, it cannot be the other way around). - "boot_args_template": Label("//ic-os/guestos/rootfs:extra_boot_args.template"), + "boot_args_template": Label("//ic-os/guestos/context:extra_boot_args.template"), } # Add extra files depending on image variant @@ -96,10 +96,10 @@ def image_deps(mode, malicious = False): # Add extra files depending on image variant extra_rootfs_deps = { "dev": { - "//ic-os/guestos/rootfs:allow_console_root": "/etc/allow_console_root:0644", + "//ic-os/guestos/context:allow_console_root": "/etc/allow_console_root:0644", }, "local-base-dev": { - "//ic-os/guestos/rootfs:allow_console_root": "/etc/allow_console_root:0644", + "//ic-os/guestos/context:allow_console_root": "/etc/allow_console_root:0644", }, } diff --git a/ic-os/guestos/docs/Build.adoc b/ic-os/guestos/docs/Build.adoc index bca700a6138..62e307bd6ee 100644 --- a/ic-os/guestos/docs/Build.adoc +++ b/ic-os/guestos/docs/Build.adoc @@ -26,7 +26,7 @@ See notes below on the individual build steps. == Constructing the system using docker -All build instructions are contained in +rootfs/Dockerfile+. +All build instructions are contained in +context/Dockerfile+. The following template directories are copied verbatim onto the target system: diff --git a/ic-os/hostos/rootfs/BUILD.bazel b/ic-os/hostos/context/BUILD.bazel similarity index 100% rename from ic-os/hostos/rootfs/BUILD.bazel rename to ic-os/hostos/context/BUILD.bazel diff --git a/ic-os/hostos/rootfs/Dockerfile b/ic-os/hostos/context/Dockerfile similarity index 98% rename from ic-os/hostos/rootfs/Dockerfile rename to ic-os/hostos/context/Dockerfile index f1558a5071e..bd51d7d26ff 100644 --- a/ic-os/hostos/rootfs/Dockerfile +++ b/ic-os/hostos/context/Dockerfile @@ -23,7 +23,7 @@ RUN mkdir -p /boot/config \ COPY etc /etc # Change permissions on special files as they are copied. -# See ic-os/guestos/rootfs/Dockerfile for details +# See ic-os/hostos/context/Dockerfile for details COPY --chmod=644 etc/hosts /etc/hosts COPY --chmod=644 etc/hostname /etc/hostname COPY --chmod=644 etc/resolv.conf /etc/resolv.conf @@ -103,7 +103,7 @@ RUN systemctl disable \ # Add user/group entries specified here: /usr/lib/sysusers.d/systemd.conf E.g., systemd-timesync/coredump RUN systemd-sysusers && \ - # Fix reproducibility issue. Notes in guestos/rootfs/Dockerfile + # Fix reproducibility issue. Notes in hostos/context/Dockerfile usermod -p '!!' systemd-timesync && \ usermod -p '!!' systemd-coredump diff --git a/ic-os/hostos/rootfs/Dockerfile.base b/ic-os/hostos/context/Dockerfile.base similarity index 100% rename from ic-os/hostos/rootfs/Dockerfile.base rename to ic-os/hostos/context/Dockerfile.base diff --git a/ic-os/hostos/rootfs/README.adoc b/ic-os/hostos/context/README.adoc similarity index 100% rename from ic-os/hostos/rootfs/README.adoc rename to ic-os/hostos/context/README.adoc diff --git a/ic-os/hostos/rootfs/docker-base.dev b/ic-os/hostos/context/docker-base.dev similarity index 100% rename from ic-os/hostos/rootfs/docker-base.dev rename to ic-os/hostos/context/docker-base.dev diff --git a/ic-os/hostos/rootfs/docker-base.prod b/ic-os/hostos/context/docker-base.prod similarity index 100% rename from ic-os/hostos/rootfs/docker-base.prod rename to ic-os/hostos/context/docker-base.prod diff --git a/ic-os/hostos/rootfs/extra_boot_args b/ic-os/hostos/context/extra_boot_args similarity index 100% rename from ic-os/hostos/rootfs/extra_boot_args rename to ic-os/hostos/context/extra_boot_args diff --git a/ic-os/hostos/rootfs/packages.common b/ic-os/hostos/context/packages.common similarity index 100% rename from ic-os/hostos/rootfs/packages.common rename to ic-os/hostos/context/packages.common diff --git a/ic-os/hostos/rootfs/packages.dev b/ic-os/hostos/context/packages.dev similarity index 100% rename from ic-os/hostos/rootfs/packages.dev rename to ic-os/hostos/context/packages.dev diff --git a/ic-os/hostos/defs.bzl b/ic-os/hostos/defs.bzl index d0682ad9a42..ab2b58e91a1 100644 --- a/ic-os/hostos/defs.bzl +++ b/ic-os/hostos/defs.bzl @@ -22,7 +22,7 @@ def image_deps(mode, _malicious = False): """ deps = { - "base_dockerfile": "//ic-os/hostos/rootfs:Dockerfile.base", + "base_dockerfile": "//ic-os/hostos/context:Dockerfile.base", # Extra files to be added to rootfs and bootfs "bootfs": {}, @@ -38,14 +38,14 @@ def image_deps(mode, _malicious = False): }, # Set various configuration values - "container_context_files": Label("//ic-os/hostos/rootfs:context-files"), + "container_context_files": Label("//ic-os/hostos/context:context-files"), "rootfs_files": rootfs_files, "partition_table": Label("//ic-os/hostos:partitions.csv"), "volume_table": Label("//ic-os/hostos:volumes.csv"), "rootfs_size": "3G", "bootfs_size": "100M", "grub_config": Label("//ic-os/hostos:grub.cfg"), - "extra_boot_args": Label("//ic-os/hostos/rootfs:extra_boot_args"), + "extra_boot_args": Label("//ic-os/hostos/context:extra_boot_args"), # Add any custom partitions to the manifest "custom_partitions": _custom_partitions, diff --git a/ic-os/rootfs/guestos/dev-certs/README.md b/ic-os/rootfs/guestos/dev-certs/README.md index be2f807b353..ca7d2a9fd10 100644 --- a/ic-os/rootfs/guestos/dev-certs/README.md +++ b/ic-os/rootfs/guestos/dev-certs/README.md @@ -14,7 +14,7 @@ to the `ca-certificates.crt` bundle file sitting under `/etc/ssl/certs` folder, processes running on the VM will be able to treat `/etc/ssl/certs` directory as trusted CAs. IC-OS reads `/ic-os/guestos/rootfs/dev-certs/` to update its `/etc/ssl/certs/ca-certificates.crt` -bundle in: `/ic-os/guestos/rootfs/Dockerfile` +bundle in: `/ic-os/guestos/context/Dockerfile` ### VM as HTTPS server In the folder where you have `minica.pem` and `minica-key.pem`, generate service diff --git a/ic-os/setupos/rootfs/BUILD.bazel b/ic-os/setupos/context/BUILD.bazel similarity index 100% rename from ic-os/setupos/rootfs/BUILD.bazel rename to ic-os/setupos/context/BUILD.bazel diff --git a/ic-os/setupos/rootfs/Dockerfile b/ic-os/setupos/context/Dockerfile similarity index 98% rename from ic-os/setupos/rootfs/Dockerfile rename to ic-os/setupos/context/Dockerfile index d8c32083507..c3244896812 100644 --- a/ic-os/setupos/rootfs/Dockerfile +++ b/ic-os/setupos/context/Dockerfile @@ -25,7 +25,7 @@ RUN mkdir -p /config \ COPY etc /etc # Change permissions on special files as they are copied. -# See ic-os/guestos/rootfs/Dockerfile for details +# See ic-os/setupos/context/Dockerfile for details COPY --chmod=644 etc/hosts /etc/hosts COPY --chmod=644 etc/hostname /etc/hostname COPY --chmod=644 etc/resolv.conf /etc/resolv.conf diff --git a/ic-os/setupos/rootfs/Dockerfile.base b/ic-os/setupos/context/Dockerfile.base similarity index 100% rename from ic-os/setupos/rootfs/Dockerfile.base rename to ic-os/setupos/context/Dockerfile.base diff --git a/ic-os/setupos/rootfs/README.adoc b/ic-os/setupos/context/README.adoc similarity index 100% rename from ic-os/setupos/rootfs/README.adoc rename to ic-os/setupos/context/README.adoc diff --git a/ic-os/setupos/rootfs/docker-base.dev b/ic-os/setupos/context/docker-base.dev similarity index 100% rename from ic-os/setupos/rootfs/docker-base.dev rename to ic-os/setupos/context/docker-base.dev diff --git a/ic-os/setupos/rootfs/docker-base.prod b/ic-os/setupos/context/docker-base.prod similarity index 100% rename from ic-os/setupos/rootfs/docker-base.prod rename to ic-os/setupos/context/docker-base.prod diff --git a/ic-os/setupos/rootfs/extra_boot_args b/ic-os/setupos/context/extra_boot_args similarity index 100% rename from ic-os/setupos/rootfs/extra_boot_args rename to ic-os/setupos/context/extra_boot_args diff --git a/ic-os/setupos/rootfs/packages.common b/ic-os/setupos/context/packages.common similarity index 100% rename from ic-os/setupos/rootfs/packages.common rename to ic-os/setupos/context/packages.common diff --git a/ic-os/setupos/rootfs/packages.dev b/ic-os/setupos/context/packages.dev similarity index 100% rename from ic-os/setupos/rootfs/packages.dev rename to ic-os/setupos/context/packages.dev diff --git a/ic-os/setupos/defs.bzl b/ic-os/setupos/defs.bzl index ef1fe95314e..99a2e53522a 100644 --- a/ic-os/setupos/defs.bzl +++ b/ic-os/setupos/defs.bzl @@ -24,7 +24,7 @@ def image_deps(mode, _malicious = False): """ deps = { - "base_dockerfile": "//ic-os/setupos/rootfs:Dockerfile.base", + "base_dockerfile": "//ic-os/setupos/context:Dockerfile.base", # Extra files to be added to rootfs and bootfs "bootfs": {}, @@ -33,13 +33,13 @@ def image_deps(mode, _malicious = False): }, # Set various configuration values - "container_context_files": Label("//ic-os/setupos/rootfs:context-files"), + "container_context_files": Label("//ic-os/setupos/context:context-files"), "rootfs_files": rootfs_files, "partition_table": Label("//ic-os/setupos:partitions.csv"), "rootfs_size": "1750M", "bootfs_size": "100M", "grub_config": Label("//ic-os/setupos:grub.cfg"), - "extra_boot_args": Label("//ic-os/setupos/rootfs:extra_boot_args"), + "extra_boot_args": Label("//ic-os/setupos/context:extra_boot_args"), # Add any custom partitions to the manifest "custom_partitions": lambda: (_custom_partitions)(mode),