Skip to content

Commit e811681

Browse files
milasmilas
committed
ci: upgrade to Go 1.19.1
Go released 1.18.6 + 1.19.1 today which fix a couple CVEs. (`golang.org/x/net` also has a related fix.) This jumps from 1.18.5 -> 1.19.1 since it was on the to-do list regardless :) Signed-off-by: Milas Bowman <[email protected]>
1 parent e7b488b commit e811681

File tree

5 files changed

+17
-16
lines changed

5 files changed

+17
-16
lines changed

‎.github/workflows/ci.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ on:
1919
default: "false"
2020

2121
env:
22-
GO_VERSION: "1.18.5" # for non sandboxed e2e tests
2322
DESTDIR: "./bin"
2423
DOCKER_CLI_VERSION: "20.10.17"
2524

@@ -143,7 +142,8 @@ jobs:
143142
name: Set up Go
144143
uses: actions/setup-go@v3
145144
with:
146-
go-version: ${{ env.GO_VERSION }}
145+
go-version-file: 'go.mod'
146+
check-latest: true
147147
cache: true
148148
-
149149
name: Setup docker CLI

‎Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717

18-
ARG GO_VERSION=1.18.5
18+
ARG GO_VERSION=1.19.1
1919
ARG XX_VERSION=1.1.2
2020
ARG GOLANGCI_LINT_VERSION=v1.47.3
2121
ARG ADDLICENSE_VERSION=v1.0.0

‎docker-bake.hcl‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
// limitations under the License.
1414

1515
variable "GO_VERSION" {
16-
default = "1.18.5"
16+
default = "1.19.1"
1717
}
1818

1919
variable "BUILD_TAGS" {

‎go.mod‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/docker/compose/v2
22

3-
go 1.18
3+
go 1.19
44

55
require (
66
github.com/AlecAivazis/survey/v2 v2.3.5
@@ -9,7 +9,7 @@ require (
99
github.com/compose-spec/compose-go v1.5.0
1010
github.com/containerd/console v1.0.3
1111
github.com/containerd/containerd v1.6.8
12-
github.com/distribution/distribution/v3 v3.0.0-20220729163034-26163d82560f
12+
github.com/distribution/distribution/v3 v3.0.0-20220902125104-0122d7ddaec0
1313
github.com/docker/buildx v0.8.2 // when updating, also update the replace rules accordingly
1414
github.com/docker/cli v20.10.17+incompatible
1515
github.com/docker/cli-docs-tool v0.5.0
@@ -22,7 +22,7 @@ require (
2222
github.com/mattn/go-isatty v0.0.16
2323
github.com/mattn/go-shellwords v1.0.12
2424
github.com/moby/buildkit v0.10.4
25-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6
25+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae
2626
github.com/morikuni/aec v1.0.0
2727
github.com/opencontainers/go-digest v1.0.0
2828
github.com/opencontainers/image-spec v1.0.3-0.20211202183452-c5a74bcca799
@@ -32,7 +32,7 @@ require (
3232
github.com/spf13/pflag v1.0.5
3333
github.com/stretchr/testify v1.8.0
3434
github.com/theupdateframework/notary v0.7.0
35-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4
35+
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde
3636
gopkg.in/yaml.v2 v2.4.0
3737
gotest.tools v2.2.0+incompatible
3838
gotest.tools/v3 v3.3.0
@@ -109,7 +109,7 @@ require (
109109
go.opentelemetry.io/otel/trace v1.4.1 // indirect
110110
go.opentelemetry.io/proto/otlp v0.12.0 // indirect
111111
golang.org/x/crypto v0.0.0-20220214200702-86341886e292 // indirect
112-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
112+
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c // indirect
113113
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
114114
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
115115
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect

‎go.sum‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -449,8 +449,8 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8
449449
github.com/dimchansky/utfbom v1.1.0/go.mod h1:rO41eb7gLfo8SF1jd9F8HplJm1Fewwi4mQvIirEdv+8=
450450
github.com/dimchansky/utfbom v1.1.1/go.mod h1:SxdoEBH5qIqFocHMyGOXVAybYJdr71b1Q/j0mACtrfE=
451451
github.com/distribution/distribution/v3 v3.0.0-20210316161203-a01c71e2477e/go.mod h1:xpWTC2KnJMiDLkoawhsPQcXjvwATEBcbq0xevG2YR9M=
452-
github.com/distribution/distribution/v3 v3.0.0-20220729163034-26163d82560f h1:3NCYdjXycNd/Xn/iICZzmxkiDX1e1cjTHjbMAz+wRVk=
453-
github.com/distribution/distribution/v3 v3.0.0-20220729163034-26163d82560f/go.mod h1:28YO/VJk9/64+sTGNuYaBjWxrXTPrj0C0XmgTIOjxX4=
452+
github.com/distribution/distribution/v3 v3.0.0-20220902125104-0122d7ddaec0 h1:0UuPq7m6stSY6at1v5PLo0zzYTpailcwjhmkJpgnGBY=
453+
github.com/distribution/distribution/v3 v3.0.0-20220902125104-0122d7ddaec0/go.mod h1:28YO/VJk9/64+sTGNuYaBjWxrXTPrj0C0XmgTIOjxX4=
454454
github.com/dnaeon/go-vcr v1.0.1/go.mod h1:aBB1+wY4s93YsC3HHjMBMrwTj2R9FHDzUr9KyGc8n1E=
455455
github.com/docker/buildx v0.8.2 h1:dsd3F0hhmUydFX/KFrvbK81JvlTA4T3Iy0lwDJt4PsU=
456456
github.com/docker/buildx v0.8.2/go.mod h1:5sMOfNwOmO2jy/MxBL4ySk2LoLIG1tQFu2EU8wbKa34=
@@ -1041,8 +1041,9 @@ github.com/moby/sys/symlink v0.2.0/go.mod h1:7uZVF2dqJjG/NsClqul95CqKOBRQyYSNnJ6
10411041
github.com/moby/term v0.0.0-20200312100748-672ec06f55cd/go.mod h1:DdlQx2hp0Ss5/fLikoLlEeIYiATotOjgB//nb973jeo=
10421042
github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2/go.mod h1:TjQg8pa4iejrUrjiz0MCtMV38jdMNW4doKSiBrEvCQQ=
10431043
github.com/moby/term v0.0.0-20210610120745-9d4ed1856297/go.mod h1:vgPCkQMyxTZ7IDy8SXRufE172gr8+K/JE/7hHFxHW3A=
1044-
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 h1:dcztxKSvZ4Id8iPpHERQBbIJfabdt4wUm5qy3wOL2Zc=
10451044
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
1045+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae h1:O4SWKdcHVCvYqyDV+9CJA1fcDN2L11Bule0iFy3YlAI=
1046+
github.com/moby/term v0.0.0-20220808134915-39b0c02b01ae/go.mod h1:E2VnQOmVuvZB6UYnnDB0qG5Nq/1tD9acaOpo6xmt0Kw=
10461047
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
10471048
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
10481049
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -1644,8 +1645,8 @@ golang.org/x/net v0.0.0-20210825183410-e898025ed96a/go.mod h1:9nx3DQGgdP8bBQD5qx
16441645
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
16451646
golang.org/x/net v0.0.0-20211209124913-491a49abca63/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
16461647
golang.org/x/net v0.0.0-20211216030914-fe4d6282115f/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
1647-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
1648-
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
1648+
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c h1:yKufUcDwucU5urd+50/Opbt4AYpqthk7wHpHok8f1lo=
1649+
golang.org/x/net v0.0.0-20220906165146-f3363e06e74c/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk=
16491650
golang.org/x/oauth2 v0.0.0-20180724155351-3d292e4d0cdc/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
16501651
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
16511652
golang.org/x/oauth2 v0.0.0-20181017192945-9dcd33a902f4/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
@@ -1679,8 +1680,8 @@ golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod h1:RxMgew5VJxzue5/jJ
16791680
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
16801681
golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
16811682
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1682-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4 h1:uVc8UZUe6tr40fFVnUP5Oj+veunVezqYl9z7DYw9xzw=
1683-
golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
1683+
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde h1:ejfdSekXMDxDLbRrJMwUk6KnSLZ2McaUCVcIKM+N6jc=
1684+
golang.org/x/sync v0.0.0-20220819030929-7fc1605a5dde/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
16841685
golang.org/x/sys v0.0.0-20170830134202-bb24a47a89ea/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
16851686
golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
16861687
golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=

0 commit comments

Comments
 (0)