From 125752c1272132737d76aac69bad5d430179d4e3 Mon Sep 17 00:00:00 2001 From: Djordje Lukic Date: Wed, 3 Nov 2021 11:14:54 +0100 Subject: [PATCH] Update golang to 1.17 Signed-off-by: Djordje Lukic --- .github/workflows/artifacts.yml | 5 +- .github/workflows/ci.yml | 12 ++--- .github/workflows/release.yaml | 6 +-- Dockerfile | 2 +- go.mod | 95 ++++++++++++++++++++++++++++++--- 5 files changed, 101 insertions(+), 19 deletions(-) diff --git a/.github/workflows/artifacts.yml b/.github/workflows/artifacts.yml index c0fe29ffc..760189dac 100644 --- a/.github/workflows/artifacts.yml +++ b/.github/workflows/artifacts.yml @@ -7,10 +7,10 @@ jobs: if: github.event.issue.pull_request != '' && contains(github.event.comment.body, '/generate-artifacts') runs-on: ubuntu-latest steps: - - name: Set up Go 1.16 + - name: Set up Go 1.17 uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Checkout code into the Go module directory @@ -55,4 +55,3 @@ jobs: body: | This PR can be tested using [binaries](https://github.com/docker/compose-cli/actions/runs/${{ github.run_id }}). reactions: eyes - diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ada2146aa..e7034bdd8 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -13,10 +13,10 @@ jobs: env: GO111MODULE: "on" steps: - - name: Set up Go 1.16 + - name: Set up Go 1.17 uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Checkout code into the Go module directory @@ -40,10 +40,10 @@ jobs: env: GO111MODULE: "on" steps: - - name: Set up Go 1.16 + - name: Set up Go 1.17 uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Checkout code into the Go module directory @@ -65,10 +65,10 @@ jobs: env: GO111MODULE: "on" steps: - - name: Set up Go 1.16 + - name: Set up Go 1.17 uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Set up gosum diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index ce1c27f26..ee9413cc3 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -4,17 +4,17 @@ on: workflow_dispatch: inputs: tag: - description: 'Release Tag' + description: "Release Tag" required: true jobs: upload-release: runs-on: ubuntu-latest steps: - - name: Set up Go 1.16 + - name: Set up Go 1.17 uses: actions/setup-go@v2 with: - go-version: 1.16 + go-version: 1.17 id: go - name: Setup docker CLI diff --git a/Dockerfile b/Dockerfile index 9b88531f2..548caed5a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG GO_VERSION=1.16-alpine +ARG GO_VERSION=1.17-alpine ARG GOLANGCI_LINT_VERSION=v1.40.1-alpine ARG PROTOC_GEN_GO_VERSION=v1.4.3 diff --git a/go.mod b/go.mod index fb71e7ea6..85ab8b9f2 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/docker/compose/v2 -go 1.16 +go 1.17 require ( github.com/AlecAivazis/survey/v2 v2.2.3 @@ -17,12 +17,9 @@ require ( github.com/docker/docker v20.10.7+incompatible github.com/docker/go-connections v0.4.0 github.com/docker/go-units v0.4.0 - github.com/gofrs/flock v0.8.0 // indirect github.com/golang/mock v1.5.0 github.com/hashicorp/go-multierror v1.1.0 github.com/hashicorp/go-version v1.3.0 - github.com/kr/pty v1.1.8 // indirect - github.com/mattn/go-colorable v0.1.6 // indirect github.com/mattn/go-isatty v0.0.12 github.com/mattn/go-shellwords v1.0.12 github.com/moby/buildkit v0.8.2-0.20210401015549-df49b648c8bf @@ -32,16 +29,102 @@ require ( github.com/opencontainers/image-spec v1.0.1 github.com/pkg/errors v0.9.1 github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b - github.com/sergi/go-diff v1.1.0 // indirect github.com/sirupsen/logrus v1.8.1 github.com/spf13/cobra v1.2.1 github.com/spf13/pflag v1.0.5 github.com/stretchr/testify v1.7.0 - github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect golang.org/x/sync v0.0.0-20210220032951-036812b2e83c gotest.tools v2.2.0+incompatible gotest.tools/v3 v3.0.3 +) + +require ( + github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect + github.com/Masterminds/semver v1.5.0 // indirect + github.com/Microsoft/go-winio v0.4.17 // indirect + github.com/Microsoft/hcsshim v0.8.18 // indirect + github.com/agl/ed25519 v0.0.0-20170116200512-5312a6153412 // indirect + github.com/beorn7/perks v1.0.1 // indirect + github.com/cespare/xxhash/v2 v2.1.1 // indirect + github.com/cnabio/cnab-go v0.10.0-beta1 // indirect + github.com/compose-spec/godotenv v1.1.0 // indirect + github.com/containerd/cgroups v1.0.1 // indirect + github.com/containerd/continuity v0.1.0 // indirect + github.com/containerd/typeurl v1.0.2 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/docker-credential-helpers v0.6.4-0.20210125172408-38bea2ce277a // indirect + github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c // indirect + github.com/docker/go-metrics v0.0.1 // indirect + github.com/fvbommel/sortorder v1.0.1 // indirect + github.com/go-logr/logr v0.4.0 // indirect + github.com/gofrs/flock v0.8.0 // indirect + github.com/gogo/googleapis v1.4.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.5 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/gorilla/mux v1.8.0 // indirect + github.com/grpc-ecosystem/go-grpc-middleware v1.2.0 // indirect + github.com/grpc-ecosystem/grpc-opentracing v0.0.0-20180507213350-8e809c8a8645 // indirect + github.com/hashicorp/errwrap v1.0.0 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/inconshreveable/mousetrap v1.0.0 // indirect + github.com/jaguilar/vt100 v0.0.0-20150826170717-2703a27b14ea // indirect + github.com/json-iterator/go v1.1.11 // indirect + github.com/kballard/go-shellquote v0.0.0-20180428030007-95032a82bc51 // indirect + github.com/klauspost/compress v1.11.13 // indirect + github.com/kr/pty v1.1.8 // indirect + github.com/mattn/go-colorable v0.1.6 // indirect + github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect + github.com/mgutz/ansi v0.0.0-20170206155736-9520e82c474b // indirect + github.com/miekg/pkcs11 v1.0.3 // indirect + github.com/mitchellh/mapstructure v1.4.2 // indirect + github.com/moby/locker v1.0.1 // indirect + github.com/moby/sys/mount v0.2.0 // indirect + github.com/moby/sys/mountinfo v0.4.1 // indirect + github.com/moby/sys/symlink v0.1.0 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/opencontainers/runc v1.0.1 // indirect + github.com/opentracing/opentracing-go v1.2.0 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/prometheus/client_golang v1.7.1 // indirect + github.com/prometheus/client_model v0.2.0 // indirect + github.com/prometheus/common v0.10.0 // indirect + github.com/prometheus/procfs v0.6.0 // indirect + github.com/qri-io/jsonpointer v0.1.0 // indirect + github.com/qri-io/jsonschema v0.1.1 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/theupdateframework/notary v0.6.1 // indirect + github.com/tonistiigi/fsutil v0.0.0-20201103201449-0834f99b7b85 // indirect + github.com/tonistiigi/units v0.0.0-20180711220420-6950e57a87ea // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect + go.opencensus.io v0.23.0 // indirect + golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 // indirect + golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4 // indirect + golang.org/x/oauth2 v0.0.0-20210402161424-2e8d93401602 // indirect + golang.org/x/sys v0.0.0-20210616094352-59db8d763f22 // indirect + golang.org/x/term v0.0.0-20210220032956-6a3ed077a48d // indirect + golang.org/x/text v0.3.5 // indirect + golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba // indirect + google.golang.org/appengine v1.6.7 // indirect + google.golang.org/genproto v0.0.0-20210602131652-f16073e35f0c // indirect + google.golang.org/grpc v1.38.0 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b // indirect + k8s.io/apimachinery v0.21.0 // indirect k8s.io/client-go v0.21.0 // indirect + k8s.io/klog/v2 v2.8.0 // indirect + k8s.io/utils v0.0.0-20201110183641-67b214c5f920 // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.0 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect ) // (for buildx)