From 6408ebaf5bb4d3662b4708d8174324952a42a081 Mon Sep 17 00:00:00 2001 From: peri4 Date: Sat, 24 Jul 2021 18:35:42 +0300 Subject: [PATCH] Jenkinsfile --- Jenkinsfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 28cbcb2..484b04b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,6 +1,6 @@ def build_docker(name, release_dir) { - def image = "${name}-shstk" - echo "Build image ${image}" + def image_name = "${name}-shstk" + echo "Build image ${image_name}" def pref = "" if (env.DOCKER_PREFIX) { pref = "--build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/" @@ -10,13 +10,13 @@ def build_docker(name, release_dir) { jobs = "${env.JOBS_COUNT}" } def args = "${pref} --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER} --build-arg JOBS_COUNT=${jobs}" - dir ("docker/${image}") { - sh "docker build ${args} --no-cache -t ${image} ." - docker.image('${image}').inside('-v ${release_dir}:/soft/release') { + dir ("docker/${image_name}") { + sh "docker build ${args} --no-cache -t ${image_name} ." + docker.image(image_name).inside('-v ${release_dir}:/soft/release') { sh 'cp -vf /soft/shstk/release/* /soft/release/' } } - return "\n - ${image}" + return "\n - ${image_name}" } node { stage("checkout") { -- 2.43.0