From 0b62a3d664bbf34d691ca211143b0edcb74ddb4b Mon Sep 17 00:00:00 2001 From: Dmitry Salakhov Date: Mon, 10 Jan 2022 13:10:02 +1300 Subject: [PATCH] feat: bump golang version to 1.17.6 (#6366) --- api/go.mod | 79 +++++++++++++++++++--- build/linux/dev-toolkit/toolkit.Dockerfile | 36 +++++----- tool-versions.json | 2 +- 3 files changed, 90 insertions(+), 27 deletions(-) diff --git a/api/go.mod b/api/go.mod index 1c3dfed1d..e28d8f854 100644 --- a/api/go.mod +++ b/api/go.mod @@ -1,27 +1,23 @@ module github.com/portainer/portainer/api -go 1.16 +go 1.17 require ( github.com/Microsoft/go-winio v0.4.17 - github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect github.com/asaskevich/govalidator v0.0.0-20200428143746-21a406dcc535 github.com/aws/aws-sdk-go-v2 v1.11.1 github.com/aws/aws-sdk-go-v2/credentials v1.6.2 github.com/aws/aws-sdk-go-v2/service/ecr v1.10.1 github.com/boltdb/bolt v1.3.1 - github.com/containerd/containerd v1.5.7 // indirect github.com/coreos/go-semver v0.3.0 github.com/dchest/uniuri v0.0.0-20160212164326-8902c56451e9 github.com/dgrijalva/jwt-go v3.2.0+incompatible github.com/docker/cli v20.10.9+incompatible github.com/docker/docker v20.10.9+incompatible - github.com/docker/go-connections v0.4.0 // indirect github.com/g07cha/defender v0.0.0-20180505193036-5665c627c814 github.com/go-git/go-git/v5 v5.3.0 github.com/go-ldap/ldap/v3 v3.1.8 github.com/gofrs/uuid v4.0.0+incompatible - github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect github.com/gorilla/handlers v1.5.1 github.com/gorilla/mux v1.7.3 github.com/gorilla/securecookie v1.1.1 @@ -31,8 +27,6 @@ require ( github.com/jpillora/chisel v0.0.0-20190724232113-f3a8df20e389 github.com/json-iterator/go v1.1.11 github.com/koding/websocketproxy v0.0.0-20181220232114-7ed82d81a28c - github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect - github.com/morikuni/aec v1.0.0 // indirect github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6 github.com/pkg/errors v0.9.1 github.com/portainer/docker-compose-wrapper v0.0.0-20211018221743-10a04c9d4f19 @@ -42,7 +36,6 @@ require ( github.com/robfig/cron/v3 v3.0.1 github.com/sirupsen/logrus v1.8.1 github.com/stretchr/testify v1.7.0 - github.com/xeipuuv/gojsonschema v1.2.0 // indirect golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d golang.org/x/sync v0.0.0-20210220032951-036812b2e83c @@ -53,3 +46,73 @@ require ( k8s.io/client-go v0.22.2 software.sslmate.com/src/go-pkcs12 v0.0.0-20210415151418-c5206de65a78 ) + +require ( + github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751 // indirect + github.com/alecthomas/units v0.0.0-20210208195552-ff826a37aa15 // indirect + github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 // indirect + github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 // indirect + github.com/aws/aws-sdk-go-v2/internal/configsources v1.1.1 // indirect + github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.0.1 // indirect + github.com/aws/smithy-go v1.9.0 // indirect + github.com/containerd/containerd v1.5.7 // indirect + github.com/davecgh/go-spew v1.1.1 // indirect + github.com/docker/distribution v2.7.1+incompatible // indirect + github.com/docker/go-connections v0.4.0 // indirect + github.com/docker/go-units v0.4.0 // indirect + github.com/emirpasic/gods v1.12.0 // indirect + github.com/evanphx/json-patch v4.11.0+incompatible // indirect + github.com/felixge/httpsnoop v1.0.1 // indirect + github.com/fsnotify/fsnotify v1.4.9 // indirect + github.com/go-asn1-ber/asn1-ber v1.3.1 // indirect + github.com/go-git/gcfg v1.5.0 // indirect + github.com/go-git/go-billy/v5 v5.1.0 // indirect + github.com/go-logr/logr v0.4.0 // indirect + github.com/gogo/protobuf v1.3.2 // indirect + github.com/golang/protobuf v1.5.2 // indirect + github.com/google/go-cmp v0.5.6 // indirect + github.com/google/gofuzz v1.1.0 // indirect + github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect + github.com/googleapis/gnostic v0.5.5 // indirect + github.com/imdario/mergo v0.3.12 // indirect + github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect + github.com/jmespath/go-jmespath v0.4.0 // indirect + github.com/jpillora/ansi v0.0.0-20170202005112-f496b27cd669 // indirect + github.com/jpillora/requestlog v0.0.0-20181015073026-df8817be5f82 // indirect + github.com/jpillora/sizestr v0.0.0-20160130011556-e2ea2fa42fb9 // indirect + github.com/kevinburke/ssh_config v0.0.0-20201106050909-4977a11b4351 // indirect + github.com/mitchellh/go-homedir v1.1.0 // indirect + github.com/mitchellh/mapstructure v1.1.2 // indirect + github.com/moby/spdystream v0.2.0 // indirect + github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.1 // indirect + github.com/morikuni/aec v1.0.0 // indirect + github.com/opencontainers/go-digest v1.0.0 // indirect + github.com/opencontainers/image-spec v1.0.1 // indirect + github.com/pmezard/go-difflib v1.0.0 // indirect + github.com/sergi/go-diff v1.1.0 // indirect + github.com/spf13/pflag v1.0.5 // indirect + github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect + github.com/xanzy/ssh-agent v0.3.0 // indirect + github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f // indirect + github.com/xeipuuv/gojsonreference v0.0.0-20180127040603-bd5ef7bd5415 // indirect + github.com/xeipuuv/gojsonschema v1.2.0 // indirect + golang.org/x/net v0.0.0-20210520170846-37e1c6afe023 // 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.6 // indirect + golang.org/x/time v0.0.0-20210723032227-1f47c861a9ac // indirect + google.golang.org/appengine v1.6.5 // indirect + google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect + google.golang.org/grpc v1.33.2 // indirect + google.golang.org/protobuf v1.26.0 // indirect + gopkg.in/inf.v0 v0.9.1 // indirect + gopkg.in/warnings.v0 v0.1.2 // indirect + gopkg.in/yaml.v2 v2.4.0 // indirect + k8s.io/klog/v2 v2.9.0 // indirect + k8s.io/kube-openapi v0.0.0-20210421082810-95288971da7e // indirect + k8s.io/utils v0.0.0-20210819203725-bdf08cb9a70a // indirect + sigs.k8s.io/structured-merge-diff/v4 v4.1.2 // indirect + sigs.k8s.io/yaml v1.2.0 // indirect +) diff --git a/build/linux/dev-toolkit/toolkit.Dockerfile b/build/linux/dev-toolkit/toolkit.Dockerfile index a3a189f0a..0f411c822 100644 --- a/build/linux/dev-toolkit/toolkit.Dockerfile +++ b/build/linux/dev-toolkit/toolkit.Dockerfile @@ -11,34 +11,34 @@ WORKDIR /src/portainer RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections # Set default go version -ARG GO_VERSION=go1.16.6.linux-amd64 +ARG GO_VERSION=go1.17.6.linux-amd64 # Install packages RUN apt-get update --fix-missing && apt-get install -qq \ - dialog \ - apt-utils \ - curl \ - build-essential \ - git \ - wget \ - apt-transport-https \ - ca-certificates \ - gnupg-agent \ - software-properties-common + dialog \ + apt-utils \ + curl \ + build-essential \ + git \ + wget \ + apt-transport-https \ + ca-certificates \ + gnupg-agent \ + software-properties-common # Install Docker CLI RUN curl -fsSL https://download.docker.com/linux/ubuntu/gpg | apt-key add - \ - && add-apt-repository \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ - $(lsb_release -cs) \ - stable" \ - && apt-get update \ - && apt-get install -y docker-ce-cli + && add-apt-repository \ + "deb [arch=amd64] https://download.docker.com/linux/ubuntu \ + $(lsb_release -cs) \ + stable" \ + && apt-get update \ + && apt-get install -y docker-ce-cli # Install NodeJS RUN curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \ - && apt-get install -y nodejs + && apt-get install -y nodejs # Install Yarn RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \ diff --git a/tool-versions.json b/tool-versions.json index a7358d488..8aa2060cf 100644 --- a/tool-versions.json +++ b/tool-versions.json @@ -1,6 +1,6 @@ { "description": "This file contains current tool versions", - "go_version": "v1.16.6", + "go_version": "v1.17.6", "node_version": "12.x", "yarn_version": "1.x" }