From fa7adca3fb33b014c0aa1800bea33cd32ff43414 Mon Sep 17 00:00:00 2001 From: Kohei Tokunaga Date: Fri, 3 Mar 2023 18:53:27 +0900 Subject: [PATCH 1/2] bump up containerd to v1.7.0-rc.1 Signed-off-by: Kohei Tokunaga --- Dockerfile | 2 +- cmd/go.mod | 2 +- cmd/go.sum | 4 ++-- go.mod | 4 ++-- go.sum | 8 ++++---- ipfs/go.mod | 2 +- ipfs/go.sum | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6ed9af064..da99821c9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG CONTAINERD_VERSION=v1.7.0-rc.0 +ARG CONTAINERD_VERSION=v1.7.0-rc.1 ARG RUNC_VERSION=v1.1.4 ARG CNI_PLUGINS_VERSION=v1.1.1 ARG NERDCTL_VERSION=1.1.0 diff --git a/cmd/go.mod b/cmd/go.mod index 783067779..b678bcb5b 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -3,7 +3,7 @@ module github.com/containerd/stargz-snapshotter/cmd go 1.19 require ( - github.com/containerd/containerd v1.7.0-rc.0 + github.com/containerd/containerd v1.7.0-rc.1 github.com/containerd/go-cni v1.1.9 github.com/containerd/stargz-snapshotter v0.14.1 github.com/containerd/stargz-snapshotter/estargz v0.14.1 diff --git a/cmd/go.sum b/cmd/go.sum index ac6841962..23470da52 100644 --- a/cmd/go.sum +++ b/cmd/go.sum @@ -72,8 +72,8 @@ github.com/containerd/cgroups/v3 v3.0.0/go.mod h1:/vtwk1VXrtoa5AaZLkypuOJgA/6DyP github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.0-rc.0 h1:rGS4anSqNDBu1Qwv41NWlf7C2j0t/DhJCE5/5rks4cE= -github.com/containerd/containerd v1.7.0-rc.0/go.mod h1:8pPKw+uap/Sj2ljNRdsPaToszoscMu9sPgjU8+3DU8k= +github.com/containerd/containerd v1.7.0-rc.1 h1:Picl2mIO3fwX92iptM308gfLQ2LlxMBtulG/CrH0YC0= +github.com/containerd/containerd v1.7.0-rc.1/go.mod h1:7MbZqMXy9721b34Q0h8E8prpPN55Zu3SKs6K4jTxYFQ= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/fifo v1.0.0 h1:6PirWBr9/L7GDamKr+XM0IeUFXu5mf3M/BPpH9gaLBU= diff --git a/go.mod b/go.mod index 41130eb94..39edd2759 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.19 require ( github.com/containerd/console v1.0.3 - github.com/containerd/containerd v1.7.0-rc.0 + github.com/containerd/containerd v1.7.0-rc.1 github.com/containerd/continuity v0.3.0 github.com/containerd/stargz-snapshotter/estargz v0.14.1 github.com/docker/cli v23.0.1+incompatible @@ -41,7 +41,7 @@ require ( github.com/containerd/cgroups v1.1.0 // indirect github.com/containerd/cgroups/v3 v3.0.0 // indirect github.com/containerd/fifo v1.0.0 // indirect - github.com/containerd/go-cni v1.1.9-0.20230211172349-6603d5bd8941 // indirect + github.com/containerd/go-cni v1.1.9 // indirect github.com/containerd/ttrpc v1.1.1-0.20230127163717-32fab2374638 // indirect github.com/containerd/typeurl/v2 v2.1.0 // indirect github.com/containernetworking/cni v1.1.2 // indirect diff --git a/go.sum b/go.sum index 31298fedc..73c5aafe7 100644 --- a/go.sum +++ b/go.sum @@ -69,14 +69,14 @@ github.com/containerd/cgroups/v3 v3.0.0 h1:EzSABvwGkHxdwtZsNBWl8M3iNh+0lMJb/fmty github.com/containerd/cgroups/v3 v3.0.0/go.mod h1:/vtwk1VXrtoa5AaZLkypuOJgA/6DyPMZHJPGQNtlHnw= github.com/containerd/console v1.0.3 h1:lIr7SlA5PxZyMV30bDW0MGbiOPXwc63yRuCP0ARubLw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.0-rc.0 h1:rGS4anSqNDBu1Qwv41NWlf7C2j0t/DhJCE5/5rks4cE= -github.com/containerd/containerd v1.7.0-rc.0/go.mod h1:8pPKw+uap/Sj2ljNRdsPaToszoscMu9sPgjU8+3DU8k= +github.com/containerd/containerd v1.7.0-rc.1 h1:Picl2mIO3fwX92iptM308gfLQ2LlxMBtulG/CrH0YC0= +github.com/containerd/containerd v1.7.0-rc.1/go.mod h1:7MbZqMXy9721b34Q0h8E8prpPN55Zu3SKs6K4jTxYFQ= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/fifo v1.0.0 h1:6PirWBr9/L7GDamKr+XM0IeUFXu5mf3M/BPpH9gaLBU= github.com/containerd/fifo v1.0.0/go.mod h1:ocF/ME1SX5b1AOlWi9r677YJmCPSwwWnQ9O123vzpE4= -github.com/containerd/go-cni v1.1.9-0.20230211172349-6603d5bd8941 h1:5dA/FSSk54LtYPYcNGZfzgbmHOWYWjSjfZFGEO3SbRQ= -github.com/containerd/go-cni v1.1.9-0.20230211172349-6603d5bd8941/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM= +github.com/containerd/go-cni v1.1.9 h1:ORi7P1dYzCwVM6XPN4n3CbkuOx/NZ2DOqy+SHRdo9rU= +github.com/containerd/go-cni v1.1.9/go.mod h1:XYrZJ1d5W6E2VOvjffL3IZq0Dz6bsVlERHbekNK90PM= github.com/containerd/ttrpc v1.1.1-0.20230127163717-32fab2374638 h1:8eVDsirmav+3F0gKY9q/NboZuAqLg++AzW5/HZKKUY4= github.com/containerd/ttrpc v1.1.1-0.20230127163717-32fab2374638/go.mod h1:YYyNVhZrTMiaf51Vj6WhAJqJw+vl/nzABhj8pWrzle4= github.com/containerd/typeurl/v2 v2.1.0 h1:yNAhJvbNEANt7ck48IlEGOxP7YAp6LLpGn5jZACDNIE= diff --git a/ipfs/go.mod b/ipfs/go.mod index 16e31fed1..987bf896a 100644 --- a/ipfs/go.mod +++ b/ipfs/go.mod @@ -3,7 +3,7 @@ module github.com/containerd/stargz-snapshotter/ipfs go 1.19 require ( - github.com/containerd/containerd v1.7.0-rc.0 + github.com/containerd/containerd v1.7.0-rc.1 github.com/mitchellh/go-homedir v1.1.0 github.com/multiformats/go-multiaddr v0.8.0 github.com/opencontainers/image-spec v1.1.0-rc2.0.20221005185240-3a7f492d3f1b diff --git a/ipfs/go.sum b/ipfs/go.sum index 3a69cce70..4f3c2e7d8 100644 --- a/ipfs/go.sum +++ b/ipfs/go.sum @@ -16,8 +16,8 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX github.com/containerd/cgroups v1.1.0 h1:v8rEWFl6EoqHB+swVNjVoCJE8o3jX7e8nqBGPLaDFBM= github.com/containerd/cgroups v1.1.0/go.mod h1:6ppBcbh/NOOUU+dMKrykgaBnK9lCIBxHqJDGwsa1mIw= github.com/containerd/console v1.0.3/go.mod h1:7LqA/THxQ86k76b8c/EMSiaJ3h1eZkMkXar0TQ1gf3U= -github.com/containerd/containerd v1.7.0-rc.0 h1:rGS4anSqNDBu1Qwv41NWlf7C2j0t/DhJCE5/5rks4cE= -github.com/containerd/containerd v1.7.0-rc.0/go.mod h1:8pPKw+uap/Sj2ljNRdsPaToszoscMu9sPgjU8+3DU8k= +github.com/containerd/containerd v1.7.0-rc.1 h1:Picl2mIO3fwX92iptM308gfLQ2LlxMBtulG/CrH0YC0= +github.com/containerd/containerd v1.7.0-rc.1/go.mod h1:7MbZqMXy9721b34Q0h8E8prpPN55Zu3SKs6K4jTxYFQ= github.com/containerd/continuity v0.3.0 h1:nisirsYROK15TAMVukJOUyGJjz4BNQJBVsNvAXZJ/eg= github.com/containerd/continuity v0.3.0/go.mod h1:wJEAIwKOm/pBZuBd0JmeTvnLquTB1Ag8espWhkykbPM= github.com/containerd/fifo v1.0.0 h1:6PirWBr9/L7GDamKr+XM0IeUFXu5mf3M/BPpH9gaLBU= From 8bf7ddd3b9229280b2d20356d1831eb91a854722 Mon Sep 17 00:00:00 2001 From: Kohei Tokunaga Date: Fri, 3 Mar 2023 18:54:38 +0900 Subject: [PATCH 2/2] Prepare for v0.14.2 Signed-off-by: Kohei Tokunaga --- cmd/go.mod | 6 +++--- go.mod | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmd/go.mod b/cmd/go.mod index b678bcb5b..0f1cbee92 100644 --- a/cmd/go.mod +++ b/cmd/go.mod @@ -5,9 +5,9 @@ go 1.19 require ( github.com/containerd/containerd v1.7.0-rc.1 github.com/containerd/go-cni v1.1.9 - github.com/containerd/stargz-snapshotter v0.14.1 - github.com/containerd/stargz-snapshotter/estargz v0.14.1 - github.com/containerd/stargz-snapshotter/ipfs v0.14.1 + github.com/containerd/stargz-snapshotter v0.14.2 + github.com/containerd/stargz-snapshotter/estargz v0.14.2 + github.com/containerd/stargz-snapshotter/ipfs v0.14.2 github.com/coreos/go-systemd/v22 v22.5.0 github.com/docker/go-metrics v0.0.1 github.com/goccy/go-json v0.10.0 diff --git a/go.mod b/go.mod index 39edd2759..fc95e4746 100644 --- a/go.mod +++ b/go.mod @@ -6,7 +6,7 @@ require ( github.com/containerd/console v1.0.3 github.com/containerd/containerd v1.7.0-rc.1 github.com/containerd/continuity v0.3.0 - github.com/containerd/stargz-snapshotter/estargz v0.14.1 + github.com/containerd/stargz-snapshotter/estargz v0.14.2 github.com/docker/cli v23.0.1+incompatible github.com/docker/go-metrics v0.0.1 github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da