ソースを参照

Merge pull request #287 from chenrui333/go-1.13.4

Bump golang and alpine to latest
Zachary Rice 6 年 前
コミット
c559fdbf04
3 ファイル変更5 行追加7 行削除
  1. 2 3
      .travis.yml
  2. 2 3
      Dockerfile
  3. 1 1
      go.mod

+ 2 - 3
.travis.yml

@@ -1,8 +1,7 @@
-sudo: required
 language: go
 language: go
 go:
 go:
-- 1.13
+- 1.13.x
 services:
 services:
 - docker
 - docker
 script:
 script:
-- env GO111MODULE=on make test
+- make test

+ 2 - 3
Dockerfile

@@ -1,9 +1,9 @@
-FROM golang:1.13.0 AS build
+FROM golang:1.13.4 AS build
 WORKDIR /go/src/github.com/zricethezav/gitleaks
 WORKDIR /go/src/github.com/zricethezav/gitleaks
 COPY . .
 COPY . .
 RUN GO111MODULE=on CGO_ENABLED=0 go build -o bin/gitleaks *.go
 RUN GO111MODULE=on CGO_ENABLED=0 go build -o bin/gitleaks *.go
 
 
-FROM alpine:3.7
+FROM alpine:3.10
 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"]
@@ -14,4 +14,3 @@ ENTRYPOINT ["gitleaks"]
 # docker run --rm --name=gitleaks gitleaks --repo=https://github.com/zricethezav/gitleaks
 # docker run --rm --name=gitleaks gitleaks --repo=https://github.com/zricethezav/gitleaks
 
 
 # This will check for secrets in https://github.com/zricethezav/gitleaks
 # This will check for secrets in https://github.com/zricethezav/gitleaks
-

+ 1 - 1
go.mod

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