Skip to content

Commit d053613

Browse files
committed
chore: run snyk test & monitor before publishing image
1 parent cb1ca95 commit d053613

File tree

2 files changed

+36
-12
lines changed

2 files changed

+36
-12
lines changed

.circleci/config.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -622,18 +622,30 @@ jobs:
622622
- install_helm
623623
- run:
624624
command: |
625-
LATEST_TAG_WITH_V=`git describe --abbrev=0 --tags ${CIRCLE_SHA1}` &&
626-
LATEST_TAG=${LATEST_TAG_WITH_V:1} &&
627-
IMAGE_NAME_APPROVED=snyk/kubernetes-monitor:${LATEST_TAG}-approved &&
628-
IMAGE_NAME_PUBLISHED=snyk/kubernetes-monitor:${LATEST_TAG} &&
625+
LATEST_TAG_WITH_V=`git describe --abbrev=0 --tags ${CIRCLE_SHA1}`
626+
LATEST_TAG=${LATEST_TAG_WITH_V:1}
627+
IMAGE_NAME_APPROVED=snyk/kubernetes-monitor:${LATEST_TAG}-approved
628+
IMAGE_NAME_PUBLISHED=snyk/kubernetes-monitor:${LATEST_TAG}
629+
echo "export LATEST_TAG=${LATEST_TAG}" >> $BASH_ENV
630+
echo "export IMAGE_NAME_APPROVED=${IMAGE_NAME_APPROVED}" >> $BASH_ENV
631+
echo "export IMAGE_NAME_PUBLISHED=${IMAGE_NAME_PUBLISHED}" >> $BASH_ENV
632+
name: Export environment variables
633+
- snyk/scan:
634+
monitor-on-build: true
635+
severity-threshold: high
636+
- snyk/scan:
637+
docker-image-name: ${IMAGE_NAME_APPROVED}
638+
monitor-on-build: true
639+
severity-threshold: high
640+
target-file: Dockerfile
641+
- run:
642+
command: |
629643
docker login --username ${DOCKERHUB_USER} --password ${DOCKERHUB_PASSWORD} &&
630644
docker pull ${IMAGE_NAME_APPROVED} &&
631645
docker tag ${IMAGE_NAME_APPROVED} ${IMAGE_NAME_PUBLISHED} &&
632646
docker push ${IMAGE_NAME_PUBLISHED} &&
633647
./scripts/slack/notify_push.py ${IMAGE_NAME_PUBLISHED} &&
634648
./scripts/publish-gh-pages.sh ${LATEST_TAG}
635-
# Preserve the latest tag for the next steps of this job
636-
echo "export LATEST_TAG=${LATEST_TAG}" >> $BASH_ENV
637649
name: Publish
638650
- run:
639651
command: |

.circleci/config/jobs/@jobs.yml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -412,21 +412,33 @@ publish:
412412
- setup_remote_docker
413413
- install_python_requests
414414
- install_helm
415+
- run:
416+
name: Export environment variables
417+
command: |
418+
LATEST_TAG_WITH_V=`git describe --abbrev=0 --tags ${CIRCLE_SHA1}`
419+
LATEST_TAG=${LATEST_TAG_WITH_V:1}
420+
IMAGE_NAME_APPROVED=snyk/kubernetes-monitor:${LATEST_TAG}-approved
421+
IMAGE_NAME_PUBLISHED=snyk/kubernetes-monitor:${LATEST_TAG}
422+
echo "export LATEST_TAG=${LATEST_TAG}" >> $BASH_ENV
423+
echo "export IMAGE_NAME_APPROVED=${IMAGE_NAME_APPROVED}" >> $BASH_ENV
424+
echo "export IMAGE_NAME_PUBLISHED=${IMAGE_NAME_PUBLISHED}" >> $BASH_ENV
425+
- snyk/scan:
426+
severity-threshold: high
427+
monitor-on-build: true
428+
- snyk/scan:
429+
docker-image-name: ${IMAGE_NAME_APPROVED}
430+
severity-threshold: high
431+
target-file: Dockerfile
432+
monitor-on-build: true
415433
- run:
416434
name: Publish
417435
command: |
418-
LATEST_TAG_WITH_V=`git describe --abbrev=0 --tags ${CIRCLE_SHA1}` &&
419-
LATEST_TAG=${LATEST_TAG_WITH_V:1} &&
420-
IMAGE_NAME_APPROVED=snyk/kubernetes-monitor:${LATEST_TAG}-approved &&
421-
IMAGE_NAME_PUBLISHED=snyk/kubernetes-monitor:${LATEST_TAG} &&
422436
docker login --username ${DOCKERHUB_USER} --password ${DOCKERHUB_PASSWORD} &&
423437
docker pull ${IMAGE_NAME_APPROVED} &&
424438
docker tag ${IMAGE_NAME_APPROVED} ${IMAGE_NAME_PUBLISHED} &&
425439
docker push ${IMAGE_NAME_PUBLISHED} &&
426440
./scripts/slack/notify_push.py ${IMAGE_NAME_PUBLISHED} &&
427441
./scripts/publish-gh-pages.sh ${LATEST_TAG}
428-
# Preserve the latest tag for the next steps of this job
429-
echo "export LATEST_TAG=${LATEST_TAG}" >> $BASH_ENV
430442
- run:
431443
name: Download operator-sdk
432444
command: |

0 commit comments

Comments
 (0)