diff --git a/Dockerfile b/Dockerfile index cd7ccfe..7ed1bd1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ RUN apk add --no-cache gnupg # runc FROM golang:1.22-alpine3.20 AS runc -ARG RUNC_VERSION=v1.1.13 +ARG RUNC_VERSION=v1.1.14 # 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 RUN set -eux; \ ARCH="`uname -m | sed 's!x86_64!amd64!; s!aarch64!arm64!'`"; \ @@ -27,7 +27,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=v5.2.2 +ARG PODMAN_VERSION=v5.2.3 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 @@ -66,7 +66,7 @@ RUN apk add --update --no-cache git make musl-dev # netavark FROM rustbase AS netavark RUN apk add --update --no-cache protoc -ARG NETAVARK_VERSION=v1.12.1 +ARG NETAVARK_VERSION=v1.12.2 RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$NETAVARK_VERSION https://github.com/containers/netavark WORKDIR /netavark ENV RUSTFLAGS='-C link-arg=-s' @@ -75,7 +75,7 @@ RUN cargo build --release # aardvark-dns FROM rustbase AS aardvark-dns -ARG AARDVARKDNS_VERSION=v1.12.1 +ARG AARDVARKDNS_VERSION=v1.12.2 RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$AARDVARKDNS_VERSION https://github.com/containers/aardvark-dns WORKDIR /aardvark-dns ENV RUSTFLAGS='-C link-arg=-s' @@ -86,7 +86,7 @@ RUN cargo build --release FROM podmanbuildbase AS passt WORKDIR / RUN apk add --update --no-cache autoconf automake meson ninja linux-headers libcap-static libcap-dev clang llvm coreutils -ARG PASST_VERSION=2024_06_24.1ee2eca +ARG PASST_VERSION=2024_09_06.6b38f07 RUN git clone -c 'advice.detachedHead=false' --depth=1 --branch=$PASST_VERSION git://passt.top/passt WORKDIR /passt RUN set -ex; \ @@ -138,7 +138,7 @@ RUN set -ex; \ # 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.16.1 +ARG CRUN_VERSION=1.17 RUN set -ex; \ ARCH="`uname -m | sed 's!x86_64!amd64!; s!aarch64!arm64!'`"; \ wget -O /usr/local/bin/crun https://github.com/containers/crun/releases/download/$CRUN_VERSION/crun-${CRUN_VERSION}-linux-${ARCH}-disable-systemd; \ diff --git a/Dockerfile-remote b/Dockerfile-remote index f83c709..e72eca6 100644 --- a/Dockerfile-remote +++ b/Dockerfile-remote @@ -9,7 +9,7 @@ RUN apk add --update --no-cache git make gcc pkgconf musl-dev \ # podman remote FROM podmanbuildbase AS podman-remote RUN apk add --update --no-cache curl -ARG PODMAN_VERSION=v5.2.2 +ARG PODMAN_VERSION=v5.2.3 RUN git clone -c advice.detachedHead=false --depth=1 --branch=${PODMAN_VERSION} https://github.com/containers/podman src/github.com/containers/podman WORKDIR $GOPATH/src/github.com/containers/podman RUN set -eux; \ diff --git a/Makefile b/Makefile index d6fa941..e341670 100644 --- a/Makefile +++ b/Makefile @@ -32,6 +32,7 @@ BUILDX_OPTS ?= --builder=$(BUILDX_BUILDER) --output=$(BUILDX_OUTPUT) --platform= ASSET_NAME := podman-linux-$(ARCH) ASSET_DIR := $(BUILD_DIR)/asset/$(ASSET_NAME) + images: podman podman-remote podman-minimal multiarch-tar multiarch-images: PLATFORM = linux/arm64/v8,linux/amd64 @@ -150,7 +151,7 @@ run: $(PODMAN_IMAGE) /bin/sh clean: - $(DOCKER) run --rm -v "`pwd`:/work" alpine:3.19 rm -rf /work/build + $(DOCKER) run --rm -v "`pwd`:/work" alpine:3.20 rm -rf /work/build run-server: podman-ssh # TODO: make sshd log to stdout (while still ensuring that we know when it is available)