new platforms

This commit is contained in:
2024-12-25 13:00:41 +03:00
parent 43dd680a78
commit 39fae97c62

8
Jenkinsfile vendored
View File

@@ -1,7 +1,7 @@
@Library('SHS.Platforms') _
def build_docker(dist, release_dir, is_testing, is_debug) {
def image_from = "${dist.docker_image}"
def image_name = "${dist.docker_image}-shstk"
def image_from = "${dist.docker.image_basename}"
def image_name = "${dist.docker.image_basename}-shstk"
if (is_testing) {
image_name += "-test"
}
@@ -12,7 +12,7 @@ def build_docker(dist, release_dir, is_testing, is_debug) {
echo "Build image ${image_name}"
def args = ""
for (arg in dist.docker_build_options) {
for (arg in dist.docker.build_options) {
args += " --build-arg ${arg.key}=\"${arg.value}\""
}
if (env.DOCKER_PREFIX) {
@@ -26,7 +26,7 @@ def build_docker(dist, release_dir, is_testing, is_debug) {
args += " --build-arg IMAGE_FROM=${image_from}"
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/${dist.docker_dir}-shstk --no-cache ${args}")
def shstk_docker = docker.build("${image_name}", "./docker/${dist.docker.directory}-shstk --no-cache ${args}")
shstk_docker.inside("-v " + release_dir + ":/soft/release") {
sh 'cp -vf /soft/shstk/release/* /soft/release/ || true'
}