From a192bfcf67248cb9c77f603a5c17aad72ace61b2 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 25 Jul 2022 13:33:28 +0200 Subject: [PATCH 1/3] Makefile: run "go mod tidy" before vendoring Signed-off-by: Sebastiaan van Stijn --- direct.mk | 1 + 1 file changed, 1 insertion(+) diff --git a/direct.mk b/direct.mk index bca9a1383a..a81c25d970 100644 --- a/direct.mk +++ b/direct.mk @@ -139,6 +139,7 @@ dep-validate: go-mod-vendor .PHONY: go-mod-vendor go-mod-vendor: + @go mod tidy @go mod vendor @# ensure that key protobuf spec files are in vendor dir @module=github.com/gogo/protobuf ; \ From b85a0fa5ad71b4c3b1fdbdcb5a1faa7e188dffa8 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 25 Jul 2022 12:57:25 +0200 Subject: [PATCH 2/3] Update to go 1.18.8 (debian bullseye) Signed-off-by: Sebastiaan van Stijn --- .circleci/config.yml | 2 +- Dockerfile | 4 ++-- go.mod | 2 +- go.sum | 5 ----- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a6120dc811..5191b9d6b5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -11,7 +11,7 @@ jobs: # Needed to install go OS: linux ARCH: amd64 - GOVERSION: 1.17.9 + GOVERSION: 1.18.8 GO111MODULE: "on" # Needed to install protoc PROTOC_VERSION: 3.6.1 diff --git a/Dockerfile b/Dockerfile index 732c27034f..50a5456ff2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # NOTE(dperny): for some reason, alpine was giving me trouble -ARG GO_VERSION=1.17.4 +ARG GO_VERSION=1.18.8 ARG DEBIAN_FRONTEND=noninteractive -ARG BASE_DEBIAN_DISTRO="buster" +ARG BASE_DEBIAN_DISTRO="bullseye" ARG GOLANG_IMAGE="golang:${GO_VERSION}-${BASE_DEBIAN_DISTRO}" FROM ${GOLANG_IMAGE} diff --git a/go.mod b/go.mod index dc727452fb..7e76aa71f9 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/moby/swarmkit/v2 -go 1.17 +go 1.18 require ( code.cloudfoundry.org/clock v1.0.0 diff --git a/go.sum b/go.sum index e93f9d1edf..b9730180cb 100644 --- a/go.sum +++ b/go.sum @@ -156,7 +156,6 @@ github.com/census-instrumentation/opencensus-proto v0.3.0/go.mod h1:f6KPmirojxKA github.com/certifi/gocertifi v0.0.0-20191021191039-0944d244cd40/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054 h1:uH66TXeswKn5PW5zdZ39xEwfS9an067BirqA+P4QaLI= github.com/certifi/gocertifi v0.0.0-20200922220541-2c3bb06c6054/go.mod h1:sGbDF6GwGcLpkNXPUTkMRoywsNa/ol15pxFe6ERfguA= -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= @@ -188,14 +187,12 @@ github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3Ee github.com/coreos/go-semver v0.3.0 h1:wkHLiw0WNATZnSG7epLsujiMCgPAc9xhjJ4tgnAxmfM= github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -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.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= github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA= -github.com/cpuguy83/go-md2man v1.0.10 h1:BSKMNlYxDvnunlTymqtgONjNnaRV1sTpcovwwjF22jk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= github.com/cpuguy83/go-md2man/v2 v2.0.0-20190314233015-f79a8a8ca69d/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU= github.com/cpuguy83/go-md2man/v2 v2.0.0 h1:EoUDS0afbrsXAZ9YQ9jdu/mZ2sXgT1/2yyNng4PGlyM= @@ -677,7 +674,6 @@ github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6L github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4= github.com/rs/cors v1.7.0/go.mod h1:gFx+x8UowdsKA9AchylcLynDq+nNFfI8FkUZdN/jGCU= github.com/rs/cors v1.8.0/go.mod h1:EBwu+T5AvHOcXwvZIkQFjUN6s8Czyqw12GL/Y0tUyRM= -github.com/russross/blackfriday v1.5.2 h1:HyvC0ARfnZBqnXwABFeSZHpKvJHJJfPz81GNueLj0oo= github.com/russross/blackfriday v1.5.2/go.mod h1:JO/DiYxRf+HjHt06OyowR9PTA263kcR/rfWxYHBV53g= github.com/russross/blackfriday/v2 v2.0.1 h1:lPqVAte+HuHNfhJ/0LC98ESWRz8afy9tM/0RK8m9o+Q= github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -781,7 +777,6 @@ go.etcd.io/bbolt v1.3.3/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU= go.etcd.io/bbolt v1.3.5/go.mod h1:G5EMThwa9y8QZGBClrRx5EY+Yw9kAhnjy3bSjsnlVTQ= go.etcd.io/bbolt v1.3.6 h1:/ecaJf0sk1l4l6V4awd65v2C3ILy7MSj+s/x1ADCIMU= go.etcd.io/bbolt v1.3.6/go.mod h1:qXsaaIqmgQH0T+OPdb99Bf+PKfBBQVAdyD6TY9G8XM4= -go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738 h1:VcrIfasaLFkyjk6KNlXQSzO+B0fZcnECiDrKJsfxka0= go.etcd.io/etcd v0.0.0-20191023171146-3cf2f69b5738/go.mod h1:dnLIgRNXwCJa5e+c6mIZCrds/GIG4ncV9HhK5PX7jPg= go.etcd.io/etcd/api/v3 v3.5.0-alpha.0/go.mod h1:mPcW6aZJukV6Aa81LSKpBjQXTWlXB5r74ymPoSWa3Sw= go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs= From 3e6e51842fc094afb3805529e88a26bf342048ef Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 25 Jul 2022 16:12:34 +0200 Subject: [PATCH 3/3] fix some references docker/swarmkit -> moby/swarmkit Signed-off-by: Sebastiaan van Stijn --- .circleci/config.yml | 3 +- .github/PULL_REQUEST_TEMPLATE.md | 2 +- BUILDING.md | 60 +++++++++++----------- CONTRIBUTING.md | 4 +- MAINTAINERS | 2 +- README.md | 10 ++-- agent/exec/controller_stub.go | 2 +- agent/exec/dockerapi/docker_client_stub.go | 2 +- agent/exec/executor.go | 4 +- cmd/external-ca-example/README.md | 2 +- design/generic_resources.md | 8 +-- design/orchestrators.md | 2 +- design/raft.md | 4 +- design/store.md | 2 +- 14 files changed, 54 insertions(+), 53 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 5191b9d6b5..af79e0fbb3 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -6,6 +6,7 @@ jobs: # other environment variables (although the working directory can use the `~` character, # but environment variables cannot), so to avoid having to override the GOPATH for every # run command, just hard code in the directory to be CircleCI expects it to be. + # FIXME: this still needs to be docker/swarmkit, as that's how it's referenced in protobuf working_directory: /home/circleci/.go_workspace/src/github.com/docker/swarmkit environment: # Needed to install go @@ -18,7 +19,7 @@ jobs: # Note(cyli): We create a tmpfs mount to be used for temporary files created by tests # to mitigate the excessive I/O latencies that sometimes cause the tests to fail. - # See https://github.com/docker/swarmkit/pull/2254. + # See https://github.com/moby/swarmkit/pull/2254. # There is no way to mount tmpfs volumes in the docker executor, so we are using # the machine executor. However, this incur a performance overhead diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index 7db8d57bc4..0b96367964 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,6 +1,6 @@