github
/
docker-amiga-gcc
mirror of https://github.com/AmigaPorts/docker-amiga-gcc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix prefix path for alt images

This commit is contained in:
Marlon Beijer 2023-05-12 13:47:25 +02:00
parent 6a6b06c29a
commit 05df2c9733
No known key found for this signature in database
GPG Key ID: 9429F4B7659C93B8
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -7,8 +7,9 @@ FROM amigadev/docker-base:latest
ARG BUILD_OS
ARG BUILD_PFX
ARG PREFIX
ENV CROSS_PFX $BUILD_PFX
ENV CROSS_PFX $PREFIX
ENV OS_NAME $BUILD_OS
COPY --from=build-env /opt/${CROSS_PFX} /opt/${CROSS_PFX}

4
JenkinsEnv.json
View File

@ -4,6 +4,7 @@
"DockerRoot": "amigadev",
"DockerImage": "crosstools",
"DockerTag": "m68k-amigaos",
"Prefix": "",
"Dockerfile": "Dockerfile",
"BuildIfSuccessful": "",
"BuildParam": "AmigaOS"
@ -12,6 +13,7 @@
"DockerRoot": "amigadev",
"DockerImage": "crosstools",
"DockerTag": "m68k-amigaos-gcc10",
"Prefix": "m68k-amigaos",
"Dockerfile": "Dockerfile",
"BuildIfSuccessful": "",
"BuildParam": "AmigaOS"
@ -20,6 +22,7 @@
"DockerRoot": "amigadev",
"DockerImage": "crosstools",
"DockerTag": "ppc-amigaos",
"Prefix": "",
"Dockerfile": "Dockerfile",
"BuildIfSuccessful": "",
"BuildParam": "AmigaOS"
@ -29,6 +32,7 @@
"DockerRoot": "amigadev",
"DockerImage": "crosstools",
"DockerTag": "ppc-morphos",
"Prefix": "",
"Dockerfile": "Dockerfile",
"BuildIfSuccessful": "",
"BuildParam": "MorphOS"

12
Jenkinsfile vendored
View File

@ -38,7 +38,7 @@ def killall_jobs() {
echo "Done killing";
}
def buildStep(DOCKER_ROOT, DOCKERIMAGE, DOCKERTAG, DOCKERFILE, BUILD_NEXT, BUILD_OS) {
def buildStep(DOCKER_ROOT, DOCKERIMAGE, DOCKERTAG, DOCKERFILE, BUILD_NEXT, BUILD_OS, PREFIX) {
def fixed_job_name = env.JOB_NAME.replace('%2F','/');
try {
checkout scm;
@ -55,10 +55,14 @@ def buildStep(DOCKER_ROOT, DOCKERIMAGE, DOCKERTAG, DOCKERFILE, BUILD_NEXT, BUILD
throw new Exception("Invalid branch, stopping build!");
}
if (PREFIX.equals('')) {
PREFIX = "${tag}";
}
docker.withRegistry("https://index.docker.io/v1/", "dockerhub") {
def customImage
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} --network=host --pull -f ${DOCKERFILE} .");
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} .");
}
stage("Pushing to docker hub registry...") {
@ -97,7 +101,7 @@ node('master') {
project.builds.each { v ->
branches["Build ${v.DockerRoot}/${v.DockerImage}:${v.DockerTag}"] = {
node {
buildStep(v.DockerRoot, v.DockerImage, v.DockerTag, v.Dockerfile, v.BuildIfSuccessful, v.BuildParam);
buildStep(v.DockerRoot, v.DockerImage, v.DockerTag, v.Dockerfile, v.BuildIfSuccessful, v.BuildParam, v.Prefix);
}
}
}
@ -107,7 +111,7 @@ node('master') {
if ("${v.DockerTag}".equals("${BUILD_IMAGE}")) {
branches["Build ${v.DockerRoot}/${v.DockerImage}:${v.DockerTag}"] = {
node {
buildStep(v.DockerRoot, v.DockerImage, v.DockerTag, v.Dockerfile, v.BuildIfSuccessful, v.BuildParam);
buildStep(v.DockerRoot, v.DockerImage, v.DockerTag, v.Dockerfile, v.BuildIfSuccessful, v.BuildParam, v.Prefix);
}
}
}