Skip to content

Commit

Permalink
podman-remote 3.2.1, crun 0.20.1, libfuse 3.10.4.
Browse files Browse the repository at this point in the history
This is a follow-up of #10 to
* bump the podman-remote version as well
* update crun and libfuse
* disable podman-remote tests for now due to a podman bug
  • Loading branch information
mgoltzsche committed Jun 19, 2021
1 parent 3df1659 commit 1e9cf4b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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; \
Expand Down Expand Up @@ -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; \
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile-remote
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 3 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1e9cf4b

Please sign in to comment.