diff --git a/Dockerfile b/Dockerfile index 78b504f..4ea394e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,16 @@ FROM debian:buster-slim -LABEL maintainer="Jonathan Ervine " - -# Set ENV variables -ENV VERSION='1.16.201.02' \ - BEDROCK_USER='bedrock' \ - BEDROCK_UID='1003' +LABEL maintainer="Jonathan Ervine docker@ervine.org" # Install updates - RUN apt update && apt upgrade -y && \ apt install unzip curl -y && \ mkdir /bedrock && cd /bedrock && \ - curl -LO https://minecraft.azureedge.net/bin-linux/bedrock-server-$VERSION.zip && unzip bedrock-server-$VERSION.zip && \ - rm bedrock-server-$VERSION.zip && \ - addgroup $BEDROCK_USER && \ - adduser --no-create-home --uid $BEDROCK_UID --ingroup $BEDROCK_USER --disabled-password --quiet --shell /bin/bash --gecos bedrock $BEDROCK_USER && \ - chown -R $BEDROCK_USER:$BEDROCK_USER /bedrock + curl -LO https://minecraft.azureedge.net/bin-linux/bedrock-server-1.16.210.06.zip && unzip bedrock-server-1.16.210.06.zip && \ + rm bedrock-server-1.16.210.06.zip && \ + addgroup bedrock && \ + adduser --no-create-home --uid 1027 --ingroup bedrock --disabled-password --quiet --shell /bin/bash --gecos bedrock bedrock && \ + chown -R bedrock:bedrock /bedrock ADD start.sh /usr/local/bin/ diff --git a/Jenkinsfile b/Jenkinsfile index 5d9f4fa..966c34e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -3,7 +3,7 @@ kind: Pod spec: containers: - name: kaniko - image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251 + image: gcr.io/kaniko-project/executor:debug imagePullPolicy: Always command: - /busybox/cat @@ -27,11 +27,11 @@ spec: stage('Build with Kaniko') { git url: 'ssh://git@git.ervine.org/jonny/x86_64-debian-bedrock.git', credentialsId: 'jenkins-to-git' container('kaniko') { - sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/debian/bedrock:latest --destination=harbor.ervine.dev/public/x86_64/debian/bedrock:1.16.201.02' + sh '/kaniko/executor -f `pwd`/Dockerfile -c `pwd` --cache=false --destination=harbor.ervine.dev/public/x86_64/debian/bedrock:latest --destination=harbor.ervine.dev/public/x86_64/debian/bedrock:1.16.210.06' } } stage('Notify gchat') { - hangoutsNotify message: "Bedrock Server 1.16.201.02 on debian has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false + hangoutsNotify message: "Bedrock Server 1.16.210.06 on debian has built",token: "A2ET831pVslqXTqAx6ycu573r",threadByJob: false } } }