Skip to content

Commit 26c7ba1

Browse files
authored
Merge pull request #141 from tobwen/update/podman-5.6.1
feat: bump podman 5.6.1 + dependencies
2 parents b73ffda + b73b5f8 commit 26c7ba1

File tree

2 files changed

+12
-12
lines changed

2 files changed

+12
-12
lines changed

Dockerfile

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

55

66
# runc
7-
FROM golang:1.24-alpine3.22 AS runc
8-
ARG RUNC_VERSION=v1.3.0
7+
FROM golang:1.25.1-alpine3.22 AS runc
8+
ARG RUNC_VERSION=v1.3.1
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; \
1111
ARCH="`uname -m | sed 's!x86_64!amd64!; s!aarch64!arm64!'`"; \
@@ -16,7 +16,7 @@ RUN set -eux; \
1616

1717

1818
# podman build base
19-
FROM golang:1.24-alpine3.22 AS podmanbuildbase
19+
FROM golang:1.25.1-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.6.0
30+
ARG PODMAN_VERSION=v5.6.1
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
@@ -67,14 +67,14 @@ RUN set -ex; \
6767
bin/conmon --help >/dev/null
6868

6969

70-
FROM rust:1.87-alpine3.22 AS rustbase
70+
FROM rust:1.89-alpine3.22 AS rustbase
7171
RUN apk add --update --no-cache git make musl-dev
7272

7373

7474
# netavark
7575
FROM rustbase AS netavark
7676
RUN apk add --update --no-cache protoc
77-
ARG NETAVARK_VERSION=v1.15.0
77+
ARG NETAVARK_VERSION=v1.16.1
7878
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$NETAVARK_VERSION https://github.com/containers/netavark
7979
WORKDIR /netavark
8080
ENV RUSTFLAGS='-C link-arg=-s'
@@ -83,7 +83,7 @@ RUN cargo build --release
8383

8484
# aardvark-dns
8585
FROM rustbase AS aardvark-dns
86-
ARG AARDVARKDNS_VERSION=v1.15.0
86+
ARG AARDVARKDNS_VERSION=v1.16.0
8787
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$AARDVARKDNS_VERSION https://github.com/containers/aardvark-dns
8888
WORKDIR /aardvark-dns
8989
ENV RUSTFLAGS='-C link-arg=-s'
@@ -119,7 +119,7 @@ RUN set -ex; \
119119
touch /dev/fuse; \
120120
ninja install; \
121121
fusermount3 -V
122-
ARG FUSEOVERLAYFS_VERSION=v1.14
122+
ARG FUSEOVERLAYFS_VERSION=v1.15
123123
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$FUSEOVERLAYFS_VERSION https://github.com/containers/fuse-overlayfs /fuse-overlayfs
124124
WORKDIR /fuse-overlayfs
125125
RUN set -ex; \
@@ -158,7 +158,7 @@ RUN set -ex; \
158158

159159

160160
# Build podman base image
161-
FROM alpine:3.22 AS podmanbase
161+
FROM alpine:3.22.1 AS podmanbase
162162
LABEL maintainer="Max Goltzsche <[email protected]>"
163163
RUN apk add --no-cache tzdata ca-certificates
164164
COPY --from=conmon /conmon/bin/conmon /usr/local/lib/podman/conmon

Dockerfile-remote

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# podman build base
2-
FROM golang:1.24-alpine3.22 AS podmanbuildbase
2+
FROM golang:1.25.1-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.6.0
12+
ARG PODMAN_VERSION=v5.6.1
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; \

0 commit comments

Comments
 (0)