-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
update podman 4.4.0 and dependencies
dependency updates: * alpine:3.17 * conmon 2.1.6 * CNI plugins 1.2.0 * libfuse 3.13.1 * fuse-overlayfs 1.10 * crun 1.8 Also, updated bats to 1.8.2
- Loading branch information
1 parent
9f86c70
commit 8118e8d
Showing
6 changed files
with
21 additions
and
23 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
# Download gpg | ||
FROM alpine:3.15 AS gpg | ||
FROM alpine:3.17 AS gpg | ||
RUN apk add --no-cache gnupg | ||
|
||
|
||
# runc | ||
FROM golang:1.18-alpine3.15 AS runc | ||
FROM golang:1.18-alpine3.17 AS runc | ||
ARG RUNC_VERSION=v1.1.4 | ||
RUN set -eux; \ | ||
apk add --no-cache --virtual .build-deps gcc musl-dev libseccomp-dev libseccomp-static make git bash; \ | ||
|
@@ -18,7 +18,7 @@ RUN set -eux; \ | |
|
||
|
||
# podman build base | ||
FROM golang:1.18-alpine3.15 AS podmanbuildbase | ||
FROM golang:1.18-alpine3.17 AS podmanbuildbase | ||
RUN apk add --update --no-cache git make gcc pkgconf musl-dev \ | ||
btrfs-progs btrfs-progs-dev libassuan-dev lvm2-dev device-mapper \ | ||
glib-static libc-dev gpgme-dev protobuf-dev protobuf-c-dev \ | ||
|
@@ -29,7 +29,7 @@ RUN apk add --update --no-cache git make gcc pkgconf musl-dev \ | |
# podman (without systemd support) | ||
FROM podmanbuildbase AS podman | ||
RUN apk add --update --no-cache tzdata curl | ||
ARG PODMAN_VERSION=v4.3.1 | ||
ARG PODMAN_VERSION=v4.4.0 | ||
ARG PODMAN_BUILDTAGS='seccomp selinux apparmor exclude_graphdriver_devicemapper containers_image_openpgp' | ||
ARG PODMAN_CGO=1 | ||
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch ${PODMAN_VERSION} https://github.com/containers/podman src/github.com/containers/podman | ||
|
@@ -49,7 +49,7 @@ RUN set -ex; \ | |
|
||
# conmon (without systemd support) | ||
FROM podmanbuildbase AS conmon | ||
ARG CONMON_VERSION=v2.1.5 | ||
ARG CONMON_VERSION=v2.1.6 | ||
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch ${CONMON_VERSION} https://github.com/containers/conmon.git /conmon | ||
WORKDIR /conmon | ||
RUN set -ex; \ | ||
|
@@ -59,7 +59,7 @@ RUN set -ex; \ | |
|
||
# CNI plugins | ||
FROM podmanbuildbase AS cniplugins | ||
ARG CNI_PLUGIN_VERSION=v1.1.1 | ||
ARG CNI_PLUGIN_VERSION=v1.2.0 | ||
ARG CNI_PLUGINS="ipam/host-local main/loopback main/bridge meta/portmap meta/tuning meta/firewall" | ||
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=${CNI_PLUGIN_VERSION} https://github.com/containernetworking/plugins /go/src/github.com/containernetworking/plugins | ||
WORKDIR /go/src/github.com/containernetworking/plugins | ||
|
@@ -98,7 +98,7 @@ RUN set -ex; \ | |
# fuse-overlayfs (derived from https://github.com/containers/fuse-overlayfs/blob/master/Dockerfile.static) | ||
FROM podmanbuildbase AS fuse-overlayfs | ||
RUN apk add --update --no-cache autoconf automake meson ninja clang g++ eudev-dev fuse3-dev | ||
ARG LIBFUSE_VERSION=fuse-3.12.0 | ||
ARG LIBFUSE_VERSION=fuse-3.13.1 | ||
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$LIBFUSE_VERSION https://github.com/libfuse/libfuse /libfuse | ||
WORKDIR /libfuse | ||
RUN set -ex; \ | ||
|
@@ -109,7 +109,7 @@ RUN set -ex; \ | |
touch /dev/fuse; \ | ||
ninja install; \ | ||
fusermount3 -V | ||
ARG FUSEOVERLAYFS_VERSION=v1.9 | ||
ARG FUSEOVERLAYFS_VERSION=v1.10 | ||
RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$FUSEOVERLAYFS_VERSION https://github.com/containers/fuse-overlayfs /fuse-overlayfs | ||
WORKDIR /fuse-overlayfs | ||
RUN set -ex; \ | ||
|
@@ -121,7 +121,7 @@ RUN set -ex; \ | |
|
||
|
||
# Build podman base image | ||
FROM alpine:3.15 AS podmanbase | ||
FROM alpine:3.17 AS podmanbase | ||
LABEL maintainer="Max Goltzsche <[email protected]>" | ||
RUN apk add --no-cache tzdata ca-certificates | ||
COPY --from=conmon /conmon/bin/conmon /usr/local/lib/podman/conmon | ||
|
@@ -155,7 +155,7 @@ COPY --from=runc /usr/local/bin/runc /usr/local/bin/runc | |
# Download crun | ||
# (switched keyserver from sks to ubuntu since sks is offline now and gpg refuses to import keys from keys.openpgp.org because it does not provide a user ID with the key.) | ||
FROM gpg AS crun | ||
ARG CRUN_VERSION=1.6 | ||
ARG CRUN_VERSION=1.8 | ||
RUN set -ex; \ | ||
wget -O /usr/local/bin/crun https://github.com/containers/crun/releases/download/$CRUN_VERSION/crun-${CRUN_VERSION}-linux-amd64-disable-systemd; \ | ||
wget -O /tmp/crun.asc https://github.com/containers/crun/releases/download/$CRUN_VERSION/crun-${CRUN_VERSION}-linux-amd64-disable-systemd.asc; \ | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters