Skip to content

Commit 9ccf992

Browse files
committed
fix: bump podman 5.5.2 + dependency updates
* podman 5.5.2 * passt 2025_06_11.0293c6f * alpine 3.22 base image * Go-based binaries built using Go 1.24 * Rust-based binaries built using Rust 1.87
1 parent c5353da commit 9ccf992

File tree

7 files changed

+20
-19
lines changed

7 files changed

+20
-19
lines changed

Dockerfile

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
# Download gpg
2-
FROM alpine:3.20 AS gpg
2+
FROM alpine:3.22 AS gpg
33
RUN apk add --no-cache gnupg
44

55

66
# runc
7-
FROM golang:1.23-alpine3.20 AS runc
7+
FROM golang:1.24-alpine3.22 AS runc
88
ARG RUNC_VERSION=v1.3.0
99
# Download runc binary release since static build doesn't work with musl libc anymore since 1.1.8, see https://github.com/opencontainers/runc/issues/3950
1010
RUN set -eux; \
@@ -16,7 +16,7 @@ RUN set -eux; \
1616

1717

1818
# podman build base
19-
FROM golang:1.23-alpine3.20 AS podmanbuildbase
19+
FROM golang:1.24-alpine3.22 AS podmanbuildbase
2020
RUN apk add --update --no-cache git make gcc pkgconf musl-dev \
2121
btrfs-progs btrfs-progs-dev libassuan-dev lvm2-dev device-mapper \
2222
glib-static libc-dev gpgme-dev protobuf-dev protobuf-c-dev \
@@ -27,7 +27,7 @@ RUN apk add --update --no-cache git make gcc pkgconf musl-dev \
2727
# podman (without systemd support)
2828
FROM podmanbuildbase AS podman
2929
RUN apk add --update --no-cache tzdata curl
30-
ARG PODMAN_VERSION=v5.5.1
30+
ARG PODMAN_VERSION=v5.5.2
3131
ARG PODMAN_BUILDTAGS='seccomp selinux apparmor exclude_graphdriver_devicemapper containers_image_openpgp'
3232
ARG PODMAN_CGO=1
3333
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch ${PODMAN_VERSION} https://github.com/containers/podman src/github.com/containers/podman
@@ -59,14 +59,15 @@ RUN set -ex; \
5959
# conmon (without systemd support)
6060
FROM podmanbuildbase AS conmon
6161
ARG CONMON_VERSION=v2.1.13
62+
RUN apk add --update --no-cache pcre2-static
6263
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch ${CONMON_VERSION} https://github.com/containers/conmon.git /conmon
6364
WORKDIR /conmon
6465
RUN set -ex; \
6566
make git-vars bin/conmon PKG_CONFIG='pkg-config --static' CFLAGS='-std=c99 -Os -Wall -Wextra -Werror -static' LDFLAGS='-s -w -static'; \
6667
bin/conmon --help >/dev/null
6768

6869

69-
FROM rust:1.78-alpine3.20 AS rustbase
70+
FROM rust:1.87-alpine3.22 AS rustbase
7071
RUN apk add --update --no-cache git make musl-dev
7172

7273

@@ -93,7 +94,7 @@ RUN cargo build --release
9394
FROM podmanbuildbase AS passt
9495
WORKDIR /
9596
RUN apk add --update --no-cache autoconf automake meson ninja linux-headers libcap-static libcap-dev clang llvm coreutils
96-
ARG PASST_VERSION=2025_05_12.8ec1341
97+
ARG PASST_VERSION=2025_06_11.0293c6f
9798
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$PASST_VERSION git://passt.top/passt
9899
WORKDIR /passt
99100
RUN set -ex; \
@@ -157,7 +158,7 @@ RUN set -ex; \
157158

158159

159160
# Build podman base image
160-
FROM alpine:3.20 AS podmanbase
161+
FROM alpine:3.22 AS podmanbase
161162
LABEL maintainer="Max Goltzsche <[email protected]>"
162163
RUN apk add --no-cache tzdata ca-certificates
163164
COPY --from=conmon /conmon/bin/conmon /usr/local/lib/podman/conmon

Dockerfile-remote

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# podman build base
2-
FROM golang:1.23-alpine3.20 AS podmanbuildbase
2+
FROM golang:1.24-alpine3.22 AS podmanbuildbase
33
RUN apk add --update --no-cache git make gcc pkgconf musl-dev \
44
btrfs-progs btrfs-progs-dev libassuan-dev lvm2-dev device-mapper \
55
glib-static libc-dev gpgme-dev protobuf-dev protobuf-c-dev \
@@ -9,7 +9,7 @@ RUN apk add --update --no-cache git make gcc pkgconf musl-dev \
99
# podman remote
1010
FROM podmanbuildbase AS podman-remote
1111
RUN apk add --update --no-cache curl
12-
ARG PODMAN_VERSION=v5.5.1
12+
ARG PODMAN_VERSION=v5.5.2
1313
RUN git clone -c advice.detachedHead=false --depth=1 --branch=${PODMAN_VERSION} https://github.com/containers/podman src/github.com/containers/podman
1414
WORKDIR $GOPATH/src/github.com/containers/podman
1515
RUN set -eux; \
@@ -20,6 +20,6 @@ RUN set -eux; \
2020
podman --help >/dev/null; \
2121
[ "$(ldd /usr/local/bin/podman-remote | wc -l)" -eq 0 ] || (ldd /usr/local/bin/podman-remote; false)
2222

23-
FROM alpine:3.20
23+
FROM alpine:3.22
2424
COPY --from=podman-remote /usr/local/bin /usr/local/bin
2525
RUN adduser -D podman-remote -h /podman -u 1000

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ run:
163163
$(PODMAN_IMAGE) /bin/sh
164164

165165
clean:
166-
$(DOCKER) run --rm -v "`pwd`:/work" alpine:3.20 rm -rf /work/build
166+
$(DOCKER) run --rm -v "`pwd`:/work" alpine:3.22 rm -rf /work/build
167167

168168
run-server: podman-ssh
169169
# TODO: make sshd log to stdout (while still ensuring that we know when it is available)

test/pod.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ metadata:
55
spec:
66
containers:
77
- name: build
8-
image: alpine:3.17
8+
image: alpine:3.22
99
command: ["/bin/sh"]
1010
args:
1111
- -c

test/remote.bats

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ teardown_file() {
2424

2525
@test "remote podman - run container" {
2626
$DOCKER run --rm --network=host --pull=never "${PODMAN_REMOTE_IMAGE}" \
27-
podman --url=tcp://$PODMAN_ADDRESS run alpine:3.17 echo hello from remote container
27+
podman --url=tcp://$PODMAN_ADDRESS run alpine:3.22 echo hello from remote container
2828
}
2929

3030
@test "remote podman - build dockerfile" {
@@ -33,7 +33,7 @@ teardown_file() {
3333
"${PODMAN_REMOTE_IMAGE}" \
3434
sh -c "set -ex; \
3535
mkdir /tmp/testcontext
36-
printf 'FROM alpine:3.17\nRUN echo hello\nCMD [ "/bin/echo", "hello" ]' > /tmp/testcontext/Dockerfile
36+
printf 'FROM alpine:3.22\nRUN echo hello\nCMD [ "/bin/echo", "hello" ]' > /tmp/testcontext/Dockerfile
3737
podman --log-level=debug --remote --url=tcp://$PODMAN_ADDRESS build -t testbuild -f /tmp/testcontext/Dockerfile /tmp/testcontext; \
3838
podman --url=tcp://$PODMAN_ADDRESS run testbuild echo hello from remote container"
3939
}

test/rootful.bats

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ skipIfDockerUnavailableAndNotRunAsRoot() {
1818
$DOCKER run --rm --privileged --entrypoint /bin/sh -u root:root \
1919
-v "$PODMAN_ROOT_DATA_DIR:/var/lib/containers/storage" \
2020
--pull=never "${PODMAN_IMAGE}" \
21-
-c 'podman run --rm alpine:3.17 wget -O /dev/null http://example.org'
21+
-c 'podman run --rm alpine:3.22 wget -O /dev/null http://example.org'
2222
}
2323

2424
@test "rootful podman - build dockerfile" {

test/rootless.bats

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,20 @@ teardown_file() {
2020
$DOCKER run --rm --privileged -u podman:podman \
2121
-v "$PODMAN_ROOT_DATA_DIR:/podman/.local/share/containers/storage" \
2222
--pull=never "${PODMAN_IMAGE}" \
23-
docker run --rm alpine:3.17 wget -O /dev/null http://example.org
23+
docker run --rm alpine:3.22 wget -O /dev/null http://example.org
2424
}
2525

2626
@test "$TEST_PREFIX podman - uid mapping (using fuse-overlayfs) {
2727
$DOCKER run --rm --privileged -u podman:podman \
2828
-v "$PODMAN_ROOT_DATA_DIR:/podman/.local/share/containers/storage" \
2929
--pull=never "${PODMAN_IMAGE}" \
30-
docker run --rm alpine:3.17 /bin/sh -c 'set -ex; touch /file; chown guest /file; [ $(stat -c %U /file) = guest ]'
30+
docker run --rm alpine:3.22 /bin/sh -c 'set -ex; touch /file; chown guest /file; [ $(stat -c %U /file) = guest ]'
3131
}
3232
3333
@test "$TEST_PREFIX podman - unmapped uid" {
3434
$DOCKER run --rm --privileged --user 9000:9000 -e HOME=/tmp \
3535
--pull=never "${PODMAN_IMAGE}" \
36-
docker run --rm alpine:3.17 wget -O /dev/null http://example.org
36+
docker run --rm alpine:3.22 wget -O /dev/null http://example.org
3737
}
3838
3939
@test "$TEST_PREFIX podman - build image from dockerfile" {
@@ -42,7 +42,7 @@ teardown_file() {
4242
--pull=never "${PODMAN_IMAGE}" \
4343
-c 'set -e;
4444
podman build -t podmantestimage -f - . <<-EOF
45-
FROM alpine:3.17
45+
FROM alpine:3.22
4646
RUN echo hello world > /hello
4747
CMD ["/bin/cat", "/hello"]
4848
EOF'

0 commit comments

Comments
 (0)