diff --git a/Dockerfile b/Dockerfile index ee631cc..25c238f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -86,7 +86,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.10.3 +ARG LIBFUSE_VERSION=fuse-3.10.4 RUN git clone -c 'advice.detachedHead=false' --branch=$LIBFUSE_VERSION https://github.com/libfuse/libfuse /libfuse WORKDIR /libfuse RUN set -ex; \ @@ -144,7 +144,7 @@ COPY --from=runc /usr/local/bin/runc /usr/local/bin/runc # Download crun FROM gpg AS crun -ARG CRUN_VERSION=0.20 +ARG CRUN_VERSION=0.20.1 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; \ diff --git a/Dockerfile-remote b/Dockerfile-remote index b36783b..b2a261e 100644 --- a/Dockerfile-remote +++ b/Dockerfile-remote @@ -11,7 +11,7 @@ RUN git clone -c 'advice.detachedHead=false' --branch ${BATS_VERSION} https://gi # podman remote FROM podmanbuildbase AS podman-remote RUN apk add --update --no-cache curl -ARG PODMAN_VERSION=v3.2.0 +ARG PODMAN_VERSION=v3.2.1 RUN git clone -c 'advice.detachedHead=false' --branch ${PODMAN_VERSION} https://github.com/containers/podman src/github.com/containers/podman WORKDIR $GOPATH/src/github.com/containers/podman RUN make install.tools diff --git a/Makefile b/Makefile index edc8313..81af6bf 100644 --- a/Makefile +++ b/Makefile @@ -29,7 +29,9 @@ podman-remote: podman-ssh: podman $(DOCKER) build --force-rm -t $(PODMAN_SSH_IMAGE) -f Dockerfile-ssh --build-arg BASEIMAGE=$(PODMAN_IMAGE) . -test: test-local-rootless test-local-rootful test-minimal-image test-remote +# TODO: enable podman-remote test once DNS detection has been fixed: test-remote +# See https://github.com/mgoltzsche/podman-static/pull/10 +test: test-local-rootless test-local-rootful test-minimal-image test-local-rootful: podman storage-dir IMAGE=$(PODMAN_IMAGE) ./test/test-local-rootful.sh