Merge branch 'master' of ssh://git.ervine.org/jonny/x86_64-debian-bedrock

This commit is contained in:
Jon Ervine 2021-04-09 21:12:47 +08:00
commit 8c1323efd1
2 changed files with 9 additions and 15 deletions

View File

@ -1,22 +1,16 @@
FROM debian:buster-slim FROM debian:buster-slim
LABEL maintainer="Jonathan Ervine <docker@ervine.org>" LABEL maintainer="Jonathan Ervine docker@ervine.org"
# Set ENV variables
ENV VERSION='1.16.201.02' \
BEDROCK_USER='bedrock' \
BEDROCK_UID='1003'
# Install updates # Install updates
RUN apt update && apt upgrade -y && \ RUN apt update && apt upgrade -y && \
apt install unzip curl -y && \ apt install unzip curl -y && \
mkdir /bedrock && cd /bedrock && \ mkdir /bedrock && cd /bedrock && \
curl -LO https://minecraft.azureedge.net/bin-linux/bedrock-server-$VERSION.zip && unzip bedrock-server-$VERSION.zip && \ 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-$VERSION.zip && \ rm bedrock-server-1.16.210.06.zip && \
addgroup $BEDROCK_USER && \ addgroup bedrock && \
adduser --no-create-home --uid $BEDROCK_UID --ingroup $BEDROCK_USER --disabled-password --quiet --shell /bin/bash --gecos bedrock $BEDROCK_USER && \ adduser --no-create-home --uid 1027 --ingroup bedrock --disabled-password --quiet --shell /bin/bash --gecos bedrock bedrock && \
chown -R $BEDROCK_USER:$BEDROCK_USER /bedrock chown -R bedrock:bedrock /bedrock
ADD start.sh /usr/local/bin/ ADD start.sh /usr/local/bin/

6
Jenkinsfile vendored
View File

@ -3,7 +3,7 @@ kind: Pod
spec: spec:
containers: containers:
- name: kaniko - name: kaniko
image: gcr.io/kaniko-project/executor:debug-539ddefcae3fd6b411a95982a830d987f4214251 image: gcr.io/kaniko-project/executor:debug
imagePullPolicy: Always imagePullPolicy: Always
command: command:
- /busybox/cat - /busybox/cat
@ -27,11 +27,11 @@ spec:
stage('Build with Kaniko') { stage('Build with Kaniko') {
git url: 'ssh://git@git.ervine.org/jonny/x86_64-debian-bedrock.git', credentialsId: 'jenkins-to-git' git url: 'ssh://git@git.ervine.org/jonny/x86_64-debian-bedrock.git', credentialsId: 'jenkins-to-git'
container('kaniko') { 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') { 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
} }
} }
} }