From 93d53a5ae84d81945eedadfe8f6865530d61d51c Mon Sep 17 00:00:00 2001
From: Dale Hui <dhui@users.noreply.github.com>
Date: Tue, 4 Sep 2018 22:18:49 -0700
Subject: [PATCH] Use Go 1.11 (with modules enabled on alpine linux 3.8) for
 docker builds

---
 Dockerfile | 17 +++++------------
 1 file changed, 5 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index f04c748..cea678d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,26 +1,19 @@
-FROM golang:1.10-alpine3.7 AS downloader
+FROM golang:1.11-alpine3.8 AS downloader
 ARG VERSION
 
-RUN apk add --no-cache git gcc musl-dev curl
-
-RUN curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.4.1/dep-linux-amd64 && chmod +x /usr/local/bin/dep
+RUN apk add --no-cache git gcc musl-dev
 
 WORKDIR /go/src/github.com/golang-migrate/migrate
 
-COPY Gopkg.toml Gopkg.lock ./
-RUN dep ensure -vendor-only
-
-COPY *.go ./
-COPY cli ./cli
-COPY database ./database
-COPY source ./source
+COPY . ./
 
+ENV GO111MODULE=on
 ENV DATABASES="postgres mysql redshift cassandra spanner cockroachdb clickhouse"
 ENV SOURCES="file go_bindata github aws_s3 google_cloud_storage"
 
 RUN go build -a -o build/migrate.linux-386 -ldflags="-X main.Version=${VERSION}" -tags "$DATABASES $SOURCES" ./cli
 
-FROM alpine:3.7
+FROM alpine:3.8
 
 RUN apk add --no-cache ca-certificates