Skip to content

Commit

Permalink
fix: upgrade podman 4.8.3, runc 1.1.11, crun 1.13
Browse files Browse the repository at this point in the history
  • Loading branch information
mgoltzsche committed Jan 21, 2024
1 parent c969579 commit e28f6d6
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 5 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ RUN apk add --no-cache gnupg

# runc
FROM golang:1.20-alpine3.18 AS runc
ARG RUNC_VERSION=v1.1.10
ARG RUNC_VERSION=v1.1.11
# 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!'`"; \
Expand All @@ -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=v4.8.2
ARG PODMAN_VERSION=v4.8.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
Expand Down Expand Up @@ -174,7 +174,7 @@ RUN set -ex; \
gpg --keyserver hkps://keyserver.ubuntu.com --recv-keys 027F3BD58594CA181BB5EC50E4730F97F60286ED; \
gpg --batch --verify /tmp/crun.asc /usr/local/bin/crun; \
chmod +x /usr/local/bin/crun; \
crun --help >/dev/null
! ldd /usr/local/bin/crun

# Build minimal rootless podman
FROM rootlesspodmanbase AS rootlesspodmanminimal
Expand Down
3 changes: 1 addition & 2 deletions Dockerfile-remote
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,9 @@ 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=v4.8.2
ARG PODMAN_VERSION=v4.8.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 make install.tools
RUN set -eux; \
make bin/podman-remote LDFLAGS_PODMAN="-s -w -extldflags '-static'"; \
mv bin/podman-remote /usr/local/bin/podman-remote; \
Expand Down

0 comments on commit e28f6d6

Please sign in to comment.