Merge pull request #1485 from thaJeztah/bump_golang_1.12.8

Bump golang 1.12.10 (CVE-2019-9512, CVE-2019-9514, CVE-2019-16276)
notaryproject · Oct 17, 2019 · 66d40e4 · 66d40e4
2 parents b6b9f01 + 868ccd5
commit 66d40e4
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 16 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.12.7
+FROM golang:1.12.10
 
 RUN apt-get update && apt-get install -y \
 	curl \

diff --git a/cross.Dockerfile b/cross.Dockerfile
@@ -1,4 +1,4 @@
-FROM dockercore/golang-cross:1.11.5
+FROM dockercore/golang-cross:1.12.10
 
 RUN apt-get update && apt-get install -y \
 	curl \

diff --git a/escrow.Dockerfile b/escrow.Dockerfile
@@ -1,4 +1,4 @@
-FROM golang:1.11.5-alpine
+FROM golang:1.12.10-alpine
 
 ENV NOTARYPKG github.com/theupdateframework/notary
 

diff --git a/migrations/README.md b/migrations/README.md
@@ -1,7 +1,7 @@
 # Database Migrations
 
 This directory contains database migrations for the server and signer. They
-are being managed using [this tool](https://github.com/mattes/migrate).
+are being managed using [this tool](https://github.com/golang-migrate/migrate).
 Within each of the server and signer directories are directories for different
 database backends. Notary server and signer use GORM and are therefore 
 capable of running on a number of different databases, however migrations

diff --git a/server.Dockerfile b/server.Dockerfile
@@ -1,9 +1,9 @@
-FROM golang:1.11.5-alpine
+FROM golang:1.12.10-alpine
 
 RUN apk add --update git gcc libc-dev
 
-# Pin to the specific v3.0.0 version
-RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate
+ARG MIGRATE_VER=v4.6.2
+RUN GO111MODULE=on go get -tags 'mysql postgres file' github.com/golang-migrate/migrate/v4/cli@${MIGRATE_VER} && mv /go/bin/cli /go/bin/migrate
 
 ENV NOTARYPKG github.com/theupdateframework/notary
 

diff --git a/server.minimal.Dockerfile b/server.minimal.Dockerfile
@@ -1,7 +1,8 @@
-FROM golang:1.11.5-alpine AS build-env
+FROM golang:1.12.10-alpine AS build-env
 RUN apk add --update git gcc libc-dev
-# Pin to the specific v3.0.0 version
-RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate
+
+ARG MIGRATE_VER=v4.6.2
+RUN GO111MODULE=on go get -tags 'mysql postgres file' github.com/golang-migrate/migrate/v4/cli@${MIGRATE_VER} && mv /go/bin/cli /go/bin/migrate
 
 ENV NOTARYPKG github.com/theupdateframework/notary
 

diff --git a/signer.Dockerfile b/signer.Dockerfile
@@ -1,9 +1,9 @@
-FROM golang:1.11.5-alpine
+FROM golang:1.12.10-alpine
 
 RUN apk add --update git gcc libc-dev
 
-# Pin to the specific v3.0.0 version
-RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate
+ARG MIGRATE_VER=v4.6.2
+RUN GO111MODULE=on go get -tags 'mysql postgres file' github.com/golang-migrate/migrate/v4/cli@${MIGRATE_VER} && mv /go/bin/cli /go/bin/migrate
 
 ENV NOTARYPKG github.com/theupdateframework/notary
 

diff --git a/signer.minimal.Dockerfile b/signer.minimal.Dockerfile
@@ -1,7 +1,9 @@
-FROM golang:1.11.5-alpine AS build-env
+FROM golang:1.12.10-alpine AS build-env
 RUN apk add --update git gcc libc-dev
-# Pin to the specific v3.0.0 version
-RUN go get -tags 'mysql postgres file' github.com/mattes/migrate/cli && mv /go/bin/cli /go/bin/migrate
+
+ARG MIGRATE_VER=v4.6.2
+RUN GO111MODULE=on go get -tags 'mysql postgres file' github.com/golang-migrate/migrate/v4/cli@${MIGRATE_VER} && mv /go/bin/cli /go/bin/migrate
+
 
 ENV NOTARYPKG github.com/theupdateframework/notary