Merge pull request 'fix' (#180) from master into release
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
All checks were successful
SHS Gitea/shstk/pipeline/head This commit looks good
Reviewed-on: https://git.shs.tools/SHS/shstk/pulls/180
This commit was merged in pull request #180.
This commit is contained in:
5
Jenkinsfile
vendored
5
Jenkinsfile
vendored
@@ -8,9 +8,8 @@ def build_docker(docker_image, docker_dir, release_dir) {
|
||||
args += " --build-arg IMAGE_FROM=${docker_image}"
|
||||
args += " --build-arg LIBS_BUILD_NUMBER=${env.BUILD_NUMBER}"
|
||||
args += " --build-arg JOBS_COUNT=${env.JOBS_COUNT}"
|
||||
def shstk_docker = docker.build(${image_name}, ./docker/${docker_dir}-shstk --no-cache ${args})
|
||||
def vol = "-v " + release_dir + ":/soft/release"
|
||||
shstk_docker.inside(vol) {
|
||||
def shstk_docker = docker.build("${image_name}", "./docker/${docker_dir}-shstk --no-cache ${args}")
|
||||
shstk_docker.inside("-v " + release_dir + ":/soft/release") {
|
||||
sh 'cp -vf /soft/shstk/release/* /soft/release/ || true'
|
||||
}
|
||||
return "\n - ${image_name}"
|
||||
|
||||
Reference in New Issue
Block a user