From 0bef60c700869d1ae37e7e57cb1cfe79f61405d1 Mon Sep 17 00:00:00 2001 From: TAKANO Mitsuhiro Date: Tue, 12 May 2026 17:11:33 +0900 Subject: [PATCH] Replace CBL-Mariner with Azure Linux --- .github/workflows/build-all.yml | 2 +- {cbl-mariner => azurelinux}/Dockerfile | 27 ++++++++++++++++---------- docker-compose.yml | 4 ++-- entrypoint.sh | 2 +- 4 files changed, 21 insertions(+), 14 deletions(-) rename {cbl-mariner => azurelinux}/Dockerfile (54%) diff --git a/.github/workflows/build-all.yml b/.github/workflows/build-all.yml index a83e5c1..6850874 100644 --- a/.github/workflows/build-all.yml +++ b/.github/workflows/build-all.yml @@ -14,7 +14,7 @@ jobs: centos, centos8, fedora, mageia, opensuse, oraclelinux, rockylinux, archlinux, manjarolinux, - cbl-mariner, chimeralinux, + azurelinux, chimeralinux, gentoo, solus, void-linux] # parrot # redhat diff --git a/cbl-mariner/Dockerfile b/azurelinux/Dockerfile similarity index 54% rename from cbl-mariner/Dockerfile rename to azurelinux/Dockerfile index d02b318..df89c3c 100644 --- a/cbl-mariner/Dockerfile +++ b/azurelinux/Dockerfile @@ -1,25 +1,32 @@ -FROM mcr.microsoft.com/cbl-mariner/base/core:2.0 +FROM mcr.microsoft.com/azurelinux/base/core:3.0 + LABEL maintainer "TAKANO Mitsuhiro " -RUN yum upgrade -y -RUN yum clean all -RUN yum install -y git +RUN tdnf upgrade -y +RUN tdnf install -y ca-certificates git +RUN tdnf clean all ENV ORIGIN=https://github.com/microsoft/CBL-Mariner-Linux-Kernel.git + RUN git config --global http.sslVerify false RUN git clone --depth 1 ${ORIGIN} /build-kernel/linux RUN while :; do cd /build-kernel/linux && git fetch --unshallow && break || sleep 5; done RUN cd /build-kernel/linux && git pull --all -RUN yum install -y make gcc bc bison flex awk openssl-devel -RUN yum install -y binutils diffutils cpio zstd rpm-build rsync -RUN yum install -y llvm clang lld -RUN yum install -y glibc-headers kernel-headers +RUN tdnf install -y \ + make gcc bc bison flex gawk \ + openssl-devel \ + binutils diffutils cpio zstd rpm-build rsync \ + llvm clang lld \ + glibc-devel kernel-headers \ + elfutils-libelf-devel dwarves perl \ + tar gzip xz -RUN yum clean all +RUN tdnf clean all COPY ./entrypoint.sh / RUN chmod 755 /entrypoint.sh + EXPOSE 8000 -ENTRYPOINT ["/entrypoint.sh"] +ENTRYPOINT ["/entrypoint.sh"] diff --git a/docker-compose.yml b/docker-compose.yml index f8406ab..3856aff 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -17,10 +17,10 @@ services: dockerfile: ./archlinux/Dockerfile ports: - 8003:8000 - cbl-mariner: + azurelinux: build: context: . - dockerfile: ./cbl-mariner/Dockerfile + dockerfile: ./azurelinux/Dockerfile ports: - 8019:8000 centos: diff --git a/entrypoint.sh b/entrypoint.sh index e2ed44e..90bc5b5 100644 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -45,7 +45,7 @@ unset IFS cd /build-kernel/linux git fetch --all --tags -if [ "mariner" = "$OS_ID" ]; then +if [ "azurelinux" = "" ]; then git branch -D rolling-lts/mariner || : git checkout -b rolling-lts/mariner -t origin/rolling-lts/mariner-3/6.6.96.1 || : else