Update to image-embedded-b4d989a87f36044474a7767fab5d62cbe5e8aeb (#11)

* Update to image-embedded-b4d989a87f36044474a7767fab5d62cbe5e8aeb

* Update build_utils
This commit is contained in:
niku64 2019-06-21 16:31:41 +03:00 committed by GitHub
parent 78046c54b5
commit 294d280ff4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 12 deletions

16
Jenkinsfile vendored
View File

@ -6,15 +6,15 @@ build('image-service-erlang', 'docker-host') {
runStage('submodules') {
sh 'make submodules'
}
try {
docker.withRegistry('https://dr2.rbkmoney.com/v2/', 'jenkins_harbor') {
runStage('build image') { sh 'make' }
if (env.BRANCH_NAME == 'master') {
runStage('push image') { sh 'make push' }
}
}
try {
docker.withRegistry('https://dr2.rbkmoney.com/v2/', 'jenkins_harbor') {
runStage('build image') { sh 'make' }
if (env.BRANCH_NAME == 'master') {
runStage('push image') { sh 'make push' }
}
} finally {
runStage('Clean up') { sh 'make clean' }
}
} finally {
runStage('Clean up') { sh 'make clean' }
}
}

View File

@ -1,8 +1,6 @@
SERVICE_NAME := service-erlang
BASE_IMAGE_NAME := embedded-base
BASE_IMAGE_TAG := 11f4297c13bf4beb73f34831161cbd966d4f5157
REGISTRY ?= dr2.rbkmoney.com
BASE_IMAGE_TAG := b4d989a87f36044474a7767fab5d62cbe5e8aebf
UTILS_PATH := build_utils

@ -1 +1 @@
Subproject commit 9e92a504f08f2294e0451f4e902d376763d38180
Subproject commit ea4aa042f482551d624fd49a570d28488f479e93