diff --git a/.gitlab-ci.jsonnet b/.gitlab-ci.jsonnet index 51452d07fc974a68480d8d5ceda09e46bb359702..50388f20b4add3a851821fd13e7693c9422c8211 100644 --- a/.gitlab-ci.jsonnet +++ b/.gitlab-ci.jsonnet @@ -1,4 +1,4 @@ -local dockerfile_name(image) = if image == "" then "Dockerfile" else "Dockerfile." + image; +local dockerfile_name(image) = if (image == "") then ("Dockerfile") else ("Dockerfile." + image); local param_cmd(image) = { cmd: ||| /kaniko/executor @@ -6,7 +6,7 @@ local param_cmd(image) = { --dockerfile "${CI_PROJECT_DIR}/%(df)s" --destination "${CI_REGISTRY_IMAGE}/%(img)s:${CI_COMMIT_SHORT_SHA}" --destination "${CI_REGISTRY_IMAGE}/%(img)s:latest" - ||| % {img: image, df: dockerfile_name(df)}, + ||| % {img: image, df: dockerfile_name(image)}, }; local param_job(image, depends=[]) = { stage: 'build', @@ -23,7 +23,7 @@ local param_job(image, depends=[]) = { }; { "bor": param_job("",[]), - "alltools": param_job("alltools",[]), - "classic": param_job("classic",[]), - "release": param_job("release",[]), + "alltools": param_job("alltools", []), + "classic": param_job("classic", []), + "release": param_job("release", []), }