Skip to content

Commit 55781f6

Browse files
authored
Merge pull request #82 from mbargull/base-debian-12.5
Base: Update to Debian 12.5
2 parents e92e5c0 + dfb738f commit 55781f6

File tree

4 files changed

+62
-14
lines changed

4 files changed

+62
-14
lines changed

.github/workflows/base-glibc-busybox-bash.yaml

+30-6
Original file line numberDiff line numberDiff line change
@@ -14,23 +14,47 @@ on:
1414
jobs:
1515
build:
1616
name: Build & Push
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
18+
container:
19+
# travier/podman-action contains newer podman/buildah versions.
20+
image: quay.io/travier/podman-action
21+
options: --privileged
1822
env:
1923
# The base image is not intended to change often and should be used with
2024
# version tags or checksum IDs, but not via "latest".
2125
MAJOR_VERSION: 3
22-
MINOR_VERSION: 0
26+
MINOR_VERSION: 1
2327
IMAGE_NAME: base-glibc-busybox-bash
2428
BUSYBOX_VERSION: '1.36.1'
25-
DEBIAN_VERSION: '12.2'
29+
DEBIAN_VERSION: '12.5'
2630

2731
steps:
2832
- uses: actions/checkout@v4
2933

3034
- name: Set up QEMU
31-
uses: docker/setup-qemu-action@v2
32-
with:
33-
platforms: arm64
35+
run: |
36+
podman run --rm --privileged \
37+
docker.io/tonistiigi/binfmt --install arm64
38+
39+
- name: Install Tools
40+
run: |
41+
set -eu
42+
# jq is not installed in travier/podman-action
43+
dnf install -qy \
44+
jq
45+
rpm -q \
46+
buildah podman \
47+
coreutils findutils sed \
48+
curl jq \
49+
| (
50+
while read -r line ; do
51+
printf %s\\n "${line}"
52+
case "${line}" in (*' not installed'*)
53+
err=1 ;;
54+
esac
55+
done
56+
exit "${err-0}"
57+
)
3458
3559
- name: Build
3660
id: build

.github/workflows/base-glibc-debian-bash.yaml

+30-6
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,46 @@ on:
1414
jobs:
1515
build:
1616
name: Build & Push
17-
runs-on: ubuntu-22.04
17+
runs-on: ubuntu-24.04
18+
container:
19+
# travier/podman-action contains newer podman/buildah versions.
20+
image: quay.io/travier/podman-action
21+
options: --privileged
1822
env:
1923
# The base image is not intended to change often and should be used with
2024
# version tags or checksum IDs, but not via "latest".
2125
MAJOR_VERSION: 3
22-
MINOR_VERSION: 0
26+
MINOR_VERSION: 1
2327
IMAGE_NAME: base-glibc-debian-bash
24-
DEBIAN_VERSION: '12.2'
28+
DEBIAN_VERSION: '12.5'
2529

2630
steps:
2731
- uses: actions/checkout@v4
2832

2933
- name: Set up QEMU
30-
uses: docker/setup-qemu-action@v2
31-
with:
32-
platforms: arm64
34+
run: |
35+
podman run --rm --privileged \
36+
docker.io/tonistiigi/binfmt --install arm64
37+
38+
- name: Install Tools
39+
run: |
40+
set -eu
41+
# jq is not installed in travier/podman-action
42+
dnf install -qy \
43+
jq
44+
rpm -q \
45+
buildah podman \
46+
coreutils findutils sed \
47+
curl jq \
48+
| (
49+
while read -r line ; do
50+
printf %s\\n "${line}"
51+
case "${line}" in (*' not installed'*)
52+
err=1 ;;
53+
esac
54+
done
55+
exit "${err-0}"
56+
)
3357
3458
- name: Build
3559
id: build

images/base-glibc-busybox-bash/Dockerfile.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,4 +24,4 @@ RUN arch=$(uname -m) \
2424
&& \
2525
sh ./Miniforge3-Linux-${arch}.sh -bp /opt/conda \
2626
&& \
27-
/opt/conda/bin/conda info --all
27+
/opt/conda/bin/conda info --verbose

images/base-glibc-debian-bash/Dockerfile.test

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,4 @@ RUN apt-get update -qq \
3636
&& \
3737
sh ./Miniforge3-Linux-${arch}.sh -bp /opt/conda \
3838
&& \
39-
/opt/conda/bin/conda info --all
39+
/opt/conda/bin/conda info --verbose

0 commit comments

Comments
 (0)