Merge pull request #24 from gabeduke/develop

Release
gabeduke · Sep 16, 2019 · 7c719e8 · 7c719e8
2 parents cfc17cf + de14369
commit 7c719e8
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/.release b/.release
@@ -1 +1 @@
-1.0.18
+1.0.19
diff --git a/Dockerfile b/Dockerfile
@@ -3,17 +3,20 @@ FROM golang as build
 # cache modules layer
 WORKDIR /app
 COPY go.mod go.sum ./
-RUN go get -d -v ./...
+RUN go mod download
 
 # build app layer
 COPY . .
-RUN go build -v .
+
+ENV CGO_ENABLED=0
+ENV GOOS=linux
+RUN go build -a -installsuffix cgo -o level
 
 # executable layer
 FROM scratch
-COPY --from=build level /
+COPY --from=build /app/level level
 
 # executable layer
 ENV PORT 8080
 EXPOSE 8080
-ENTRYPOINT ["/level"]
+ENTRYPOINT ["./level"]
diff --git a/Makefile b/Makefile
@@ -1,8 +1,15 @@
+TAG ?= latest
+IMG ?= level
+REGISTRY := dukeman
+
 fmt:
 	go fmt ./...
 
 test:
 	go test ./... -race
 
 lint:
-	golangci-lint run
+	golangci-lint run
+
+docker-build:
+	DOCKER_BUILDKIT=1 docker build --progress=plain -t $(REGISTRY)/$(IMG):$(TAG) .