Merge pull request #10727 from microsoft/danmihai1/mariner3-guest

image: bump mariner guest version to 3.0
This commit is contained in:
Fabiano Fidêncio 2025-01-14 19:06:28 +01:00 committed by GitHub
commit 121ac0c5c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
ARG IMAGE_REGISTRY=mcr.microsoft.com ARG IMAGE_REGISTRY=mcr.microsoft.com
FROM ${IMAGE_REGISTRY}/cbl-mariner/base/core:@OS_VERSION@ FROM ${IMAGE_REGISTRY}/azurelinux/base/core:@OS_VERSION@
RUN tdnf -y install \ RUN tdnf -y install \
ca-certificates \ ca-certificates \

View File

@ -3,7 +3,7 @@
# SPDX-License-Identifier: Apache-2.0 # SPDX-License-Identifier: Apache-2.0
OS_NAME=cbl-mariner OS_NAME=cbl-mariner
OS_VERSION=${OS_VERSION:-2.0} OS_VERSION=${OS_VERSION:-3.0}
LIBC="gnu" LIBC="gnu"
PACKAGES="kata-packages-uvm" PACKAGES="kata-packages-uvm"
[ "$AGENT_INIT" = no ] && PACKAGES+=" systemd" [ "$AGENT_INIT" = no ] && PACKAGES+=" systemd"

View File

@ -141,7 +141,7 @@ assets:
version: *default-image-version version: *default-image-version
mariner: mariner:
name: "cbl-mariner" name: "cbl-mariner"
version: "2.0" version: "3.0"
nvidia-gpu: nvidia-gpu:
name: *default-image-name name: *default-image-name
version: "jammy" version: "jammy"