From 0223ab960d5895407d88f2a1b24e34e7f7c8a315 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 13 Apr 2023 21:10:35 +0900 Subject: [PATCH 1/3] go.mod: fix format Signed-off-by: Akihiro Suda --- go.mod | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go.mod b/go.mod index cc1f5c51713..f0811314dc1 100644 --- a/go.mod +++ b/go.mod @@ -21,6 +21,7 @@ require ( github.com/containerd/typeurl/v2 v2.1.0 github.com/containernetworking/cni v1.1.2 github.com/containernetworking/plugins v1.2.0 + github.com/coreos/go-iptables v0.6.0 github.com/coreos/go-systemd/v22 v22.5.0 github.com/cyphar/filepath-securejoin v0.2.3 github.com/docker/cli v23.0.3+incompatible @@ -68,7 +69,6 @@ require ( github.com/containerd/ttrpc v1.2.1 // indirect github.com/containerd/typeurl v1.0.3-0.20220422153119-7f6e6d160d67 // indirect github.com/containers/ocicrypt v1.1.6 // indirect - github.com/coreos/go-iptables v0.6.0 github.com/distribution/distribution/v3 v3.0.0-20230214150026-36d8c594d7aa // indirect github.com/djherbis/times v1.5.0 // indirect github.com/docker/docker-credential-helpers v0.7.0 // indirect From 21f7bd42913f55eec60768365c6e304f4d376e57 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 13 Apr 2023 21:12:04 +0900 Subject: [PATCH 2/3] update nydus (2.2.0) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index ac0cbad5277..dfbd25aa976 100644 --- a/Dockerfile +++ b/Dockerfile @@ -27,7 +27,7 @@ ARG BUILDKIT_VERSION=v0.11.5 # Extra deps: Lazy-pulling ARG STARGZ_SNAPSHOTTER_VERSION=v0.14.3 # Extra deps: Nydus Lazy-pulling -ARG NYDUS_VERSION=v2.1.4 +ARG NYDUS_VERSION=v2.2.0 # Extra deps: Encryption ARG IMGCRYPT_VERSION=v1.1.7 # Extra deps: Rootless From 883f00b3c69727b608e258d7f1db4eec8f521d26 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Thu, 13 Apr 2023 21:14:10 +0900 Subject: [PATCH 3/3] update kubo (0.19.1) Signed-off-by: Akihiro Suda --- Dockerfile | 2 +- Dockerfile.d/SHA256SUMS.d/kubo-v0.19.0 | 3 --- Dockerfile.d/SHA256SUMS.d/kubo-v0.19.1 | 3 +++ 3 files changed, 4 insertions(+), 4 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/kubo-v0.19.0 create mode 100644 Dockerfile.d/SHA256SUMS.d/kubo-v0.19.1 diff --git a/Dockerfile b/Dockerfile index dfbd25aa976..8709e6b92cb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -39,7 +39,7 @@ ARG BYPASS4NETNS_VERSION=v0.3.0 ARG FUSE_OVERLAYFS_VERSION=v1.11 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.5 # Extra deps: IPFS -ARG KUBO_VERSION=v0.19.0 +ARG KUBO_VERSION=v0.19.1 # Extra deps: Init ARG TINI_VERSION=v0.19.0 # Extra deps: Debug diff --git a/Dockerfile.d/SHA256SUMS.d/kubo-v0.19.0 b/Dockerfile.d/SHA256SUMS.d/kubo-v0.19.0 deleted file mode 100644 index 94e3e4a236d..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/kubo-v0.19.0 +++ /dev/null @@ -1,3 +0,0 @@ -# From https://github.com/ipfs/kubo/releases -db70f8ceaf5a475025749266bb0529346dc4c60930d40bc80c87f220be49e448 kubo_v0.19.0_linux-amd64.tar.gz -9d9efb92efaf144645a7c40080d9fd2f234b889d325b3b514b16241b1d4e5b7e kubo_v0.19.0_linux-arm64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/kubo-v0.19.1 b/Dockerfile.d/SHA256SUMS.d/kubo-v0.19.1 new file mode 100644 index 00000000000..3de371db5bf --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/kubo-v0.19.1 @@ -0,0 +1,3 @@ +# From https://github.com/ipfs/kubo/releases +a15b3ec9c83833b42e807de31a27cd48a42e0865512c3968120f3ab33507737e kubo_v0.19.1_linux-amd64.tar.gz +78d0705ebde17de3c04396ffe085de5f35cbc118c508749c2216443f3f6ba332 kubo_v0.19.1_linux-arm64.tar.gz