From 8276b93116e8f36c86bdb737a9454fedd794b997 Mon Sep 17 00:00:00 2001 From: Ildar Galeev Date: Thu, 9 Jul 2020 17:22:31 +0300 Subject: [PATCH] Added security pipeline (#17) --- Jenkinsfile | 4 ++-- Makefile | 2 +- build_utils | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index d7a9c81..0608e49 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -24,7 +24,7 @@ build('wallet-utils', 'docker-host') { runStage('build image') { sh 'make build_image' } - + runFESecurityTools() try { if (env.BRANCH_NAME == 'master') { runStage('push image') { @@ -37,6 +37,6 @@ build('wallet-utils', 'docker-host') { } } } - pipeDefault(pipeline, 'dr2.rbkmoney.com', 'jenkins_harbor') + pipeDefault(pipeline) } diff --git a/Makefile b/Makefile index 4843e80..32810f5 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,7 @@ SERVICE_IMAGE_PUSH_TAG ?= $(SERVICE_IMAGE_TAG) BASE_IMAGE_NAME := service-fe BASE_IMAGE_TAG := 2b4570bc1d9631c10aaed2132eb87eb9003f3471 -BUILD_IMAGE_TAG := a3d509385d655f6a5ada4b37c5884d5423aeb78b +BUILD_IMAGE_TAG := b04c5291d101132e53e578d96e1628d2e6dab0c0 CALL_W_CONTAINER := init test build clean submodules diff --git a/build_utils b/build_utils index b9b18f3..5cb25f0 160000 --- a/build_utils +++ b/build_utils @@ -1 +1 @@ -Subproject commit b9b18f3ee375aa5fd105daf57189ac242c40f572 +Subproject commit 5cb25f049c719a608276a99fc4fbe852187019ca