Skip to content

Commit

Permalink
Merge pull request #2674 from thaJeztah/19.03_backport_bump_golang_1.…
Browse files Browse the repository at this point in the history
…13.15

[19.03 backport] Bump Golang 1.13.15
  • Loading branch information
tiborvass authored Sep 15, 2020
2 parents cc30457 + 36cdb16 commit cd8016b
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ clone_folder: c:\gopath\src\github.com\docker\cli

environment:
GOPATH: c:\gopath
GOVERSION: 1.13.14
GOVERSION: 1.13.15
DEPVERSION: v0.4.1

install:
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.binary-native
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.13.14
ARG GO_VERSION=1.13.15

FROM golang:${GO_VERSION}-alpine

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.cross
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.13.14
ARG GO_VERSION=1.13.15

FROM dockercore/golang-cross:${GO_VERSION}
ENV DISABLE_WARN_OUTSIDE_CONTAINER=1
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.dev
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.13.14
ARG GO_VERSION=1.13.15

FROM golang:${GO_VERSION}-alpine

Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.e2e
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.13.14
ARG GO_VERSION=1.13.15

# Use Debian based image as docker-compose requires glibc.
FROM golang:${GO_VERSION}-buster
Expand Down
2 changes: 1 addition & 1 deletion dockerfiles/Dockerfile.lint
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# syntax=docker/dockerfile:1.1.3-experimental

ARG GO_VERSION=1.13.14
ARG GO_VERSION=1.13.15
ARG GOLANGCI_LINTER_SHA="v1.21.0"

FROM golang:${GO_VERSION}-alpine AS build
Expand Down

0 comments on commit cd8016b

Please sign in to comment.