Merge branch 'master' into Support-audit-shell-script

aquasecurity · Nov 30, 2020 · 8a2fdcc · 8a2fdcc
2 parents 3b76409 + 400fb43
commit 8a2fdcc
Show file tree

Hide file tree

Showing 3 changed files with 192 additions and 20 deletions.
diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -8,12 +8,18 @@ builds:
       - linux
     goarch:
       - amd64
+      - arm
+      - arm64
+    goarm:
+      - 6
+      - 7
     ldflags:
      - "-X github.com/aquasecurity/linux-bench/root.cfgDir={{.Env.LINUXBENCH_CFG}}"
 # Archive customization
 archives:
   - id: compress
     format: tar.gz
+    name_template: '{{ .Binary }}_{{.Version}}_{{ .Os }}_{{ .Arch }}{{ if .Arm }}v{{.Arm }}{{ end }}'
     files:
       - "cfg/**/*"
 nfpms:

diff --git a/go.mod b/go.mod
@@ -1,10 +1,10 @@
 module github.com/aquasecurity/linux-bench
 
-go 1.12
+go 1.13
 
 require (
 	github.com/aquasecurity/bench-common v0.4.4
 	github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b
-	github.com/spf13/cobra v0.0.5
-	github.com/spf13/viper v1.4.0
+	github.com/spf13/cobra v1.1.1
+	github.com/spf13/viper v1.7.1
 )