diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index e1456461d02..78457657e53 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,7 +55,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - containerd: [1.4.5, 1.5.8, 1.6.0-beta.2] + containerd: [v1.4.5, v1.5.8, main] env: CONTAINERD_VERSION: "${{ matrix.containerd }}" steps: @@ -80,7 +80,7 @@ jobs: timeout-minutes: 30 strategy: matrix: - containerd: [1.4.5, 1.5.8, 1.6.0-beta.2] + containerd: [v1.4.5, v1.5.8, main] env: CONTAINERD_VERSION: "${{ matrix.containerd }}" steps: diff --git a/Dockerfile b/Dockerfile index 387f5902407..786c683009d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,40 +16,60 @@ # Usage: `docker run -it --privileged `. Make sure to add `-t` and `--privileged`. # Basic deps -ARG CONTAINERD_VERSION=1.5.8 -ARG RUNC_VERSION=1.0.2 -ARG CNI_PLUGINS_VERSION=1.0.1 +ARG CONTAINERD_VERSION=v1.5.8 +ARG RUNC_VERSION=v1.0.2 +ARG CNI_PLUGINS_VERSION=v1.0.1 # Extra deps: CNI isolation -ARG CNI_ISOLATION_VERSION=0.0.4 +ARG CNI_ISOLATION_VERSION=v0.0.4 # Extra deps: Build -ARG BUILDKIT_VERSION=0.9.3 +ARG BUILDKIT_VERSION=v0.9.3 # Extra deps: Lazy-pulling -ARG STARGZ_SNAPSHOTTER_VERSION=0.10.1 +ARG STARGZ_SNAPSHOTTER_VERSION=v0.10.1 # Extra deps: Encryption -ARG IMGCRYPT_VERSION=1.1.2 +ARG IMGCRYPT_VERSION=v1.1.2 # Extra deps: Rootless -ARG ROOTLESSKIT_VERSION=0.14.6 -ARG SLIRP4NETNS_VERSION=1.1.12 +ARG ROOTLESSKIT_VERSION=v0.14.6 +ARG SLIRP4NETNS_VERSION=v1.1.12 # Extra deps: FUSE-OverlayFS -ARG FUSE_OVERLAYFS_VERSION=1.7.1 -ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=1.0.4 +ARG FUSE_OVERLAYFS_VERSION=v1.7.1 +ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.4 # Extra deps: IPFS -ARG IPFS_VERSION=0.10.0 +ARG IPFS_VERSION=v0.10.0 # Test deps ARG GO_VERSION=1.17 ARG UBUNTU_VERSION=20.04 -ARG CONTAINERIZED_SYSTEMD_VERSION=0.1.1 +ARG CONTAINERIZED_SYSTEMD_VERSION=v0.1.1 -FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-buster AS build-runc +FROM --platform=$BUILDPLATFORM golang:${GO_VERSION}-bullseye AS build-base-debian +# libbtrfs: for containerd +# libseccomp: for runc RUN dpkg --add-architecture arm64 && \ apt-get update && \ - apt-get install -y crossbuild-essential-arm64 git libseccomp-dev libseccomp-dev:arm64 + apt-get install -y crossbuild-essential-arm64 git libbtrfs-dev libbtrfs-dev:arm64 libseccomp-dev libseccomp-dev:arm64 + +FROM build-base-debian AS build-containerd +ARG CONTAINERD_VERSION +RUN git clone https://github.com/containerd/containerd.git /go/src/github.com/containerd/containerd +WORKDIR /go/src/github.com/containerd/containerd +RUN git checkout ${CONTAINERD_VERSION} && \ + mkdir -p /out /out/amd64 /out/arm64 && \ + cp -a containerd.service /out +ENV CGO_ENABLED=1 +ENV GO111MODULE=off +# TODO: how to build containerd as static binaries? https://github.com/containerd/containerd/issues/6158 +RUN GOARCH=amd64 CC=x86_64-linux-gnu-gcc make && \ + cp -a bin/containerd bin/containerd-shim-runc-v2 bin/ctr /out/amd64 +RUN git clean -xfd +RUN GOARCH=arm64 CC=aarch64-linux-gnu-gcc make && \ + cp -a bin/containerd bin/containerd-shim-runc-v2 bin/ctr /out/arm64 + +FROM build-base-debian AS build-runc ARG RUNC_VERSION RUN git clone https://github.com/opencontainers/runc.git /go/src/github.com/opencontainers/runc WORKDIR /go/src/github.com/opencontainers/runc -RUN git checkout v${RUNC_VERSION} && \ +RUN git checkout ${RUNC_VERSION} && \ mkdir -p /out ENV CGO_ENABLED=1 RUN GOARCH=amd64 CC=x86_64-linux-gnu-gcc make static && \ @@ -79,46 +99,34 @@ RUN mkdir -p /out/share/doc/nerdctl-full && \ echo "# nerdctl (full distribution)" > /out/share/doc/nerdctl-full/README.md && \ echo "- nerdctl: $(cd /go/src/github.com/containerd/nerdctl && git describe --tags)" >> /out/share/doc/nerdctl-full/README.md ARG CONTAINERD_VERSION -# github.com/containerd/containerd provides arm64 binaries only for containerd >= 1.6 -RUN fname="containerd-${CONTAINERD_VERSION}.${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ - url="https://github.com/containerd/containerd/releases/download/v${CONTAINERD_VERSION}/${fname}" && \ - if echo "${CONTAINERD_VERSION}" | egrep -qe '^1\.[012345]'; then \ - url="https://github.com/kind-ci/containerd-nightlies/releases/download/containerd-${CONTAINERD_VERSION}/${fname}" ; \ - fi && \ - curl -o "${fname}" -fSL "${url}" && \ - curl -o "containerd.service" -fSL "https://raw.githubusercontent.com/containerd/containerd/v${CONTAINERD_VERSION}/containerd.service" && \ - grep "${fname}" "/SHA256SUMS.d/containerd-${CONTAINERD_VERSION}" | sha256sum -c - && \ - grep "containerd.service" "/SHA256SUMS.d/containerd-${CONTAINERD_VERSION}" | sha256sum -c - && \ - tar xzf "${fname}" -C /out && \ - rm -f "${fname}" /out/bin/containerd-shim /out/bin/containerd-shim-runc-v1 && \ - mkdir -p /out/lib/systemd/system && \ - mv containerd.service /out/lib/systemd/system/containerd.service && \ - echo "- containerd: v${CONTAINERD_VERSION}" >> /out/share/doc/nerdctl-full/README.md +COPY --from=build-containerd /out/${TARGETARCH:-amd64}/* /out/bin/ +COPY --from=build-containerd /out/containerd.service /out/lib/systemd/system/containerd.service +RUN echo "- containerd: ${CONTAINERD_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG RUNC_VERSION COPY --from=build-runc /out/runc.${TARGETARCH:-amd64} /out/bin/runc -RUN echo "- runc: v${RUNC_VERSION}" >> /out/share/doc/nerdctl-full/README.md +RUN echo "- runc: ${RUNC_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG CNI_PLUGINS_VERSION -RUN fname="cni-plugins-${TARGETOS:-linux}-${TARGETARCH:-amd64}-v${CNI_PLUGINS_VERSION}.tgz" && \ - curl -o "${fname}" -fSL "https://github.com/containernetworking/plugins/releases/download/v${CNI_PLUGINS_VERSION}/${fname}" && \ +RUN fname="cni-plugins-${TARGETOS:-linux}-${TARGETARCH:-amd64}-${CNI_PLUGINS_VERSION}.tgz" && \ + curl -o "${fname}" -fSL "https://github.com/containernetworking/plugins/releases/download/${CNI_PLUGINS_VERSION}/${fname}" && \ grep "${fname}" "/SHA256SUMS.d/cni-plugins-${CNI_PLUGINS_VERSION}" | sha256sum -c && \ mkdir -p /out/libexec/cni && \ tar xzf "${fname}" -C /out/libexec/cni && \ rm -f "${fname}" && \ - echo "- CNI plugins: v${CNI_PLUGINS_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- CNI plugins: ${CNI_PLUGINS_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG CNI_ISOLATION_VERSION RUN fname="cni-isolation-${TARGETARCH:-amd64}.tgz" && \ - curl -o "${fname}" -fSL "https://github.com/AkihiroSuda/cni-isolation/releases/download/v${CNI_ISOLATION_VERSION}/${fname}" && \ + curl -o "${fname}" -fSL "https://github.com/AkihiroSuda/cni-isolation/releases/download/${CNI_ISOLATION_VERSION}/${fname}" && \ grep "${fname}" "/SHA256SUMS.d/cni-isolation-${CNI_ISOLATION_VERSION}" | sha256sum -c && \ tar xzf "${fname}" -C /out/libexec/cni && \ rm -f "${fname}" && \ - echo "- CNI isolation plugin: v${CNI_ISOLATION_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- CNI isolation plugin: ${CNI_ISOLATION_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG BUILDKIT_VERSION -RUN fname="buildkit-v${BUILDKIT_VERSION}.${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ - curl -o "${fname}" -fSL "https://github.com/moby/buildkit/releases/download/v${BUILDKIT_VERSION}/${fname}" && \ +RUN fname="buildkit-${BUILDKIT_VERSION}.${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ + curl -o "${fname}" -fSL "https://github.com/moby/buildkit/releases/download/${BUILDKIT_VERSION}/${fname}" && \ grep "${fname}" "/SHA256SUMS.d/buildkit-${BUILDKIT_VERSION}" | sha256sum -c && \ tar xzf "${fname}" -C /out && \ rm -f "${fname}" /out/bin/buildkit-qemu-* /out/bin/buildkit-runc && \ - echo "- BuildKit: v${BUILDKIT_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- BuildKit: ${BUILDKIT_VERSION}" >> /out/share/doc/nerdctl-full/README.md # NOTE: github.com/moby/buildkit/examples/systemd is not included in BuildKit v0.8.x, will be included in v0.9.x RUN cd /out/lib/systemd/system && \ sedcomm='s@bin/containerd@bin/buildkitd@g; s@(Description|Documentation)=.*@@' && \ @@ -126,56 +134,56 @@ RUN cd /out/lib/systemd/system && \ echo "" >> buildkit.service && \ echo "# This file was converted from containerd.service, with \`sed -E '${sedcomm}'\`" >> buildkit.service ARG STARGZ_SNAPSHOTTER_VERSION -RUN fname="stargz-snapshotter-v${STARGZ_SNAPSHOTTER_VERSION}-${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ - curl -o "${fname}" -fSL "https://github.com/containerd/stargz-snapshotter/releases/download/v${STARGZ_SNAPSHOTTER_VERSION}/${fname}" && \ - curl -o "stargz-snapshotter.service" -fSL "https://raw.githubusercontent.com/containerd/stargz-snapshotter/v${STARGZ_SNAPSHOTTER_VERSION}/script/config/etc/systemd/system/stargz-snapshotter.service" && \ +RUN fname="stargz-snapshotter-${STARGZ_SNAPSHOTTER_VERSION}-${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ + curl -o "${fname}" -fSL "https://github.com/containerd/stargz-snapshotter/releases/download/${STARGZ_SNAPSHOTTER_VERSION}/${fname}" && \ + curl -o "stargz-snapshotter.service" -fSL "https://raw.githubusercontent.com/containerd/stargz-snapshotter/${STARGZ_SNAPSHOTTER_VERSION}/script/config/etc/systemd/system/stargz-snapshotter.service" && \ grep "${fname}" "/SHA256SUMS.d/stargz-snapshotter-${STARGZ_SNAPSHOTTER_VERSION}" | sha256sum -c - && \ grep "stargz-snapshotter.service" "/SHA256SUMS.d/stargz-snapshotter-${STARGZ_SNAPSHOTTER_VERSION}" | sha256sum -c - && \ tar xzf "${fname}" -C /out/bin && \ rm -f "${fname}" /out/bin/stargz-store && \ mv stargz-snapshotter.service /out/lib/systemd/system/stargz-snapshotter.service && \ - echo "- Stargz Snapshotter: v${STARGZ_SNAPSHOTTER_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- Stargz Snapshotter: ${STARGZ_SNAPSHOTTER_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG IMGCRYPT_VERSION RUN git clone https://github.com/containerd/imgcrypt.git /go/src/github.com/containerd/imgcrypt && \ cd /go/src/github.com/containerd/imgcrypt && \ CGO_ENABLED=0 make && DESTDIR=/out make install && \ - echo "- imgcrypt: v${IMGCRYPT_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- imgcrypt: ${IMGCRYPT_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG ROOTLESSKIT_VERSION RUN fname="rootlesskit-$(cat /target_uname_m).tar.gz" && \ - curl -o "${fname}" -fSL "https://github.com/rootless-containers/rootlesskit/releases/download/v${ROOTLESSKIT_VERSION}/${fname}" && \ + curl -o "${fname}" -fSL "https://github.com/rootless-containers/rootlesskit/releases/download/${ROOTLESSKIT_VERSION}/${fname}" && \ grep "${fname}" "/SHA256SUMS.d/rootlesskit-${ROOTLESSKIT_VERSION}" | sha256sum -c && \ tar xzf "${fname}" -C /out/bin && \ rm -f "${fname}" /out/bin/rootlesskit-docker-proxy && \ - echo "- RootlessKit: v${ROOTLESSKIT_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- RootlessKit: ${ROOTLESSKIT_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG SLIRP4NETNS_VERSION RUN fname="slirp4netns-$(cat /target_uname_m)" && \ - curl -o "${fname}" -fSL "https://github.com/rootless-containers/slirp4netns/releases/download/v${SLIRP4NETNS_VERSION}/${fname}" && \ + curl -o "${fname}" -fSL "https://github.com/rootless-containers/slirp4netns/releases/download/${SLIRP4NETNS_VERSION}/${fname}" && \ grep "${fname}" "/SHA256SUMS.d/slirp4netns-${SLIRP4NETNS_VERSION}" | sha256sum -c && \ mv "${fname}" /out/bin/slirp4netns && \ chmod +x /out/bin/slirp4netns && \ - echo "- slirp4netns: v${SLIRP4NETNS_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- slirp4netns: ${SLIRP4NETNS_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG FUSE_OVERLAYFS_VERSION RUN fname="fuse-overlayfs-$(cat /target_uname_m)" && \ - curl -o "${fname}" -fSL "https://github.com/containers/fuse-overlayfs/releases/download/v${FUSE_OVERLAYFS_VERSION}/${fname}" && \ + curl -o "${fname}" -fSL "https://github.com/containers/fuse-overlayfs/releases/download/${FUSE_OVERLAYFS_VERSION}/${fname}" && \ grep "${fname}" "/SHA256SUMS.d/fuse-overlayfs-${FUSE_OVERLAYFS_VERSION}" | sha256sum -c && \ mv "${fname}" /out/bin/fuse-overlayfs && \ chmod +x /out/bin/fuse-overlayfs && \ - echo "- fuse-overlayfs: v${FUSE_OVERLAYFS_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- fuse-overlayfs: ${FUSE_OVERLAYFS_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG CONTAINERD_FUSE_OVERLAYFS_VERSION -RUN fname="containerd-fuse-overlayfs-${CONTAINERD_FUSE_OVERLAYFS_VERSION}-${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ - curl -o "${fname}" -fSL "https://github.com/containerd/fuse-overlayfs-snapshotter/releases/download/v${CONTAINERD_FUSE_OVERLAYFS_VERSION}/${fname}" && \ +RUN fname="containerd-fuse-overlayfs-${CONTAINERD_FUSE_OVERLAYFS_VERSION/v}-${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ + curl -o "${fname}" -fSL "https://github.com/containerd/fuse-overlayfs-snapshotter/releases/download/${CONTAINERD_FUSE_OVERLAYFS_VERSION}/${fname}" && \ grep "${fname}" "/SHA256SUMS.d/containerd-fuse-overlayfs-${CONTAINERD_FUSE_OVERLAYFS_VERSION}" | sha256sum -c && \ tar xzf "${fname}" -C /out/bin && \ rm -f "${fname}" && \ - echo "- containerd-fuse-overlayfs: v${CONTAINERD_FUSE_OVERLAYFS_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- containerd-fuse-overlayfs: ${CONTAINERD_FUSE_OVERLAYFS_VERSION}" >> /out/share/doc/nerdctl-full/README.md ARG IPFS_VERSION -RUN fname="go-ipfs_v${IPFS_VERSION}_${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ - curl -o "${fname}" -fSL "https://github.com/ipfs/go-ipfs/releases/download/v${IPFS_VERSION}/${fname}" && \ +RUN fname="go-ipfs_${IPFS_VERSION}_${TARGETOS:-linux}-${TARGETARCH:-amd64}.tar.gz" && \ + curl -o "${fname}" -fSL "https://github.com/ipfs/go-ipfs/releases/download/${IPFS_VERSION}/${fname}" && \ grep "${fname}" "/SHA256SUMS.d/go-ipfs-${IPFS_VERSION}" | sha512sum -c && \ tmpout=$(mktemp -d) && \ tar -C ${tmpout} -xzf "${fname}" go-ipfs/ipfs && \ mv ${tmpout}/go-ipfs/ipfs /out/bin/ && \ - echo "- IPFS: v${IPFS_VERSION}" >> /out/share/doc/nerdctl-full/README.md + echo "- IPFS: ${IPFS_VERSION}" >> /out/share/doc/nerdctl-full/README.md RUN echo "" >> /out/share/doc/nerdctl-full/README.md && \ echo "## License" >> /out/share/doc/nerdctl-full/README.md && \ @@ -201,7 +209,7 @@ RUN apt-get update && \ dbus systemd systemd-sysv \ fuse3 ARG CONTAINERIZED_SYSTEMD_VERSION -RUN curl -L -o /docker-entrypoint.sh https://raw.githubusercontent.com/AkihiroSuda/containerized-systemd/v${CONTAINERIZED_SYSTEMD_VERSION}/docker-entrypoint.sh && \ +RUN curl -L -o /docker-entrypoint.sh https://raw.githubusercontent.com/AkihiroSuda/containerized-systemd/${CONTAINERIZED_SYSTEMD_VERSION}/docker-entrypoint.sh && \ chmod +x /docker-entrypoint.sh COPY --from=out-full / /usr/local/ RUN perl -pi -e 's/multi-user.target/docker-entrypoint.target/g' /usr/local/lib/systemd/system/*.service && \ diff --git a/Dockerfile.d/SHA256SUMS.d/buildkit-0.9.3 b/Dockerfile.d/SHA256SUMS.d/buildkit-v0.9.3 similarity index 100% rename from Dockerfile.d/SHA256SUMS.d/buildkit-0.9.3 rename to Dockerfile.d/SHA256SUMS.d/buildkit-v0.9.3 diff --git a/Dockerfile.d/SHA256SUMS.d/cni-isolation-0.0.4 b/Dockerfile.d/SHA256SUMS.d/cni-isolation-v0.0.4 similarity index 100% rename from Dockerfile.d/SHA256SUMS.d/cni-isolation-0.0.4 rename to Dockerfile.d/SHA256SUMS.d/cni-isolation-v0.0.4 diff --git a/Dockerfile.d/SHA256SUMS.d/cni-plugins-1.0.1 b/Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.0.1 similarity index 100% rename from Dockerfile.d/SHA256SUMS.d/cni-plugins-1.0.1 rename to Dockerfile.d/SHA256SUMS.d/cni-plugins-v1.0.1 diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-1.4.5 b/Dockerfile.d/SHA256SUMS.d/containerd-1.4.5 deleted file mode 100644 index f609ea59681..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/containerd-1.4.5 +++ /dev/null @@ -1,4 +0,0 @@ -# From https://github.com/kind-ci/containerd-nightlies/releases/tag/containerd-1.4.5 -cb167af301d61a3622a78558616b69494613df09a5b2ed0334d8009545ab1b54 containerd-1.4.5.linux-amd64.tar.gz -b2a1a5babab4fab0b58d74281973455260be6a2122b428578bb99638a372a019 containerd-1.4.5.linux-arm64.tar.gz -5ed152bbf73b86c5c290f3755ecf7373a282866b7e1407a4102d5be36026a288 containerd.service diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.8 b/Dockerfile.d/SHA256SUMS.d/containerd-1.5.8 deleted file mode 100644 index 3d679d9919a..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.8 +++ /dev/null @@ -1,4 +0,0 @@ -# From https://github.com/kind-ci/containerd-nightlies/releases/tag/containerd-1.5.8 -6da635dd2a09da3207bd9ff3d1c98f293fc5683cd0d9d4cefd613a417785100d containerd-1.5.8.linux-amd64.tar.gz -dceeb64a1055c47e0501f9253b0f46451c0431a119a0f560f8514ac14141ae95 containerd-1.5.8.linux-arm64.tar.gz -16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31 containerd.service diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-1.6.0-beta.2 b/Dockerfile.d/SHA256SUMS.d/containerd-1.6.0-beta.2 deleted file mode 100644 index c50c1ed828d..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/containerd-1.6.0-beta.2 +++ /dev/null @@ -1,4 +0,0 @@ -# From https://github.com/containerd/containerd/releases/tag/v1.6.0-beta.2 -a2d45b46f9bf87d3d83938bc5648692badfca374ac00e083936c1a0922e9fa77 containerd-1.6.0-beta.2.linux-amd64.tar.gz -20e990b378933292589fa2f474454a51e0ed65c95e682d138967f7369507c77a containerd-1.6.0-beta.2.linux-arm64.tar.gz -16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31 containerd.service diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-1.0.4 b/Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.4 similarity index 100% rename from Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-1.0.4 rename to Dockerfile.d/SHA256SUMS.d/containerd-fuse-overlayfs-v1.0.4 diff --git a/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.7.1 b/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.7.1 similarity index 100% rename from Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.7.1 rename to Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.7.1 diff --git a/Dockerfile.d/SHA256SUMS.d/go-ipfs-0.10.0 b/Dockerfile.d/SHA256SUMS.d/go-ipfs-v0.10.0 similarity index 100% rename from Dockerfile.d/SHA256SUMS.d/go-ipfs-0.10.0 rename to Dockerfile.d/SHA256SUMS.d/go-ipfs-v0.10.0 diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.6 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-v0.14.6 similarity index 100% rename from Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.6 rename to Dockerfile.d/SHA256SUMS.d/rootlesskit-v0.14.6 diff --git a/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.12 b/Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.1.12 similarity index 100% rename from Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.12 rename to Dockerfile.d/SHA256SUMS.d/slirp4netns-v1.1.12 diff --git a/Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-0.10.1 b/Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.10.1 similarity index 100% rename from Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-0.10.1 rename to Dockerfile.d/SHA256SUMS.d/stargz-snapshotter-v0.10.1