From 14e4df179af9a9626ad62488f77fb9e61baec43d Mon Sep 17 00:00:00 2001 From: Hyatt Date: Sun, 28 Nov 2021 00:19:27 +0000 Subject: [PATCH] Update 'build-minecraft.jenkins' --- build-minecraft.jenkins | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/build-minecraft.jenkins b/build-minecraft.jenkins index 602952c..814bb6d 100644 --- a/build-minecraft.jenkins +++ b/build-minecraft.jenkins @@ -64,15 +64,14 @@ spec: def dockerFile = """ FROM ${baseImage}:${baseImageTag} +ARG paperDownload + MAINTAINER The_Spider RUN sed -i -r -e 's/v3.14\\/community/edge\\/community/' /etc/apk/repositories && \\ apk add --no-cache ${alpineJavaPackage} curl jq && \\ addgroup -S -g 1000 minecraft && \\ adduser -S minecraft -G minecraft -h /minecraft -u 1000 && \\ - paperBuild=\$(curl --silent --location --fail https://papermc.io/api/v2/projects/paper/versions/${paperVersion} | jq '.builds | max') && \\ - paperFile=\$(curl --silent --location --fail https://papermc.io/api/v2/projects/paper/versions/${paperVersion}/builds/\${paperBuild} | jq '.downloads.application.name') && \\ - paperDownload="https://papermc.io/api/v2/projects/paper/versions/${paperVersion}/builds/\${paperBuild}/downloads/\${paperFile}" && \\ curl --location --fail --silent \${paperDownload} -o /minecraft/paper-mc.jar && \\ mkdir /minecraft/data && \\ mkdir /minecraft/html && \\ @@ -90,7 +89,12 @@ CMD cd data; java -Xms${memoryMin} -Xmx${memoryMax} -jar ../paper-mc.jar stage ("Build & Push") { container ("kaniko") { - sh "/kaniko/executor --cleanup --context \"${workspace}\" -f \"${workspace}/Dockerfile\" --destination \"${repository}/library/minecraft:latest\"" + sh """ + paperBuild=$(curl --silent --location --fail https://papermc.io/api/v2/projects/paper/versions/${paperVersion} | jq '.builds | max') + paperFile=$(curl --silent --location --fail https://papermc.io/api/v2/projects/paper/versions/${paperVersion}/builds/${paperBuild} | jq '.downloads.application.name') + paperDownload="https://papermc.io/api/v2/projects/paper/versions/${paperVersion}/builds/${paperBuild}/downloads/\${paperFile}" + /kaniko/executor --cleanup --context "${workspace}" -f "${workspace}/Dockerfile" --destination "${repository}/library/minecraft:latest" --build-arg "paperDownload=${paperDownload}" + """ } } }