Merge branch 'public-single-node' into pmm-6401-read-prometheus-data-files

This commit is contained in:
Aliaksandr Valialkin 2023-02-09 14:26:43 -08:00
commit dcc4b84319
No known key found for this signature in database
GPG key ID: A72BEC6CD3D0DED1
2 changed files with 2 additions and 2 deletions

View file

@ -42,7 +42,7 @@ jobs:
- name: build & publish - name: build & publish
run: | run: |
docker scan --login --token "$SNYK_TOKEN" --accept-license docker scan --severity=medium --login --token "$SNYK_TOKEN" --accept-license
LATEST_TAG=nightly PKG_TAG=nightly make publish LATEST_TAG=nightly PKG_TAG=nightly make publish
env: env:
SNYK_TOKEN: ${{ secrets.SNYK_AUTH_TOKEN }} SNYK_TOKEN: ${{ secrets.SNYK_AUTH_TOKEN }}

View file

@ -17,7 +17,7 @@ package-base:
deployment/docker/base deployment/docker/base
docker-scan: package-base docker-scan: package-base
docker scan --accept-license $(BASE_IMAGE) || (echo "❌ The build has been terminated because critical vulnerabilities were found in $(BASE_IMAGE)"; exit 1) docker scan --severity=medium --accept-license $(BASE_IMAGE) || (echo "❌ The build has been terminated because critical vulnerabilities were found in $(BASE_IMAGE)"; exit 1)
package-builder: package-builder:
(docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q '$(BUILDER_IMAGE)$$') \ (docker image ls --format '{{.Repository}}:{{.Tag}}' | grep -q '$(BUILDER_IMAGE)$$') \