bump to go 1.14 and alpine to 3.11 (#363)

gitleaks · Apr 5, 2020 · 11dcb44 · 11dcb44
1 parent af0df6e
commit 11dcb44
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,10 +1,10 @@
-FROM golang:1.13.4 AS build
+FROM golang:1.14.1 AS build
 WORKDIR /go/src/github.com/zricethezav/gitleaks
 ARG ldflags
 COPY . .
 RUN GO111MODULE=on CGO_ENABLED=0 go build -o bin/gitleaks -ldflags "-X="${ldflags} *.go 
 
-FROM alpine:3.10
+FROM alpine:3.11
 RUN apk add --no-cache bash git openssh
 COPY --from=build /go/src/github.com/zricethezav/gitleaks/bin/* /usr/bin/
 ENTRYPOINT ["gitleaks"]

diff --git a/Makefile b/Makefile
@@ -47,3 +47,6 @@ deploy:
 	docker build --build-arg ldflags=$(_LDFLAGS) -f Dockerfile -t zricethezav/gitleaks:latest -t zricethezav/gitleaks:$(VERSION) . 
 	echo "Pushing zricethezav/gitleaks:$(VERSION) and zricethezav/gitleaks:latest"
 	docker push zricethezav/gitleaks
+
+dockerbuild: 
+	docker build --build-arg ldflags=$(_LDFLAGS) -f Dockerfile -t zricethezav/gitleaks:latest -t zricethezav/gitleaks:$(VERSION) . 
diff --git a/go.mod b/go.mod
@@ -1,6 +1,6 @@
 module github.com/zricethezav/gitleaks/v4
 
-go 1.13
+go 1.14
 
 require (
 	github.com/BurntSushi/toml v0.3.1