From 7d3dd48100fd25466c998c30cdd4e1ab9e925b11 Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 3 Aug 2021 18:41:49 +0900 Subject: [PATCH] update containerd, slirp4netns, fuse-overlayfs, and RootlessKit - containerd v1.5.5 - slirp4netns v1.1.12 - fuse-overlayfs v1.7 - RootlessKit v0.14.4 Signed-off-by: Akihiro Suda --- .github/workflows/test.yml | 4 +- Dockerfile | 8 ++-- Dockerfile.d/SHA256SUMS.d/containerd-1.5.4 | 4 -- Dockerfile.d/SHA256SUMS.d/containerd-1.5.5 | 4 ++ Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.6 | 5 --- Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.7 | 5 +++ Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.2 | 5 --- Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.4 | 5 +++ Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.11 | 5 --- Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.12 | 5 +++ go.mod | 10 +++-- go.sum | 40 +++++++++++--------- 12 files changed, 54 insertions(+), 46 deletions(-) delete mode 100644 Dockerfile.d/SHA256SUMS.d/containerd-1.5.4 create mode 100644 Dockerfile.d/SHA256SUMS.d/containerd-1.5.5 delete mode 100644 Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.6 create mode 100644 Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.7 delete mode 100644 Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.2 create mode 100644 Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.4 delete mode 100644 Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.11 create mode 100644 Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.12 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index ab125d35369..8e9f1e44dd7 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -55,7 +55,7 @@ jobs: timeout-minutes: 20 strategy: matrix: - containerd: [1.4.5, 1.5.4] + containerd: [1.4.5, 1.5.5] env: CONTAINERD_VERSION: "${{ matrix.containerd }}" steps: @@ -78,7 +78,7 @@ jobs: timeout-minutes: 20 strategy: matrix: - containerd: [1.4.5, 1.5.4] + containerd: [1.4.5, 1.5.5] env: CONTAINERD_VERSION: "${{ matrix.containerd }}" steps: diff --git a/Dockerfile b/Dockerfile index 8457bf50187..cd744a9f051 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ # Usage: `docker run -it --privileged `. Make sure to add `-t` and `--privileged`. # Basic deps -ARG CONTAINERD_VERSION=1.5.4 +ARG CONTAINERD_VERSION=1.5.5 ARG RUNC_VERSION=1.0.1 ARG CNI_PLUGINS_VERSION=0.9.1 @@ -29,10 +29,10 @@ ARG STARGZ_SNAPSHOTTER_VERSION=0.7.0 # Extra deps: Encryption ARG IMGCRYPT_VERSION=1.1.1 # Extra deps: Rootless -ARG ROOTLESSKIT_VERSION=0.14.2 -ARG SLIRP4NETNS_VERSION=1.1.11 +ARG ROOTLESSKIT_VERSION=0.14.4 +ARG SLIRP4NETNS_VERSION=1.1.12 # Extra deps: FUSE-OverlayFS -ARG FUSE_OVERLAYFS_VERSION=1.6 +ARG FUSE_OVERLAYFS_VERSION=1.7 ARG CONTAINERD_FUSE_OVERLAYFS_VERSION=1.0.3 # Test deps diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.4 b/Dockerfile.d/SHA256SUMS.d/containerd-1.5.4 deleted file mode 100644 index f6ff0f6315a..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.4 +++ /dev/null @@ -1,4 +0,0 @@ -# From https://github.com/kind-ci/containerd-nightlies/releases/tag/containerd-1.5.4 -a13e2e74350a025ce570d767e6d3f41097c0417257cc07e3f4ac095035a9fc10 containerd-1.5.4.linux-amd64.tar.gz -4dafbc28a3158d7ecf01304b18c1659150c05702fb2172d07514b5610438ffda containerd-1.5.4.linux-arm64.tar.gz -16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31 containerd.service diff --git a/Dockerfile.d/SHA256SUMS.d/containerd-1.5.5 b/Dockerfile.d/SHA256SUMS.d/containerd-1.5.5 new file mode 100644 index 00000000000..d054a519a4f --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/containerd-1.5.5 @@ -0,0 +1,4 @@ +# From https://github.com/kind-ci/containerd-nightlies/releases/tag/containerd-1.5.5 +8130d1db8ba5a45678013465fc8dfebb252fc9bf068248c06f9dbb5d8554a5f7 containerd-1.5.5.linux-amd64.tar.gz +c452b52bd5ce3f788bbfbd39741c9066752803aaca5fa6da79b9658902a3a2ec containerd-1.5.5.linux-arm64.tar.gz +16a9e9fed866ad36246239582a1d72eb2f815b6b10298a8ae493dca72af71b31 containerd.service diff --git a/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.6 b/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.6 deleted file mode 100644 index c314da88f41..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.6 +++ /dev/null @@ -1,5 +0,0 @@ -1633cdab449cd41364dbf81192b8611705f2751376d5ec23bd5fa4d58fb0ed82 fuse-overlayfs-aarch64 -a988bbb504379e3ca895d74ca6b08fefbecd7c4a1589bc9c3a15c15eecbb68f9 fuse-overlayfs-armv7l -86d6397dde69df327c636e62cc9f890540a340e1d105a6a51b43df95b5cbee6c fuse-overlayfs-ppc64le -59371efb7069d8810b3abceaf5b5f3a5156d48250825e2338de1e18d52da667e fuse-overlayfs-s390x -ab9760bee3fcc383f21d560b1b90430e118ab8b615a40c9938f88485eb4f8d04 fuse-overlayfs-x86_64 diff --git a/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.7 b/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.7 new file mode 100644 index 00000000000..05e976969a0 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/fuse-overlayfs-1.7 @@ -0,0 +1,5 @@ +c095fa1185ef87cd44c6390c3ace4b8e039eedcd1d8ab426c752a5e39b4f91ec fuse-overlayfs-aarch64 +1cb63738341289d846556866b7ab90813c43e69b2d75a4ec0f127405b44af872 fuse-overlayfs-armv7l +d416d5b3bdf90f82bdaf359fd8bc3710c6e0316fa756943b6571ab538bf5db7e fuse-overlayfs-ppc64le +2a4879ad6d312fd76004cfa0b13b87c50b8385f3a3926e0d46adb8c75c9ff604 fuse-overlayfs-s390x +b7bcf746bdf940e5dde8f1fb29afb65c6abbbe4f4af9d94533dd10f95ccd65d2 fuse-overlayfs-x86_64 diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.2 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.2 deleted file mode 100644 index 14006ac1977..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.2 +++ /dev/null @@ -1,5 +0,0 @@ -b5912d9237958299e6f35e2f720b71e4956cc57ef355d2a0482879f8e32117c4 rootlesskit-aarch64.tar.gz -44fa6aec17ae6b9e6a5966e0a8252d3ee1002012cd84fd8924514eb6af6050cc rootlesskit-armv7l.tar.gz -1a6b4d79db1bc4e8377cb92c81a3e39d59a91c7759048c718f2247978cdf1718 rootlesskit-ppc64le.tar.gz -72156e14fbe81455db0f771b8db3a8c33c7f02ae1f3b6102de12be0474184162 rootlesskit-s390x.tar.gz -2471175df4fea05121a44b26624aa4ac91fbe956a97f580bdf6d0409ebfba99c rootlesskit-x86_64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.4 b/Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.4 new file mode 100644 index 00000000000..8ee8e9937e6 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/rootlesskit-0.14.4 @@ -0,0 +1,5 @@ +7db71091eff7ad10317189a222bc8f41efb938a1d4624cc332e64e497d27798b rootlesskit-aarch64.tar.gz +18b156e964643744b1f352cc3f793b399b509b14f03ab04a793750dd2e9a2eed rootlesskit-armv7l.tar.gz +ab1ae155349941d402328d2d021d6137de45dd57d119cc229c1929c103920fcc rootlesskit-ppc64le.tar.gz +d59f88e4e9b82f46b147e388e88e8c01c61df09c70fc24f95f651f18b09eb19c rootlesskit-s390x.tar.gz +2f0d91ba9fedbd26f627322b4a5fc25d9341228f80a2c2326b3871f25f919429 rootlesskit-x86_64.tar.gz diff --git a/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.11 b/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.11 deleted file mode 100644 index 8218f8ffd8c..00000000000 --- a/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.11 +++ /dev/null @@ -1,5 +0,0 @@ -9a6aa20b7e694854d44cb8260b6c46cba8765ce10b7f26adc01c86dff5933d4c slirp4netns-aarch64 -bb39734ec36076b28fa9ce8bd7f1832bffe6946195eb906ffc4b46d320657014 slirp4netns-armv7l -1dc74f92a7538e9478a242bab61463f7e870b64207de0eb45623e2e8c44d42ee slirp4netns-ppc64le -bfac776e64e373c970870de95ad4846741f9e1bf6fe54460418b0fdac07b19b0 slirp4netns-s390x -8472c2f2c92b4a1b003af6c45a53a58a0a88820cd87ff4bfe6228d913036330a slirp4netns-x86_64 diff --git a/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.12 b/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.12 new file mode 100644 index 00000000000..9098c3cc692 --- /dev/null +++ b/Dockerfile.d/SHA256SUMS.d/slirp4netns-1.1.12 @@ -0,0 +1,5 @@ +5316a75b5b1e338520ea7288a40f384f54419e99339beaf0bd3f3d534ee90d9a slirp4netns-aarch64 +fa8a142418fcf4e91ef61a17ebcc2f411015e7402abae2fd53cbaaee494b32e5 slirp4netns-armv7l +f03b3ea07c534b5f8a253dee67615f0d8ee417117132d22e4cb6a4bce04e4fb3 slirp4netns-ppc64le +0ea2b05fd32cd5698a9dac58fc28750ad48743bad556e69766cfeda1283c1f91 slirp4netns-s390x +fb8d7928205bb573b9207705cab7300d0544959a4a1ffb4ec1fc6e219d859370 slirp4netns-x86_64 diff --git a/go.mod b/go.mod index 5733c2dc2c5..e6fa76d7e71 100644 --- a/go.mod +++ b/go.mod @@ -7,7 +7,8 @@ require ( github.com/compose-spec/compose-go v0.0.0-20210716132856-efad24e892ce github.com/containerd/cgroups v1.0.1 github.com/containerd/console v1.0.2 - github.com/containerd/containerd v1.5.4 + github.com/containerd/containerd v1.5.5 + github.com/containerd/containerd/api v0.0.0 github.com/containerd/continuity v0.1.0 github.com/containerd/go-cni v1.0.3-0.20210427061315-4efee5f0b4db github.com/containerd/imgcrypt v1.1.1 @@ -30,7 +31,7 @@ require ( github.com/opencontainers/image-spec v1.0.1 github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 github.com/pkg/errors v0.9.1 - github.com/rootless-containers/rootlesskit v0.14.2 + github.com/rootless-containers/rootlesskit v0.14.4 github.com/sirupsen/logrus v1.8.1 github.com/tidwall/gjson v1.8.1 github.com/urfave/cli/v2 v2.3.0 @@ -41,4 +42,7 @@ require ( gotest.tools/v3 v3.0.3 ) -replace github.com/containerd/containerd => github.com/containerd/containerd v1.5.1-0.20210617170851-f0a32c66dad1 +replace ( + github.com/containerd/containerd => github.com/containerd/containerd v1.5.1-0.20210802172229-7d4891783aac + github.com/containerd/containerd/api => github.com/containerd/containerd/api v0.0.0-20210802172229-7d4891783aac +) diff --git a/go.sum b/go.sum index eac59d48d26..2eec6da201f 100644 --- a/go.sum +++ b/go.sum @@ -22,6 +22,7 @@ cloud.google.com/go/storage v1.0.0/go.mod h1:IhtSnM/ZTZV8YYJWCY8RULGVqBDmpoyjwiy cloud.google.com/go/storage v1.5.0/go.mod h1:tpKbwo567HUNpVclU5sGELwQWBDZ8gh0ZeosJ0Rtdos= cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohlUTyfDhBk= dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU= +github.com/AdaLogics/go-fuzz-headers v0.0.0-20210715213245-6c3934b029d8/go.mod h1:CzsSbkDixRphAF5hS6wbMKq0eI6ccJRb7/A0M6JBnwg= github.com/Azure/azure-sdk-for-go v16.2.1+incompatible/go.mod h1:9XXNKU+eRnpl9moKnB4QOLf1HestfXbmab5FXxiDBjc= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78 h1:w+iIsaOQNcT7OZ575w+acHgRric5iCyQh+xv+KJ4HB8= github.com/Azure/go-ansiterm v0.0.0-20170929234023-d6e3b3328b78/go.mod h1:LmzpDX56iTiv29bbRTIsUNlaFfuhWRQBWjQdVyAevI8= @@ -46,8 +47,8 @@ github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXG github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg= github.com/Microsoft/hcsshim v0.8.16/go.mod h1:o5/SZqmR7x9JNKsW3pu+nqHm0MF8vbA+VxGOoXdC600= -github.com/Microsoft/hcsshim v0.8.17 h1:yFHH5bghP9ij5Y34PPaMOE8g//oXZ0uJQeMENVo2zcI= -github.com/Microsoft/hcsshim v0.8.17/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= +github.com/Microsoft/hcsshim v0.8.18 h1:cYnKADiM1869gvBpos3YCteeT6sZLB48lB5dmMMs8Tg= +github.com/Microsoft/hcsshim v0.8.18/go.mod h1:+w2gRZ5ReXQhFOrvSQeNfhrYB/dg3oDwTOcER2fw4I4= github.com/NYTimes/gziphandler v0.0.0-20170623195520-56545f4a5d46/go.mod h1:3wb06e3pkSAbeQ52E9H9iFoQsEEwGN64994WTCIhntQ= github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU= github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbtSwDGJws/X0= @@ -89,7 +90,7 @@ github.com/chzyer/readline v0.0.0-20180603132655-2972be24d48e/go.mod h1:nSuG5e5P github.com/chzyer/test v0.0.0-20180213035817-a1ea475d72b1/go.mod h1:Q3SI9o4m/ZMnBNeIyt5eFwwo7qiLfzFZmjNmxjkiQlU= github.com/cilium/ebpf v0.2.0/go.mod h1:To2CFviqOWL/M0gIMsvSMlqe7em/l1ALkX1PyjrX2Qs= github.com/cilium/ebpf v0.4.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= -github.com/cilium/ebpf v0.5.0/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= +github.com/cilium/ebpf v0.6.2/go.mod h1:4tRaxcgiL706VnOzHOdBlY8IEAIdxINsQBcU4xJJXRs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk= @@ -105,8 +106,10 @@ github.com/containerd/cgroups v1.0.1/go.mod h1:0SJrPIenamHDcZhEcJMNBB85rHcUsw4f2 github.com/containerd/console v1.0.1/go.mod h1:XUsP6YE/mKtz6bxc+I8UiKKTP04qjQL4qcS3XoQ5xkw= github.com/containerd/console v1.0.2 h1:Pi6D+aZXM+oUw1czuKgH5IJ+y0jhYcwBJfx5/Ghn9dE= github.com/containerd/console v1.0.2/go.mod h1:ytZPjGgY2oeTkAONYafi2kSj0aYggsf8acV1PGKCbzQ= -github.com/containerd/containerd v1.5.1-0.20210617170851-f0a32c66dad1 h1:rDgTVKNlOP1FvO9fn+ddSZT+O6+7kS0MwTI3K4iGuqU= -github.com/containerd/containerd v1.5.1-0.20210617170851-f0a32c66dad1/go.mod h1:RNHLVpIvXcfjq8T7t3Zm/uwQdN5ndMN5JK+6Bi2tLlw= +github.com/containerd/containerd v1.5.1-0.20210802172229-7d4891783aac h1:CCA16dWhW/tjeTdwG+qlyMmmkj8h1ZzzNt6Cew2tSzU= +github.com/containerd/containerd v1.5.1-0.20210802172229-7d4891783aac/go.mod h1:DzXRf1zQDE0PmnU7D9OY8CCa9V3iGMNxoMP2py8rPa4= +github.com/containerd/containerd/api v0.0.0-20210802172229-7d4891783aac h1:p+vxt+74j/8ECUFLWuyWVoctx0h7Qr9/Z4y7LxTja9w= +github.com/containerd/containerd/api v0.0.0-20210802172229-7d4891783aac/go.mod h1:ysm3V7pK5ZnQfXrrHZDUNNih/ZXnZwLPygddnlsrGBA= github.com/containerd/continuity v0.0.0-20210208174643-50096c924a4e/go.mod h1:EXlVlkqNba9rJe3j7w3Xa924itAMLgZH4UD/Q4PExuQ= github.com/containerd/continuity v0.1.0 h1:UFRRY5JemiAhPZrr/uE0n8fMTLcZsUvySPr1+D7pgr8= github.com/containerd/continuity v0.1.0/go.mod h1:ICJu0PwR54nI0yPEnJ6jcS+J7CZAUXrLh8lPo2knzsM= @@ -147,7 +150,6 @@ github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e h1:Wf6HqHfScWJN9/ZjdUKyjop4mf3Qdd+1TvvltAvM3m8= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= github.com/coreos/go-systemd/v22 v22.1.0/go.mod h1:xO0FLkIi5MaZafQlIrOotqXZ90ih+1atmu1JpKERPPk= -github.com/coreos/go-systemd/v22 v22.3.1/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/go-systemd/v22 v22.3.2 h1:D9/bQk5vlXQFZ6Kwuu6zaiXJ9oTPe68++AzAJc1DzSI= github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc= github.com/coreos/pkg v0.0.0-20160727233714-3ac0863d7acf/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= @@ -246,7 +248,7 @@ github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblf github.com/godbus/dbus/v5 v5.0.3/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= github.com/godbus/dbus/v5 v5.0.4 h1:9349emZab16e7zQvpmsbtjc18ykshndd8y2PG3sgJbA= github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA= -github.com/gofrs/flock v0.8.0/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= +github.com/gofrs/flock v0.8.1/go.mod h1:F1TvTiK9OcQqauNUHlbJvyl9Qa1QvF/gOUDKA14jxHU= github.com/gogo/googleapis v1.4.0 h1:zgVt4UpGxcqVOw97aRGxT4svlcmdK35fynLNctY32zI= github.com/gogo/googleapis v1.4.0/go.mod h1:5YRNX2z1oM5gXdAkurHa942MDgEJyk02w4OecKY87+c= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= @@ -279,8 +281,9 @@ github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:W github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0= github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8= github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= -github.com/golang/protobuf v1.4.3 h1:JjCZWpVbqXDqFVmTfYWEVTMIYrL/NPdPSCHPJ0T/raM= github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI= +github.com/golang/protobuf v1.5.0 h1:LUVKkCeviFUMKqHa4tXIIij/lbhnMbP7Fn5wKdKkRh4= +github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk= github.com/golang/snappy v0.0.3 h1:fHPg5GQYlCeLIPB9BZqMVR5nR9A+IM5zcgeTdjMYmLA= github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/gomodule/redigo v1.8.2/go.mod h1:P9dn9mFrCBvWhGE1wpxx6fgq7BAeLBk+UUUzlpkBYO0= @@ -307,8 +310,9 @@ github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm4 github.com/google/uuid v1.0.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.1/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= -github.com/google/uuid v1.2.0 h1:qJYtXnJRWmpe7m/3XlyhrsLrEURqHRM2kxzoxXqyUDs= github.com/google/uuid v1.2.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= +github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I= +github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo= github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg= github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk= github.com/googleapis/gnostic v0.4.1/go.mod h1:LRhVm6pbyptWbWbuZ38d1eyptfvIytN3ir6b65WBswg= @@ -339,13 +343,11 @@ github.com/hpcloud/tail v1.0.0/go.mod h1:ab1qPbhIpdTxEkNHXyeSf5vhxWSCs/tWer42PpO github.com/hugelgupf/socketpair v0.0.0-20190730060125-05d35a94e714/go.mod h1:2Goc3h8EklBH5mspfHFxBnEoURQCGzQQH1ga9Myjvis= github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc= github.com/imdario/mergo v0.3.5/go.mod h1:2EnlNZ0deacrJVfApfmtdGgDfMuh/nq6Ok1EcJh5FfA= -github.com/imdario/mergo v0.3.11/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/imdario/mergo v0.3.12 h1:b6R2BslTbIEToALKP7LxUvijTsNI9TAe80pLWN2g/HU= github.com/imdario/mergo v0.3.12/go.mod h1:jmQim1M+e3UYxmgPu/WyfjB3N3VflVyUjjjwH0dnCYA= github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8= github.com/insomniacslk/dhcp v0.0.0-20210120172423-cc9239ac6294/go.mod h1:TKl4jN3Voofo4UJIicyNhWGp/nlQqQkFxmwIFTvBkKI= github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA= -github.com/jamescun/tuntap v0.0.0-20190712092105-cb1fb277045c/go.mod h1:zzwpsgcYhzzIP5WyF8g9ivCv38cY9uAV9Gu0m3lThhE= github.com/jmespath/go-jmespath v0.3.0/go.mod h1:9QtRXoHjLGCJ5IBSaohpXITPlowMeeYCZ7fLUTSywik= github.com/joho/godotenv v1.3.0 h1:Zjp+RcGpHhGlrMbJzXTrZZPrWj+1vfm90La1wgB6Bhc= github.com/joho/godotenv v1.3.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg= @@ -423,6 +425,8 @@ github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQ github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c= github.com/moby/sys/mountinfo v0.4.1 h1:1O+1cHA1aujwEwwVMa2Xm2l+gIpUHyd3+D+d7LZh1kM= github.com/moby/sys/mountinfo v0.4.1/go.mod h1:rEr8tzG/lsIZHBtN/JjGG+LMYx9eXgW2JI+6q0qou+A= +github.com/moby/sys/signal v0.5.1-0.20210723232958-8a51b5cc8879 h1:PkXi3ZKVBSfi1skhCjUykUKRwKxn/D48Nj4D1sWalXk= +github.com/moby/sys/signal v0.5.1-0.20210723232958-8a51b5cc8879/go.mod h1:JwObcMnOrUy2VTP5swPKWwywH0Mbgk8Y5qua9iwtIRM= github.com/moby/sys/symlink v0.1.0/go.mod h1:GGDODQmbFOjFsXvfLVn3+ZRxkch54RkSiGqsZeMYowQ= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd h1:aY7OQNf2XqY/JQ6qREWamhI/81os/agb2BAGpcx5yWI= github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo= @@ -461,13 +465,12 @@ github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8 github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM= github.com/opencontainers/image-spec v1.0.1 h1:JMemWkRwHx4Zj+fVxWoMCFm/8sYGGrUVojFA6h/TRcI= github.com/opencontainers/image-spec v1.0.1/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= -github.com/opencontainers/runc v1.0.0-rc95 h1:RMuWVfY3E1ILlVsC3RhIq38n4sJtlOFwU9gfFZSqrd0= -github.com/opencontainers/runc v1.0.0-rc95/go.mod h1:z+bZxa/+Tz/FmYVWkhUajJdzFeOqjc5vrqskhVyHGUM= +github.com/opencontainers/runc v1.0.1 h1:G18PGckGdAm3yVQRWDVQ1rLSLntiniKJ0cNRT2Tm5gs= +github.com/opencontainers/runc v1.0.1/go.mod h1:aTaHFFwQXuA71CiyxOdFFIorAoemI04suvGRQFzWTD0= github.com/opencontainers/runtime-spec v1.0.2/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20200929063507-e6143ca7d51d/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417 h1:3snG66yBm59tKhhSPQrQ/0bCrv1LQbKt40LnUPiUxdc= github.com/opencontainers/runtime-spec v1.0.3-0.20210326190908-1c3f411f0417/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= -github.com/opencontainers/selinux v1.8.0/go.mod h1:RScLhm78qiWa2gbVCcGkC7tCGdgk3ogry1nUQF8Evvo= github.com/opencontainers/selinux v1.8.2 h1:c4ca10UMgRcvZ6h0K4HtS15UaVSBEaE+iln2LVpAuGc= github.com/opencontainers/selinux v1.8.2/go.mod h1:MUIHuUEvKB1wtJjQdOyYRgOnLD2xAPP8dBsCoU0KuF8= github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic= @@ -514,8 +517,8 @@ github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40T github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg= github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ= github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= -github.com/rootless-containers/rootlesskit v0.14.2 h1:jmsSyNyRG0QdWc3usppt5jEy5qOheeUsIINcymPrOFg= -github.com/rootless-containers/rootlesskit v0.14.2/go.mod h1:nV3TpRISvwhZQSwo0nmQQnxjCxXr3mvrMi0oASLvzcg= +github.com/rootless-containers/rootlesskit v0.14.4 h1:pqx9a+OC/6jjV7sIUKy3D1p6NLEC6WIMiJWAGsGMCUM= +github.com/rootless-containers/rootlesskit v0.14.4/go.mod h1:Ai3detLzryb/4EkzXmNfh8aByUcBXp/qqkQusJs1SO8= github.com/rs/xid v1.3.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk= @@ -534,6 +537,7 @@ github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA= github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM= +github.com/songgao/water v0.0.0-20200317203138-2b4b6d7c09d8/go.mod h1:P5HUIBuIWKbyjl083/loAegFkfbFNx5i2qEP4CNbm7E= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk= @@ -583,7 +587,6 @@ github.com/vishvananda/netlink v1.1.0/go.mod h1:cTgwzPIzzgDAYoQrMm0EdrjRUBkTqKYp github.com/vishvananda/netlink v1.1.1-0.20201029203352-d40f9887b852/go.mod h1:twkDnbuQxJYemMlGd4JFIcuhgX83tXhKS2B/PRMpOho= github.com/vishvananda/netns v0.0.0-20191106174202-0a2b9b5464df/go.mod h1:JP3t17pCcGlemwknint6hfoeCVQrEMVwxRLRjXpq+BU= github.com/vishvananda/netns v0.0.0-20200728191858-db3c7e526aae/go.mod h1:DD4vA1DwXk04H54A1oHXtwZmA0grkVMdPxx/VGLCah0= -github.com/willf/bitset v1.1.11/go.mod h1:83CECat5yLh5zVOf4P1ErAgKA5UDvKtgyUABdr3+MjI= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f h1:J9EGpcZtP0E/raorCMxlFGSTBrsSlaDGf3jU/qvAE2c= github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU= github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 h1:EzJWgHovont7NscjpAxXsDA8S8BMYve8Y5+7cuRE7R0= @@ -897,8 +900,9 @@ google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU= google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4= google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c= -google.golang.org/protobuf v1.26.0-rc.1 h1:7QnIQpGRHE5RnLKnESfDoxm2dTapTZua5a0kS0A+VXQ= google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw= +google.golang.org/protobuf v1.26.0 h1:bxAC2xTBsZGibn2RTntX0oH50xLsqy1OxA9tTL3p/lk= +google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc= gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=