From 6ffe37b94908468d445f5e25cc44c0e20a23af95 Mon Sep 17 00:00:00 2001 From: Peng Tao Date: Wed, 28 Jul 2021 17:35:26 +0800 Subject: [PATCH] mod: unify runc dependency MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since the old ones are carrying CVEs. Do not use them. PS: In order to update the modules, we're running `make handle_vendor` target from the runtime's Makefile. This is now part of the CI and ensures that the vendored code is up-to-date. It's important to note that older versions of golang may generate different results for those, but those versions are not supported anymore, so we're good to go with what we have in the CI (1.15 and 1.16). Fixes: #2338 Signed-off-by: Peng Tao Signed-off-by: Fabiano Fidêncio --- src/runtime/go.mod | 1 + src/runtime/go.sum | 6 ------ src/runtime/vendor/modules.txt | 3 ++- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/runtime/go.mod b/src/runtime/go.mod index b3967c80c..7fdee3f45 100644 --- a/src/runtime/go.mod +++ b/src/runtime/go.mod @@ -52,6 +52,7 @@ require ( ) replace ( + github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.1 github.com/uber-go/atomic => go.uber.org/atomic v1.5.1 google.golang.org/genproto => google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 ) diff --git a/src/runtime/go.sum b/src/runtime/go.sum index 1e7c97da4..6b18834d6 100644 --- a/src/runtime/go.sum +++ b/src/runtime/go.sum @@ -114,7 +114,6 @@ github.com/cespare/xxhash v1.1.0 h1:a6HrQnmkObjyL+Gs60czilIUGqrzKutQD6XZog3p+ko= github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc= github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= -github.com/checkpoint-restore/go-criu/v4 v4.1.0/go.mod h1:xUQBLp4RLc5zJtWY++yjOoMoB5lihDt7fai+75m+rGw= github.com/checkpoint-restore/go-criu/v5 v5.0.0 h1:TW8f/UvntYoVDMN1K2HlT82qH1rb0sOjpGw3m6Ym+i4= github.com/checkpoint-restore/go-criu/v5 v5.0.0/go.mod h1:cfwC0EG7HMUenopBsUf9d89JlCLQIfgVcNsNN0t6T2M= github.com/chzyer/logex v1.1.10/go.mod h1:+Ywpsq7O8HXn0nuIou7OrIPyXbp3wmkHB+jjWRnGsAI= @@ -565,11 +564,6 @@ github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3I github.com/opencontainers/image-spec v1.0.0/go.mod h1:BtxoFyWECRxE4U/7sNtV5W15zMzWCbyJoFRP3s7yZA0= 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 v0.0.0-20190115041553-12f6a991201f/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v0.1.1/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc8.0.20190926000215-3e425f80a8c9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc9/go.mod h1:qT5XzbpPznkRYVz/mWwUaVBUv2rmF59PVA73FjuZG0U= -github.com/opencontainers/runc v1.0.0-rc93/go.mod h1:3NOsor4w32B2tC0Zbl8Knk4Wg84SM2ImC1fxBuqJ/H0= 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 v0.1.2-0.20190507144316-5b71a03e2700/go.mod h1:jwyrGlmzljRJv/Fgzds9SsS/C5hL+LL3ko9hs6T5lQ0= diff --git a/src/runtime/vendor/modules.txt b/src/runtime/vendor/modules.txt index 93e1eac3a..105424da4 100644 --- a/src/runtime/vendor/modules.txt +++ b/src/runtime/vendor/modules.txt @@ -281,7 +281,7 @@ github.com/opencontainers/go-digest github.com/opencontainers/image-spec/identity github.com/opencontainers/image-spec/specs-go github.com/opencontainers/image-spec/specs-go/v1 -# github.com/opencontainers/runc v1.0.1 +# github.com/opencontainers/runc v1.0.1 => github.com/opencontainers/runc v1.0.1 ## explicit github.com/opencontainers/runc/libcontainer github.com/opencontainers/runc/libcontainer/apparmor @@ -529,5 +529,6 @@ gopkg.in/yaml.v3 # k8s.io/apimachinery v0.20.6 ## explicit k8s.io/apimachinery/pkg/api/resource +# github.com/opencontainers/runc => github.com/opencontainers/runc v1.0.1 # github.com/uber-go/atomic => go.uber.org/atomic v1.5.1 # google.golang.org/genproto => google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8