From d9d9c069a8cdd8988d366b30fb4c450c97b0e584 Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Sat, 1 Jun 2024 22:01:45 +0200 Subject: [PATCH 1/5] Update to Debian 12.5 Signed-off-by: Marcel Bargull --- .github/workflows/base-glibc-busybox-bash.yaml | 4 ++-- .github/workflows/base-glibc-debian-bash.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/base-glibc-busybox-bash.yaml b/.github/workflows/base-glibc-busybox-bash.yaml index 9f76c16d..77d83619 100644 --- a/.github/workflows/base-glibc-busybox-bash.yaml +++ b/.github/workflows/base-glibc-busybox-bash.yaml @@ -19,10 +19,10 @@ jobs: # The base image is not intended to change often and should be used with # version tags or checksum IDs, but not via "latest". MAJOR_VERSION: 3 - MINOR_VERSION: 0 + MINOR_VERSION: 1 IMAGE_NAME: base-glibc-busybox-bash BUSYBOX_VERSION: '1.36.1' - DEBIAN_VERSION: '12.2' + DEBIAN_VERSION: '12.5' steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/base-glibc-debian-bash.yaml b/.github/workflows/base-glibc-debian-bash.yaml index 331f44ea..83dd4bba 100644 --- a/.github/workflows/base-glibc-debian-bash.yaml +++ b/.github/workflows/base-glibc-debian-bash.yaml @@ -19,9 +19,9 @@ jobs: # The base image is not intended to change often and should be used with # version tags or checksum IDs, but not via "latest". MAJOR_VERSION: 3 - MINOR_VERSION: 0 + MINOR_VERSION: 1 IMAGE_NAME: base-glibc-debian-bash - DEBIAN_VERSION: '12.2' + DEBIAN_VERSION: '12.5' steps: - uses: actions/checkout@v4 From ef950c222dc26ebd269546e9cca2647406d0f8ca Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Sat, 1 Jun 2024 22:02:38 +0200 Subject: [PATCH 2/5] Replace deprecated "conda info --all" Signed-off-by: Marcel Bargull --- images/base-glibc-busybox-bash/Dockerfile.test | 2 +- images/base-glibc-debian-bash/Dockerfile.test | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/images/base-glibc-busybox-bash/Dockerfile.test b/images/base-glibc-busybox-bash/Dockerfile.test index feba4402..5dc03a76 100644 --- a/images/base-glibc-busybox-bash/Dockerfile.test +++ b/images/base-glibc-busybox-bash/Dockerfile.test @@ -24,4 +24,4 @@ RUN arch=$(uname -m) \ && \ sh ./Miniforge3-Linux-${arch}.sh -bp /opt/conda \ && \ - /opt/conda/bin/conda info --all + /opt/conda/bin/conda info --verbose diff --git a/images/base-glibc-debian-bash/Dockerfile.test b/images/base-glibc-debian-bash/Dockerfile.test index f2f0bace..83b8f406 100644 --- a/images/base-glibc-debian-bash/Dockerfile.test +++ b/images/base-glibc-debian-bash/Dockerfile.test @@ -36,4 +36,4 @@ RUN apt-get update -qq \ && \ sh ./Miniforge3-Linux-${arch}.sh -bp /opt/conda \ && \ - /opt/conda/bin/conda info --all + /opt/conda/bin/conda info --verbose From ceab730dc74465c56b911aad7effd7e7650cabce Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Sun, 2 Jun 2024 11:51:26 +0200 Subject: [PATCH 3/5] Show podman/buildah versions Signed-off-by: Marcel Bargull --- .github/workflows/base-glibc-busybox-bash.yaml | 6 ++++++ .github/workflows/base-glibc-debian-bash.yaml | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/.github/workflows/base-glibc-busybox-bash.yaml b/.github/workflows/base-glibc-busybox-bash.yaml index 77d83619..fdcb7684 100644 --- a/.github/workflows/base-glibc-busybox-bash.yaml +++ b/.github/workflows/base-glibc-busybox-bash.yaml @@ -32,6 +32,12 @@ jobs: with: platforms: arm64 + - name: Info + run: | + set -xeu + podman --version + buildah --version + - name: Build id: build run: | diff --git a/.github/workflows/base-glibc-debian-bash.yaml b/.github/workflows/base-glibc-debian-bash.yaml index 83dd4bba..525f2d90 100644 --- a/.github/workflows/base-glibc-debian-bash.yaml +++ b/.github/workflows/base-glibc-debian-bash.yaml @@ -31,6 +31,12 @@ jobs: with: platforms: arm64 + - name: Info + run: | + set -xeu + podman --version + buildah --version + - name: Build id: build run: | From 5f8814495c31b56148feaff82335a9db421b0e7c Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Sun, 2 Jun 2024 11:52:33 +0200 Subject: [PATCH 4/5] Use newer CI build image Signed-off-by: Marcel Bargull --- .github/workflows/base-glibc-busybox-bash.yaml | 2 +- .github/workflows/base-glibc-debian-bash.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/base-glibc-busybox-bash.yaml b/.github/workflows/base-glibc-busybox-bash.yaml index fdcb7684..d16ca52b 100644 --- a/.github/workflows/base-glibc-busybox-bash.yaml +++ b/.github/workflows/base-glibc-busybox-bash.yaml @@ -14,7 +14,7 @@ on: jobs: build: name: Build & Push - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: # The base image is not intended to change often and should be used with # version tags or checksum IDs, but not via "latest". diff --git a/.github/workflows/base-glibc-debian-bash.yaml b/.github/workflows/base-glibc-debian-bash.yaml index 525f2d90..9ebbfcf0 100644 --- a/.github/workflows/base-glibc-debian-bash.yaml +++ b/.github/workflows/base-glibc-debian-bash.yaml @@ -14,7 +14,7 @@ on: jobs: build: name: Build & Push - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 env: # The base image is not intended to change often and should be used with # version tags or checksum IDs, but not via "latest". From dfb738f0c60b00c93943c57925122d347877e29a Mon Sep 17 00:00:00 2001 From: Marcel Bargull Date: Sun, 2 Jun 2024 11:54:49 +0200 Subject: [PATCH 5/5] Try newer podman/buildah via travier/podman-action Signed-off-by: Marcel Bargull --- .../workflows/base-glibc-busybox-bash.yaml | 32 +++++++++++++++---- .github/workflows/base-glibc-debian-bash.yaml | 32 +++++++++++++++---- 2 files changed, 50 insertions(+), 14 deletions(-) diff --git a/.github/workflows/base-glibc-busybox-bash.yaml b/.github/workflows/base-glibc-busybox-bash.yaml index d16ca52b..cd497e81 100644 --- a/.github/workflows/base-glibc-busybox-bash.yaml +++ b/.github/workflows/base-glibc-busybox-bash.yaml @@ -15,6 +15,10 @@ jobs: build: name: Build & Push runs-on: ubuntu-24.04 + container: + # travier/podman-action contains newer podman/buildah versions. + image: quay.io/travier/podman-action + options: --privileged env: # The base image is not intended to change often and should be used with # version tags or checksum IDs, but not via "latest". @@ -28,15 +32,29 @@ jobs: - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: arm64 + run: | + podman run --rm --privileged \ + docker.io/tonistiigi/binfmt --install arm64 - - name: Info + - name: Install Tools run: | - set -xeu - podman --version - buildah --version + set -eu + # jq is not installed in travier/podman-action + dnf install -qy \ + jq + rpm -q \ + buildah podman \ + coreutils findutils sed \ + curl jq \ + | ( + while read -r line ; do + printf %s\\n "${line}" + case "${line}" in (*' not installed'*) + err=1 ;; + esac + done + exit "${err-0}" + ) - name: Build id: build diff --git a/.github/workflows/base-glibc-debian-bash.yaml b/.github/workflows/base-glibc-debian-bash.yaml index 9ebbfcf0..d9dd3efc 100644 --- a/.github/workflows/base-glibc-debian-bash.yaml +++ b/.github/workflows/base-glibc-debian-bash.yaml @@ -15,6 +15,10 @@ jobs: build: name: Build & Push runs-on: ubuntu-24.04 + container: + # travier/podman-action contains newer podman/buildah versions. + image: quay.io/travier/podman-action + options: --privileged env: # The base image is not intended to change often and should be used with # version tags or checksum IDs, but not via "latest". @@ -27,15 +31,29 @@ jobs: - uses: actions/checkout@v4 - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - with: - platforms: arm64 + run: | + podman run --rm --privileged \ + docker.io/tonistiigi/binfmt --install arm64 - - name: Info + - name: Install Tools run: | - set -xeu - podman --version - buildah --version + set -eu + # jq is not installed in travier/podman-action + dnf install -qy \ + jq + rpm -q \ + buildah podman \ + coreutils findutils sed \ + curl jq \ + | ( + while read -r line ; do + printf %s\\n "${line}" + case "${line}" in (*' not installed'*) + err=1 ;; + esac + done + exit "${err-0}" + ) - name: Build id: build