SHS/docker
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix Jenkinsfile

Browse Source
This commit is contained in:
peri4
2026-08-20 12:31:24 +03:00
parent 00e3edb173
commit 779212abb7
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+13 -9
View File
@@ -17,6 +17,13 @@ node {
if (Boolean.valueOf(no_docker_cache)) {
docker_cache_arg = "--no-cache"
}
def docker_prefix_arg = ""
def dprefix = "${env.DOCKER_PREFIX}"
if (dprefix != "") {
if (!dprefix.endsWith("/")) dprefix += "/"
docker_prefix_arg = " --build-arg DOCKER_PREFIX=${dprefix}"
}
stage("Download SRC") {
checkout scm
}
@@ -25,12 +32,12 @@ node {
pl.get()
stage("Debian-base") {
docker.build("${env.DOCKER_PREFIX}/debian-base", "./debian-base ${docker_cache_arg}")
docker.build("${env.DOCKER_PREFIX}/debian-base", "./debian-base ${docker_cache_arg} ${docker_prefix_arg}")
}
if (pl.root().platforms.OSX.enabled) {
stage("OSXcross") {
docker.build("${env.DOCKER_PREFIX}/osxcross", "./osxcross ${docker_cache_arg} --build-arg XCODE_XIP=172.17.0.1/Xcode_10.3.xip")
docker.build("${env.DOCKER_PREFIX}/osxcross", "./osxcross ${docker_cache_arg} ${docker_prefix_arg} --build-arg XCODE_XIP=172.17.0.1/Xcode_10.3.xip")
}
}
@@ -49,20 +56,17 @@ node {
}
}
docker.build("${env.DOCKER_PREFIX}/windows-base", "./windows-base ${docker_cache_arg}")
docker.build("${env.DOCKER_PREFIX}/windows-base-32", "./windows-base-env32 ${docker_cache_arg}")
docker.build("${env.DOCKER_PREFIX}/windows-base-64", "./windows-base-env64 ${docker_cache_arg}")
docker.build("${env.DOCKER_PREFIX}/windows-base", "./windows-base ${docker_cache_arg} ${docker_prefix_arg}")
docker.build("${env.DOCKER_PREFIX}/windows-base-32", "./windows-base-env32 ${docker_cache_arg} ${docker_prefix_arg}")
docker.build("${env.DOCKER_PREFIX}/windows-base-64", "./windows-base-env64 ${docker_cache_arg} ${docker_prefix_arg}")
pl.forEach ({ dist ->
def args = "./${dist.docker.directory} ${docker_cache_arg}"
def args = "./${dist.docker.directory} ${docker_cache_arg} ${docker_prefix_arg}"
for (arg in dist.docker.build_options) {
args += " --build-arg ${arg.key}=\"${arg.value}\""
}
args += " --build-arg JOBS_COUNT=${jobs}"
args += " --build-arg JOBS_QT_COUNT=${jobs_qt}"
def dprefix = "${env.DOCKER_PREFIX}"
if (dprefix != "" && !dprefix.endsWith("/")) dprefix += "/"
args += " --build-arg DOCKER_PREFIX=${dprefix}"
//print "${env.DOCKER_PREFIX}/${dist.docker.image_basename} -> ${args}"
docker.build("${env.DOCKER_PREFIX}/${dist.docker.image_basename}", args)
},