Forráskód Böngészése

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

Zachary Rice 5 éve
szülő
commit
11dcb44e41
3 módosított fájl, 6 hozzáadás és 3 törlés
  1. 2 2
      Dockerfile
  2. 3 0
      Makefile
  3. 1 1
      go.mod

+ 2 - 2
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
 WORKDIR /go/src/github.com/zricethezav/gitleaks
 ARG ldflags
 ARG ldflags
 COPY . .
 COPY . .
 RUN GO111MODULE=on CGO_ENABLED=0 go build -o bin/gitleaks -ldflags "-X="${ldflags} *.go 
 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
 RUN apk add --no-cache bash git openssh
 COPY --from=build /go/src/github.com/zricethezav/gitleaks/bin/* /usr/bin/
 COPY --from=build /go/src/github.com/zricethezav/gitleaks/bin/* /usr/bin/
 ENTRYPOINT ["gitleaks"]
 ENTRYPOINT ["gitleaks"]

+ 3 - 0
Makefile

@@ -47,3 +47,6 @@ deploy:
 	docker build --build-arg ldflags=$(_LDFLAGS) -f Dockerfile -t zricethezav/gitleaks:latest -t zricethezav/gitleaks:$(VERSION) . 
 	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"
 	echo "Pushing zricethezav/gitleaks:$(VERSION) and zricethezav/gitleaks:latest"
 	docker push zricethezav/gitleaks
 	docker push zricethezav/gitleaks
+
+dockerbuild: 
+	docker build --build-arg ldflags=$(_LDFLAGS) -f Dockerfile -t zricethezav/gitleaks:latest -t zricethezav/gitleaks:$(VERSION) . 

+ 1 - 1
go.mod

@@ -1,6 +1,6 @@
 module github.com/zricethezav/gitleaks/v4
 module github.com/zricethezav/gitleaks/v4
 
 
-go 1.13
+go 1.14
 
 
 require (
 require (
 	github.com/BurntSushi/toml v0.3.1
 	github.com/BurntSushi/toml v0.3.1