diff options
| author | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-22 21:09:54 +0300 |
|---|---|---|
| committer | GitLab Bot <gitlab-bot@gitlab.com> | 2020-09-22 21:09:54 +0300 |
| commit | 3bb41f7bdd2a94887af92fc33e8afac1032f0fbc (patch) | |
| tree | b4feed3b050d8fc930dc4ea747409965a71d4952 /vendor | |
| parent | eb08c8e6f8a49d5a621be0301aad0b1b475eb739 (diff) | |
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/Dockerfile/Golang-alpine.Dockerfile | 2 | ||||
| -rw-r--r-- | vendor/Dockerfile/Golang-scratch.Dockerfile | 2 | ||||
| -rw-r--r-- | vendor/Dockerfile/Golang.Dockerfile | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/vendor/Dockerfile/Golang-alpine.Dockerfile b/vendor/Dockerfile/Golang-alpine.Dockerfile index 0287315219b..acea2eb9ace 100644 --- a/vendor/Dockerfile/Golang-alpine.Dockerfile +++ b/vendor/Dockerfile/Golang-alpine.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8-alpine AS builder +FROM golang:1.15-alpine AS builder WORKDIR /usr/src/app diff --git a/vendor/Dockerfile/Golang-scratch.Dockerfile b/vendor/Dockerfile/Golang-scratch.Dockerfile index 9057a2d0e51..e5fd03c9a38 100644 --- a/vendor/Dockerfile/Golang-scratch.Dockerfile +++ b/vendor/Dockerfile/Golang-scratch.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8-alpine AS builder +FROM golang:1.15-alpine AS builder # We'll likely need to add SSL root certificates RUN apk --no-cache add ca-certificates diff --git a/vendor/Dockerfile/Golang.Dockerfile b/vendor/Dockerfile/Golang.Dockerfile index f9699dff665..bef0fdce065 100644 --- a/vendor/Dockerfile/Golang.Dockerfile +++ b/vendor/Dockerfile/Golang.Dockerfile @@ -1,4 +1,4 @@ -FROM golang:1.8 AS builder +FROM golang:1.15 AS builder WORKDIR /usr/src/app |