diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index b203de9..9c52c7d 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -67,14 +67,5 @@ jobs: with: version: v0.7.1 - - name: ci/scan-docker-security - uses: aquasecurity/trivy-action@0.10.0 - with: - image-ref: "mattermost/node-rotator" - format: "table" - ignore-unfixed: true - vuln-type: "os,library" - severity: "CRITICAL" - - name: ci/docker-push-pr run: make push-image-pr diff --git a/Makefile b/Makefile index e0f9f40..eca4a9b 100644 --- a/Makefile +++ b/Makefile @@ -23,10 +23,6 @@ GOLANGCILINT_VER := v1.50.1 GOLANGCILINT_BIN := golangci-lint GOLANGCILINT := $(TOOLS_BIN_DIR)/$(GOLANGCILINT_BIN) -TRIVY_SEVERITY := CRITICAL -TRIVY_EXIT_CODE := 1 -TRIVY_VULN_TYPE := os,library - export GO111MODULE=on all: check-style unittest fmt @@ -68,9 +64,6 @@ binaries: ## Build binaries of Rotator GOOS=linux GOARCH=arm64 CGO_ENABLED=0 $(GO) build -gcflags all=-trimpath=$(PWD) -asmflags all=-trimpath=$(PWD) -a -installsuffix cgo -o build/_output/bin/rotator-linux-arm64 ./cmd/$(APP) GOOS=darwin GOARCH=arm64 CGO_ENABLED=0 $(GO) build -gcflags all=-trimpath=$(PWD) -asmflags all=-trimpath=$(PWD) -a -installsuffix cgo -o build/_output/bin/rotator-darwin-arm64 ./cmd/$(APP) -.PHONY: scan -scan: - trivy image $(ROTATOR_IMAGE) # Builds the docker image .PHONY: build-image build-image: ## Build the docker image for rotator