Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Commit 39558c7

Browse files
authored
Merge pull request #836 from docker/bump-deps
Bump dependencies
2 parents 62aca44 + c8b8a9f commit 39558c7

File tree

3 files changed

+125
-64
lines changed

3 files changed

+125
-64
lines changed

Dockerfile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,9 @@
1515
# See the License for the specific language governing permissions and
1616
# limitations under the License.
1717

18-
ARG GO_VERSION=1.15.2-alpine
19-
ARG GOLANGCI_LINT_VERSION=v1.31.0-alpine
18+
ARG GO_VERSION=1.15.3-alpine
19+
ARG GOLANGCI_LINT_VERSION=v1.32.0-alpine
20+
ARG PROTOC_GEN_GO_VERSION=v1.4.3
2021

2122
FROM --platform=${BUILDPLATFORM} golang:${GO_VERSION} AS base
2223
WORKDIR /compose-cli
@@ -32,7 +33,8 @@ RUN --mount=type=cache,target=/go/pkg/mod \
3233
go mod download
3334

3435
FROM base AS make-protos
35-
RUN go get github.com/golang/protobuf/[email protected]
36+
ARG PROTOC_GEN_GO_VERSION
37+
RUN go get github.com/golang/protobuf/protoc-gen-go@${PROTOC_GEN_GO_VERSION}
3638
COPY . .
3739
RUN make -f builder.Makefile protos
3840

go.mod

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,20 @@ require (
1010
github.com/AlecAivazis/survey/v2 v2.1.1
1111
github.com/Azure/azure-sdk-for-go v43.3.0+incompatible
1212
github.com/Azure/azure-storage-file-go v0.8.0
13-
github.com/Azure/go-autorest/autorest v0.11.4
14-
github.com/Azure/go-autorest/autorest/adal v0.9.2
15-
github.com/Azure/go-autorest/autorest/azure/auth v0.5.1
16-
github.com/Azure/go-autorest/autorest/azure/cli v0.4.0
13+
github.com/Azure/go-autorest/autorest v0.11.10
14+
github.com/Azure/go-autorest/autorest/adal v0.9.5
15+
github.com/Azure/go-autorest/autorest/azure/auth v0.5.3
16+
github.com/Azure/go-autorest/autorest/azure/cli v0.4.2
1717
github.com/Azure/go-autorest/autorest/date v0.3.0
1818
github.com/Azure/go-autorest/autorest/to v0.4.0
1919
github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
2020
github.com/Microsoft/go-winio v0.4.15-0.20190919025122-fc70bd9a86b5
2121
github.com/Microsoft/hcsshim v0.8.9 // indirect
22-
github.com/aws/aws-sdk-go v1.35.7
23-
github.com/awslabs/goformation/v4 v4.15.2
22+
github.com/aws/aws-sdk-go v1.35.15
23+
github.com/awslabs/goformation/v4 v4.15.3
2424
github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129
2525
github.com/compose-spec/compose-go v0.0.0-20201005072614-3b6106793209
26-
github.com/containerd/console v1.0.0
26+
github.com/containerd/console v1.0.1
2727
github.com/containerd/containerd v1.3.5 // indirect
2828
github.com/docker/cli v0.0.0-20200528204125-dd360c7c0de8
2929
github.com/docker/distribution v0.0.0-00010101000000-000000000000 // indirect
@@ -35,36 +35,34 @@ require (
3535
github.com/gobwas/pool v0.2.0 // indirect
3636
github.com/gobwas/ws v1.0.4
3737
github.com/golang/mock v1.4.4
38-
github.com/golang/protobuf v1.4.2
38+
github.com/golang/protobuf v1.4.3
3939
github.com/google/go-cmp v0.5.2
4040
github.com/google/uuid v1.1.2
4141
github.com/gorilla/mux v1.7.4 // indirect
4242
github.com/hashicorp/go-multierror v1.1.0
4343
github.com/joho/godotenv v1.3.0
4444
github.com/labstack/echo v3.3.10+incompatible
4545
github.com/labstack/gommon v0.3.0 // indirect
46-
github.com/moby/term v0.0.0-20200611042045-63b9a826fb74
46+
github.com/moby/term v0.0.0-20200915141129-7f0af18e79f2
4747
github.com/morikuni/aec v1.0.0
48-
github.com/onsi/gomega v1.10.1 // indirect
4948
github.com/opencontainers/go-digest v1.0.0
5049
github.com/opencontainers/runc v0.1.1 // indirect
5150
github.com/pkg/errors v0.9.1
52-
github.com/prometheus/tsdb v0.7.1
51+
github.com/prometheus/tsdb v0.10.0
5352
github.com/sanathkr/go-yaml v0.0.0-20170819195128-ed9d249f429b
5453
github.com/sirupsen/logrus v1.7.0
55-
github.com/smartystreets/goconvey v1.6.4 // indirect
56-
github.com/spf13/cobra v1.0.0
54+
github.com/spf13/cobra v1.1.1
5755
github.com/spf13/pflag v1.0.5
5856
github.com/stretchr/testify v1.6.1
5957
github.com/valyala/fasttemplate v1.2.1 // indirect
6058
golang.org/x/mod v0.3.0
61-
golang.org/x/net v0.0.0-20200822124328-c89045814202
59+
golang.org/x/net v0.0.0-20201026091529-146b70c837a4
6260
golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43
63-
golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208
64-
google.golang.org/grpc v1.32.0
61+
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
62+
google.golang.org/grpc v1.33.1
6563
google.golang.org/protobuf v1.25.0
6664
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
67-
gopkg.in/ini.v1 v1.61.0
65+
gopkg.in/ini.v1 v1.62.0
6866
gotest.tools v2.2.0+incompatible
69-
gotest.tools/v3 v3.0.2
67+
gotest.tools/v3 v3.0.3
7068
)

0 commit comments

Comments
 (0)