qad, Jenkinsfile

Jenkinsfile

@@ -1,15 +1,18 @@
 @Library('SHS.Platforms') _
-def build_docker(docker_image, docker_dir, release_dir) {
+def build_docker(dist, release_dir) {
-	def image_name = "${docker_image}-shstk"
+	def image_name = "${dist.docker_image}-shstk"
 	echo "Build image ${image_name}"
 	def args = ""
+	for (arg in dist.docker_build_options) {
+		args += " --build-arg ${arg.key}=\"${arg.value}\""
+	}
 	if (env.DOCKER_PREFIX) {
 		args += " --build-arg DOCKER_PREFIX=${env.DOCKER_PREFIX}/"
 	}
-	args += " --build-arg IMAGE_FROM=${docker_image}"
+	args += " --build-arg IMAGE_FROM=${dist.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 shstk_docker = docker.build("${image_name}", "./docker/${dist.docker_dir}-shstk --no-cache ${args}")
 	shstk_docker.inside("-v " + release_dir + ":/soft/release") {
 		sh 'cp -vf /soft/shstk/release/* /soft/release/ || true'
 	}
@@ -31,7 +34,7 @@ node {
 
 	def _msg = "Built images:"
 	pl.forEach ({ dist ->
-		_msg += build_docker(dist.docker_image, dist.docker_dir, rel_dir)
+		_msg += build_docker(dist, rel_dir)
 	}, stageSuffix: "-shstk")
 
 	stage("Clean") {