Merge branch 'main' into 2.0

Author: jslobodzian

.github/CODEOWNERS

@@ -25,6 +25,7 @@
 /SPECS-SIGNED/kernel-hci-signed/* @microsoft/cbl-mariner-kernel
 /SPECS-SIGNED/kernel-azure-signed/* @microsoft/cbl-mariner-kernel
 /SPECS-SIGNED/kernel-mstflint-signed/* @microsoft/cbl-mariner-kernel
+/SPECS-SIGNED/kernel-mshv-signed/* @microsoft/cbl-mariner-kata-containers
 
 /SPECS/grub2/* @microsoft/cbl-mariner-bootloader
 /SPECS/grubby/* @microsoft/cbl-mariner-bootloader
@@ -68,6 +69,7 @@
 
 /SPECS/cloud-hypervisor/* @microsoft/cbl-mariner-virtualization
 /SPECS/hvloader/* @microsoft/cbl-mariner-kata-containers
+/SPECS-SIGNED/hvloader-signed/* @microsoft/cbl-mariner-kata-containers
 
 /SPECS/cloud-init/* @microsoft/cbl-mariner-provisioning
 /SPECS/walinuxagent/* @microsoft/cbl-mariner-provisioning

.pipelines/containerSourceData/Dockerfile-Initial

@@ -7,7 +7,7 @@ RUN --mount=type=bind,source=./Stage/,target=/dockerStage/ \\\
     tdnf install -y createrepo; \\\
     cp -r ${RPMS_PATH} ${LOCAL_REPO_PATH}; \\\
     cat /dockerStage/marinerLocalRepo.repo >> /etc/yum.repos.d/local.repo; \\\
-    createrepo --database ${LOCAL_REPO_PATH} --workers 10; tdnf makecache \&\& tdnf makecache; \\\
+    createrepo --database ${LOCAL_REPO_PATH} --workers 10; tdnf makecache; \\\
     tdnf autoremove -y createrepo; \\\
     for rpm in "${RPMS_TO_INSTALL[@]}"; do \\\
        echo "RPM: $rpm"; \\\

.pipelines/containerSourceData/azurecli/Dockerfile-AzureCLI

@@ -5,14 +5,14 @@ ARG BASE_IMAGE
 
 FROM $BASE_IMAGE AS BASE
 
-ARG MARINER_VERSION=2.0
+ARG AZL_VERSION=2.0
 ARG USERNAME=nonroot
 ARG USER_UID=65532
 ARG USER_GID=$USER_UID
 ARG SET_USER=$USERNAME
 
 RUN mkdir -p /staging/etc \
-    && tdnf install -y --releasever=$MARINER_VERSION shadow-utils \
+    && tdnf install -y --releasever=$AZL_VERSION shadow-utils \
     && groupadd --gid $USER_GID $USERNAME \
     && useradd --gid $USER_GID -g $USERNAME $USERNAME -u $USER_UID \
     && tdnf clean all \

.pipelines/containerSourceData/azurecli/azurecli.pkg

@@ -5,12 +5,32 @@ ARG BASE_IMAGE
 
 FROM $BASE_IMAGE AS BASE
 
-ARG MARINER_VERSION=2.0
+ARG AZL_VERSION=2.0
+
+ARG RPMS
+ARG LOCAL_REPO_FILE="local.repo"
+ARG LOCAL_REPO_PATH="/localrepo" 
+
+COPY ${RPMS} /WORKDIR/RPMS
+COPY ${LOCAL_REPO_FILE} /WORKDIR/REPO/local.repo
+
+# Create local repo if RPMS are provided
+# This will allow the user to install packages from the local repo
+# instead of fetching from PMC
+RUN if [ "${RPMS}" ]; then \
+    mkdir -p $LOCAL_REPO_PATH; \
+    tdnf install -y --releasever=$AZL_VERSION createrepo; \
+    cp -r /WORKDIR/RPMS ${LOCAL_REPO_PATH}; \
+    cp /WORKDIR/REPO/local.repo /etc/yum.repos.d/local.repo; \
+    createrepo --database ${LOCAL_REPO_PATH} --workers 10; \
+    tdnf makecache; \
+    tdnf autoremove -y createrepo; \
+fi
 
 # Install busybox, glibc, and their dependencies into a staging location.
 # Staging directory is copied into the final scratch image.
 RUN mkdir /staging \
-    && tdnf install -y --releasever=$MARINER_VERSION --installroot /staging \
+    && tdnf install -y --releasever=$AZL_VERSION --installroot /staging \
     busybox glibc \
     && tdnf clean all \
     && pushd /staging \
@@ -37,5 +57,5 @@ FROM scratch
 
 # Copy dependencies into the scratch image.
 COPY --from=BASE /staging/ .
-
+COPY --from=BASE EULA-Container.txt /
 CMD [ "sh" ]

.pipelines/containerSourceData/base/Dockerfile-Base-Nonroot-Template

@@ -6,14 +6,14 @@ ARG FINAL_IMAGE
 
 FROM $BASE_IMAGE AS BASE
 
-ARG MARINER_VERSION=2.0
+ARG AZL_VERSION=2.0
 ARG USERNAME=nonroot
 ARG USER_UID=65532
 ARG USER_GID=$USER_UID
 ARG SET_USER=$USERNAME
 
 RUN mkdir -p /staging/etc \
-    && tdnf install -y --releasever=$MARINER_VERSION shadow-utils \
+    && tdnf install -y --releasever=$AZL_VERSION shadow-utils \
     && groupadd --gid $USER_GID $USERNAME \
     && useradd --gid $USER_GID -g $USERNAME $USERNAME -u $USER_UID \
     && tdnf clean all \

…Data/busybox/Dockerfile-Busybox-Template …rceData/base/Dockerfile-Busybox-Template.pipelines/containerSourceData/busybox/Dockerfile-Busybox-Template renamed to .pipelines/containerSourceData/base/Dockerfile-Busybox-Template .pipelines/containerSourceData/busybox/Dockerfile-Busybox-Template renamed to .pipelines/containerSourceData/base/Dockerfile-Busybox-Template

@@ -0,0 +1,8 @@
+bash
+bzi
+coreutils
+gmp
+grep
+libselinux
+pcre
+pcre-libs

…s/Dockerfile-Distroless-Nonroot-Template …e/Dockerfile-Distroless-Nonroot-Template.pipelines/containerSourceData/distroless/Dockerfile-Distroless-Nonroot-Template renamed to .pipelines/containerSourceData/base/Dockerfile-Distroless-Nonroot-Template .pipelines/containerSourceData/distroless/Dockerfile-Distroless-Nonroot-Template renamed to .pipelines/containerSourceData/base/Dockerfile-Distroless-Nonroot-Template

@@ -0,0 +1,2 @@
+distroless-packages-base
+nodejs18