github/docker-amiga-gcc
1
0
Fork 0
mirror of https://github.com/AmigaPorts/docker-amiga-gcc.git synced 2025-11-19 16:22:32 +00:00
Code Issues Releases Wiki Activity

Fix Jenkinsfile

Browse Source
This commit is contained in:
Marlon Beijer
2024-09-23 20:15:14 +02:00
parent ef4c275727
commit 918ce13c79
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Jenkinsfile vendored
View File

@ -38,7 +38,7 @@ def killall_jobs() {
echo "Done killing"; echo "Done killing";
} }
def buildStep(DOCKER_ROOT, DOCKERIMAGE, DOCKERTAG, DOCKERFILE, BUILD_NEXT, BUILD_OS, PREFIX) { def buildStep(DOCKER_ROOT, DOCKERIMAGE, DOCKERTAG, EXTRATAG, DOCKERFILE, BUILD_NEXT, BUILD_OS, PREFIX) {
def fixed_job_name = env.JOB_NAME.replace('%2F','/'); def fixed_job_name = env.JOB_NAME.replace('%2F','/');
try { try {
sh "rm -rfv ./*" sh "rm -rfv ./*"
@ -63,7 +63,7 @@ def buildStep(DOCKER_ROOT, DOCKERIMAGE, DOCKERTAG, DOCKERFILE, BUILD_NEXT, BUILD
docker.withRegistry("https://index.docker.io/v1/", "dockerhub") { docker.withRegistry("https://index.docker.io/v1/", "dockerhub") {
def customImage def customImage
stage("Building ${DOCKERIMAGE}:${tag}...") { stage("Building ${DOCKERIMAGE}:${tag}...") {
customImage = docker.build("${DOCKER_ROOT}/${DOCKERIMAGE}:${tag}", "--build-arg BUILDENV=${buildenv} --build-arg BUILD_OS=${BUILD_OS} --build-arg BUILD_PFX=${tag} --build-arg PREFIX=${PREFIX} --network=host --pull -f ${DOCKERFILE} ."); customImage = docker.build("${DOCKER_ROOT}/${DOCKERIMAGE}:${tag}_${EXTRATAG}", "--build-arg BUILDENV=${buildenv} --build-arg BUILD_OS=${BUILD_OS} --build-arg BUILD_PFX=${tag} --build-arg PREFIX=${PREFIX} --network=host --pull -f ${DOCKERFILE} .");
} }
stage("Pushing to docker hub registry...") { stage("Pushing to docker hub registry...") {
@ -132,7 +132,7 @@ def steps(v) {
platforms["Build ${v.DockerRoot}/${v.DockerImage}:${v.DockerTag}_${p}"] = { platforms["Build ${v.DockerRoot}/${v.DockerImage}:${v.DockerTag}_${p}"] = {
stage("Build ${p} version") { stage("Build ${p} version") {
node(p) { node(p) {
buildStep(v.DockerRoot, v.DockerImage, "${v.DockerTag}_${p}", v.Dockerfile, [], v.BuildParam, v.Prefix); buildStep(v.DockerRoot, v.DockerImage, v.DockerTag, p, v.Dockerfile, [], v.BuildParam, v.Prefix);
} }
} }
} }