Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions .github/actions/docker-build/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,6 @@ runs:
- name: ci/prepare-docker-environment
uses: ./.github/actions/docker-prepare

- name: cd/scan-docker-security
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.29.0
with:
image-ref: "mattermost/mattermost-cloud"
format: "table"
ignore-unfixed: true
vuln-type: "os,library"
severity: "CRITICAL"

- name: cd/build-docker-e2e-pr
run: make build-image-e2e-pr
shell: bash
Expand All @@ -26,15 +17,6 @@ runs:
shell: bash
if: github.event_name != 'pull_request'

- name: cd/scan-docker-security-e2e
uses: aquasecurity/trivy-action@6e7b7d1fd3e4fef0c5fa8cce1229c54b2c9bd0d8 # v0.29.0
with:
image-ref: "mattermost/mattermost-cloud-e2e"
format: "table"
ignore-unfixed: true
vuln-type: "os,library"
severity: "CRITICAL"

- name: cd/push-image-pr
run: "make push-image-pr"
shell: bash
Expand Down
9 changes: 0 additions & 9 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -73,9 +73,6 @@ GOLANGCILINT_VER := v1.64.8
GOLANGCILINT_BIN := golangci-lint
GOLANGCILINT := $(TOOLS_BIN_DIR)/$(GOLANGCILINT_BIN)

TRIVY_SEVERITY := CRITICAL
TRIVY_EXIT_CODE := 1
TRIVY_VULN_TYPE := os,library

# ====================================================================================
# Used for semver bumping
Expand Down Expand Up @@ -160,12 +157,6 @@ goimports: $(GOIMPORTS)
done
@echo "goimports success"; \

## Checks for vulnerabilities
.PHONY: trivy
trivy: build-image-parallel
@echo running trivy
@trivy image --format table --exit-code $(TRIVY_EXIT_CODE) --ignore-unfixed --vuln-type $(TRIVY_VULN_TYPE) --severity $(TRIVY_SEVERITY) $(MATTERMOST_CLOUD_IMAGE)

## Builds and thats all :)
.PHONY: dist
dist: build
Expand Down
Loading