Skip to content

Commit 475f0d0

Browse files
AkihiroSudaAkihiroSuda
authored
Merge pull request #1346 from AkihiroSuda/dev
update runc (1.1.4), BuildKit (0.10.4), Kubo (0.15.0), bypass4netns (0.2.3)
2 parents 4d344cf + e28ca33 commit 475f0d0

8 files changed

Lines changed: 23 additions & 20 deletions

File tree

‎Dockerfile‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,11 @@
1919

2020
# Basic deps
2121
ARG CONTAINERD_VERSION=v1.6.8
22-
ARG RUNC_VERSION=v1.1.3
22+
ARG RUNC_VERSION=v1.1.4
2323
ARG CNI_PLUGINS_VERSION=v1.1.1
2424

2525
# Extra deps: Build
26-
ARG BUILDKIT_VERSION=v0.10.3
26+
ARG BUILDKIT_VERSION=v0.10.4
2727
# Extra deps: Lazy-pulling
2828
ARG STARGZ_SNAPSHOTTER_VERSION=v0.12.0
2929
# Extra deps: Encryption
@@ -32,12 +32,12 @@ ARG IMGCRYPT_VERSION=v1.1.6
3232
ARG ROOTLESSKIT_VERSION=v1.0.1
3333
ARG SLIRP4NETNS_VERSION=v1.2.0
3434
# Extra deps: bypass4netns
35-
ARG BYPASS4NETNS_VERSION=v0.2.2
35+
ARG BYPASS4NETNS_VERSION=v0.2.3
3636
# Extra deps: FUSE-OverlayFS
3737
ARG FUSE_OVERLAYFS_VERSION=v1.9
3838
ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=v1.0.4
3939
# Extra deps: IPFS
40-
ARG KUBO_VERSION=v0.14.0
40+
ARG KUBO_VERSION=v0.15.0
4141
# Extra deps: Init
4242
ARG TINI_VERSION=v0.19.0
4343
# Extra deps: Debug

‎Dockerfile.d/SHA256SUMS.d/buildkit-v0.10.3‎

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎Dockerfile.d/SHA256SUMS.d/buildkit-v0.10.4‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
b9bfbdc116ff51ce13378a614c945752f8b53f7bb08434f620ae0237f3c1ac30 buildkit-v0.10.4.linux-amd64.tar.gz
2+
16e09545cba03c7edd509b3a6692b1c61ad36baf4791d2adb148ed87d26afa9e buildkit-v0.10.4.linux-arm64.tar.gz

‎Dockerfile.d/SHA256SUMS.d/kubo-v0.14.0‎

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎Dockerfile.d/SHA256SUMS.d/kubo-v0.15.0‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# From https://github.com/ipfs/kubo/releases
2+
c5ef6c393df26007e10e48e009d427f5bdbab14cbc82461c927529a3b840924d kubo_v0.15.0_linux-amd64.tar.gz
3+
f6c730ec2a02244ea7fcd906244844cb5ca7025bc385528a913104189a82ca00 kubo_v0.15.0_linux-arm64.tar.gz

‎examples/nerdctl-ipfs-registry-kubernetes/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
Usage:
44
- Generate `bootstrap.yaml` by executing `bootstrap.yaml.sh` (e.g. `./bootstrap.yaml.sh > ${DIR_LOCATION}/bootstrap.yaml`)
5-
- [`ipfs-swarm-key-gen`](https://github.com/Kubuxu/go-ipfs-swarm-key-gen) is required (see https://github.com/ipfs/kubo/blob/v0.14.0/docs/experimental-features.md#private-networks)
5+
- [`ipfs-swarm-key-gen`](https://github.com/Kubuxu/go-ipfs-swarm-key-gen) is required (see https://github.com/ipfs/kubo/blob/v0.15.0/docs/experimental-features.md#private-networks)
66
- Deploy `bootstrap.yaml` and `nerdctl-ipfs-registry.yaml` (e.g. using `kubectl apply`)
77
- Make sure nodes contain containerd >= v1.5.8
88

‎go.mod‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ require (
3737
github.com/multiformats/go-multiaddr v0.6.0
3838
github.com/opencontainers/go-digest v1.0.0
3939
github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1
40-
github.com/opencontainers/runtime-spec v1.0.3-0.20220311020903-6969a0a09ab1
40+
github.com/opencontainers/runtime-spec v1.0.3-0.20220809190508-9ee22abf867e
4141
github.com/pelletier/go-toml v1.9.5
42-
github.com/rootless-containers/bypass4netns v0.2.2
42+
github.com/rootless-containers/bypass4netns v0.2.3
4343
github.com/rootless-containers/rootlesskit v1.0.1
4444
github.com/sirupsen/logrus v1.9.0
4545
github.com/spf13/cobra v1.5.0
@@ -50,7 +50,7 @@ require (
5050
golang.org/x/crypto v0.0.0-20220525230936-793ad666bf5e
5151
golang.org/x/net v0.0.0-20220615171555-694bf12d69de
5252
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
53-
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab
53+
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6
5454
golang.org/x/term v0.0.0-20220526004731-065cf7ba2467
5555
gopkg.in/yaml.v3 v3.0.1
5656
gotest.tools/v3 v3.3.0
@@ -138,7 +138,7 @@ require (
138138
github.com/multiformats/go-multicodec v0.4.1 // indirect
139139
github.com/multiformats/go-multihash v0.1.0 // indirect
140140
github.com/multiformats/go-varint v0.0.6 // indirect
141-
github.com/opencontainers/runc v1.1.2 // indirect
141+
github.com/opencontainers/runc v1.1.4 // indirect
142142
github.com/opencontainers/runtime-tools v0.0.0-20190417131837-cd1349b7c47e // indirect
143143
github.com/opencontainers/selinux v1.10.1 // indirect
144144
github.com/opentracing/opentracing-go v1.2.0 // indirect

‎go.sum‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1218,13 +1218,14 @@ github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1 h1:9iF
12181218
github.com/opencontainers/image-spec v1.0.3-0.20220303224323-02efb9a75ee1/go.mod h1:K/JAU0m27RFhDRX4PcFdIKntROP6y5Ed6O91aZYDQfs=
12191219
github.com/opencontainers/runc v1.0.2/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
12201220
github.com/opencontainers/runc v1.0.3/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0=
1221-
github.com/opencontainers/runc v1.1.2 h1:2VSZwLx5k/BfsBxMMipG/LYUnmqOD/BPkIVgQUcTlLw=
12221221
github.com/opencontainers/runc v1.1.2/go.mod h1:Tj1hFw6eFWp/o33uxGf5yF2BX5yz2Z6iptFpuvbbKqc=
1222+
github.com/opencontainers/runc v1.1.4 h1:nRCz/8sKg6K6jgYAFLDlXzPeITBZJyX28DBVhWD+5dg=
1223+
github.com/opencontainers/runc v1.1.4/go.mod h1:1J5XiS+vdZ3wCyZybsuxXZWGrgSr8fFJHLXuG2PsnNg=
12231224
github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
12241225
github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
12251226
github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
1226-
github.com/opencontainers/runtime-spec v1.0.3-0.20220311020903-6969a0a09ab1 h1:DUNsiyVYdBOR9Ztzo4/AxcT2KsIV6apA0NvF2gZTXVQ=
1227-
github.com/opencontainers/runtime-spec v1.0.3-0.20220311020903-6969a0a09ab1/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
1227+
github.com/opencontainers/runtime-spec v1.0.3-0.20220809190508-9ee22abf867e h1:UcO9GCY5ehlR0PK20BXQ+nlb8J2LNXlwm97PryxbIek=
1228+
github.com/opencontainers/runtime-spec v1.0.3-0.20220809190508-9ee22abf867e/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0=
12281229
github.com/opencontainers/runtime-tools v0.0.0-20190417131837-cd1349b7c47e h1:2Tg49TNXSTIsX8AAtmo1aQ1IbfnoUFzkOp7p2iWygtc=
12291230
github.com/opencontainers/runtime-tools v0.0.0-20190417131837-cd1349b7c47e/go.mod h1:r3f7wjNzSs2extwzU3Y+6pKfobzPh+kKFJ3ofN+3nfs=
12301231
github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8=
@@ -1322,8 +1323,8 @@ github.com/rcrowley/go-metrics v0.0.0-20181016184325-3113b8401b8a/go.mod h1:bCqn
13221323
github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
13231324
github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
13241325
github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
1325-
github.com/rootless-containers/bypass4netns v0.2.2 h1:Mq0+PU1Eocyuf1kRxNH7cK7E/4hyo8tMfvVNIvyoJj8=
1326-
github.com/rootless-containers/bypass4netns v0.2.2/go.mod h1:YOVRdnzEO3JHcxvobbHdUowG+98z0SIgBFQ6KqAQo9U=
1326+
github.com/rootless-containers/bypass4netns v0.2.3 h1:mZbzrC3Sz3o1F6Q8NAJmohbMqASUFdQo1AecxixwQl0=
1327+
github.com/rootless-containers/bypass4netns v0.2.3/go.mod h1:IXHPjkQlJRygNBCN0hSSR3ITX6kDKr3aAaGHx6APd+g=
13271328
github.com/rootless-containers/rootlesskit v1.0.1 h1:jepqW1txFSowKSMAEkVhWH3Oa1TCY9S400MVYe/6Iro=
13281329
github.com/rootless-containers/rootlesskit v1.0.1/go.mod h1:t2UAiYagxrJ+wmpFAUIZPcqsm4k2B7ve6g7lILKbloc=
13291330
github.com/rs/cors v1.7.0 h1:+88SsELBHx5r+hZ8TCkggzSstaWNbDvThkVK8H6f9ik=
@@ -1342,6 +1343,7 @@ github.com/sclevine/spec v1.2.0/go.mod h1:W4J29eT/Kzv7/b9IWLB055Z+qvVC9vt0Arko24
13421343
github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
13431344
github.com/seccomp/libseccomp-golang v0.9.1/go.mod h1:GbW5+tmTXfcxTToHLXlScSlAvWlF4P2Ca7zGrPiEpWo=
13441345
github.com/seccomp/libseccomp-golang v0.9.2-0.20210429002308-3879420cc921/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
1346+
github.com/seccomp/libseccomp-golang v0.9.2-0.20220502022130-f33da4d89646/go.mod h1:JA8cRccbGaA1s33RQf7Y1+q9gHmZX1yB/z9WDN1C6fg=
13451347
github.com/sergi/go-diff v1.0.0/go.mod h1:0CfEIISq7TuYL3j771MWULgwwjU+GofnZX9QAmXWZgo=
13461348
github.com/shurcooL/component v0.0.0-20170202220835-f88ec8f54cc4/go.mod h1:XhFIlyj5a1fBNx5aJTbKoIq0mNaPvOagO+HjB3EtxrY=
13471349
github.com/shurcooL/events v0.0.0-20181021180414-410e4ca65f48/go.mod h1:5u70Mqkb5O5cxEA8nxTsgrgLehJeAw6Oc4Ab1c/P1HM=
@@ -1865,8 +1867,9 @@ golang.org/x/sys v0.0.0-20220209214540-3681064d5158/go.mod h1:oPkhp1MJrh7nUepCBc
18651867
golang.org/x/sys v0.0.0-20220405210540-1e041c57c461/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
18661868
golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
18671869
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1868-
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
18691870
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
1871+
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6 h1:Sx/u41w+OwrInGdEckYmEuU5gHoGSL4QbDz3S9s6j4U=
1872+
golang.org/x/sys v0.0.0-20220818161305-2296e01440c6/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
18701873
golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod h1:Nr5EML6q2oocZ2LXRh80K7BxOlk5/8JxuGnuhpl+muw=
18711874
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
18721875
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

0 commit comments

Comments
 (0)