Skip to content

Commit

Permalink
Merge pull request #670 from AkihiroSuda/update-20220116
Browse files Browse the repository at this point in the history
update containerd (1.5.9), fuse-overlayfs (1.8), go-ipfs (0.11)
  • Loading branch information
AkihiroSuda committed Jan 7, 2022
2 parents 503ef87 + 004189c commit e785883
Show file tree
Hide file tree
Showing 5 changed files with 12 additions and 12 deletions.
8 changes: 4 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# Usage: `docker run -it --privileged <IMAGE>`. Make sure to add `-t` and `--privileged`.

# Basic deps
ARG CONTAINERD_VERSION=v1.5.8
ARG CONTAINERD_VERSION=v1.5.9
ARG RUNC_VERSION=v1.0.3
ARG CNI_PLUGINS_VERSION=v1.0.1

Expand All @@ -32,10 +32,10 @@ ARG IMGCRYPT_VERSION=v1.1.2
ARG ROOTLESSKIT_VERSION=v0.14.6
ARG SLIRP4NETNS_VERSION=v1.1.12
# Extra deps: FUSE-OverlayFS
ARG FUSE_OVERLAYFS_VERSION=v1.7.1
ARG FUSE_OVERLAYFS_VERSION=v1.8
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.4
# Extra deps: IPFS
ARG IPFS_VERSION=v0.10.0
ARG IPFS_VERSION=v0.11.0

# Test deps
ARG GO_VERSION=1.17
Expand Down Expand Up @@ -179,7 +179,7 @@ RUN fname="containerd-fuse-overlayfs-${CONTAINERD_FUSE_OVERLAYFS_VERSION/v}-${TA
ARG IPFS_VERSION
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 && \
grep "${fname}" "/SHA256SUMS.d/go-ipfs-${IPFS_VERSION}" | sha256sum -c && \
tmpout=$(mktemp -d) && \
tar -C ${tmpout} -xzf "${fname}" go-ipfs/ipfs && \
mv ${tmpout}/go-ipfs/ipfs /out/bin/ && \
Expand Down
5 changes: 0 additions & 5 deletions Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.7.1

This file was deleted.

5 changes: 5 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-v1.8
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
d248585cc72d56379c8fc5f34db8fe11d89a67113cd9172b440933bf9d707edd fuse-overlayfs-aarch64
d79e3396a279d8ef43388533346818409652aa311b3a6e1c4ecf7270c3626d6a fuse-overlayfs-armv7l
33cc513d4dc9787fe989ed9047f02846574585252d5d562d4cdeec9b84f80d88 fuse-overlayfs-ppc64le
f247f85e005daef78036088316224c1016d5e3583be2f2cdad16fdfdd1d89203 fuse-overlayfs-s390x
a3afe6e5fa47187e460cb8209d8a2b967af3efcb652083d800a4b3d09538e294 fuse-overlayfs-x86_64
3 changes: 0 additions & 3 deletions Dockerfile.d/SHA256SUMS.d/go-ipfs-v0.10.0

This file was deleted.

3 changes: 3 additions & 0 deletions Dockerfile.d/SHA256SUMS.d/go-ipfs-v0.11.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# From https://github.com/ipfs/go-ipfs/releases
aee3524b8467b94d3ba8950b8009e3c9bd56044dfffa208ec62e0c28711163ca go-ipfs_v0.11.0_linux-amd64.tar.gz
404bfec5158c1a019f84d5d848edd10cc95c6cd7327d0953fc78702bf0be980a go-ipfs_v0.11.0_linux-arm64.tar.gz

0 comments on commit e785883

Please sign in to comment.