Go v1.11 (amacneil#60)

* Go v1.11
* [Go Modules](https://github.com/golang/go/wiki/Modules)
* [GolangCI-Lint](https://github.com/golangci/golangci-lint)
* [Distroless](https://github.com/GoogleContainerTools/distroless) docker image

Author: amacneil

.gitignore

@@ -1,5 +1,6 @@
 .DS_Store
 .env
+/dbmate
 /dist
 /testdata/db/schema.sql
 /vendor

Dockerfile

@@ -1,5 +1,5 @@
 # build image
-FROM golang:1.10 as build
+FROM golang:1.11 as build
 
 # required to force cgo (for sqlite driver) with cross compile
 ENV CGO_ENABLED 1
@@ -13,21 +13,17 @@ RUN apt-get update \
 	&& rm -rf /var/lib/apt/lists/*
 
 # development dependencies
-RUN curl -fsSL -o /usr/local/bin/dep https://github.com/golang/dep/releases/download/v0.3.2/dep-linux-amd64 \
-	&& chmod +x /usr/local/bin/dep
-RUN go get gopkg.in/alecthomas/gometalinter.v2 \
-	&& gometalinter.v2 --install
+RUN curl -fsSL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh \
+	| sh -s v1.12.3
 
 # copy source files
-COPY . /go/src/github.com/amacneil/dbmate
-WORKDIR /go/src/github.com/amacneil/dbmate
+COPY . /src
+WORKDIR /src
 
 # build
-RUN make dep install build
+RUN make build
 
 # runtime image
-FROM debian:stretch-slim
-COPY --from=build /go/src/github.com/amacneil/dbmate/dist/dbmate-linux-amd64 \
-	/usr/local/bin/dbmate
-WORKDIR /app
-ENTRYPOINT ["/usr/local/bin/dbmate"]
+FROM gcr.io/distroless/base
+COPY --from=build /src/dist/dbmate-linux-amd64 /dbmate
+ENTRYPOINT ["/dbmate"]

Gopkg.lock

@@ -1,30 +1,21 @@
 DC := docker-compose
 BUILD_FLAGS := -ldflags '-s'
-PACKAGES := . ./pkg/...
 
 .PHONY: all
-all: dep install test lint build
-
-.PHONY: dep
-dep:
-	dep ensure -vendor-only
-
-.PHONY: install
-install:
-	go install -v $(PACKAGES)
+all: test lint build
 
 .PHONY: test
 test:
-	go test -v $(PACKAGES)
+	go test -v ./...
 
 .PHONY: lint
 lint:
-	gometalinter.v2 $(PACKAGES)
+	golangci-lint run
 
 .PHONY: wait
 wait:
-	dbmate -e MYSQL_URL wait
-	dbmate -e POSTGRESQL_URL wait
+	dist/dbmate-linux-amd64 -e MYSQL_URL wait
+	dist/dbmate-linux-amd64 -e POSTGRESQL_URL wait
 
 .PHONY: clean
 clean:

Gopkg.toml

@@ -4,4 +4,4 @@ version: '2.3'
 services:
   dbmate:
     volumes:
-      - .:/go/src/github.com/amacneil/dbmate
+      - .:/src

Makefile

@@ -0,0 +1,13 @@
+module github.com/amacneil/dbmate
+
+require (
+	github.com/davecgh/go-spew v1.1.0 // indirect
+	github.com/go-sql-driver/mysql v0.0.0-20180113200744-2cc627ac8def
+	github.com/joho/godotenv v1.2.0
+	github.com/lib/pq v0.0.0-20180123210206-19c8e9ad0095
+	github.com/mattn/go-sqlite3 v1.6.0
+	github.com/pmezard/go-difflib v1.0.0 // indirect
+	github.com/stretchr/testify v1.2.0
+	github.com/urfave/cli v1.20.0
+	google.golang.org/appengine v1.0.0 // indirect
+)

docker-compose.override.yml

@@ -0,0 +1,18 @@
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/go-sql-driver/mysql v0.0.0-20180113200744-2cc627ac8def h1:S5Q9hDt/aa5nJp7+qwsNSKi9KIlEoSBaNdjyKS44OAQ=
+github.com/go-sql-driver/mysql v0.0.0-20180113200744-2cc627ac8def/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
+github.com/joho/godotenv v1.2.0 h1:vGTvz69FzUFp+X4/bAkb0j5BoLC+9bpqTWY8mjhA9pc=
+github.com/joho/godotenv v1.2.0/go.mod h1:7hK45KPybAkOC6peb+G5yklZfMxEjkZhHbwpqxOKXbg=
+github.com/lib/pq v0.0.0-20180123210206-19c8e9ad0095 h1:Do4XI4HSm+8jdo6z1Zk0CQDgqoAMwWew3ksTcDDSWiA=
+github.com/lib/pq v0.0.0-20180123210206-19c8e9ad0095/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
+github.com/mattn/go-sqlite3 v1.6.0 h1:TDwTWbeII+88Qy55nWlof0DclgAtI4LqGujkYMzmQII=
+github.com/mattn/go-sqlite3 v1.6.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/stretchr/testify v1.2.0 h1:LThGCOvhuJic9Gyd1VBCkhyUXmO8vKaBFvBsJ2k03rg=
+github.com/stretchr/testify v1.2.0/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
+github.com/urfave/cli v1.20.0 h1:fDqGv3UG/4jbVl/QkFwEdddtEDjh/5Ov6X+0B/3bPaw=
+github.com/urfave/cli v1.20.0/go.mod h1:70zkFmudgCuE/ngEzBv17Jvp/497gISqfk5gWijbERA=
+google.golang.org/appengine v1.0.0 h1:dN4LljjBKVChsv0XCSI+zbyzdqrkEwX5LQFUMRSGqOc=
+google.golang.org/appengine v1.0.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=