use new s6-rc layout

.editorconfig

@@ -1,12 +0,0 @@
-root = true
-
-[*]
-end_of_line = lf
-charset = utf-8
-trim_trailing_whitespace = true
-insert_final_newline = true
-indent_style = space
-indent_size = 4
-
-[*.yml]
-indent_size = 2

.gitlab-ci.yml

@@ -1,13 +1,18 @@
 variables:
-  IMAGE_NAME: thallian/minecraft
+  CONTAINER_NAME: thallian/minecraft
 
 build:
   stage: build
+  image:
+    name: gcr.io/kaniko-project/executor:debug
+    entrypoint: [""]
   script:
-    - docker login -u $DOCKER_USER -p $DOCKER_PASSWORD $DOCKER_REGISTRY
+    - mkdir -p /kaniko/.docker
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_SHA .
+    - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json
-    - docker build -t $IMAGE_NAME:$CI_COMMIT_REF_NAME .
+    - >-
-    - docker build -t $IMAGE_NAME:latest .
+      /kaniko/executor
-    - docker push $IMAGE_NAME:$CI_COMMIT_SHA
+      --context "$CI_PROJECT_DIR"
-    - docker push $IMAGE_NAME:$CI_COMMIT_REF_NAME
+      --dockerfile "$CI_PROJECT_DIR/Dockerfile"
-    - docker push $IMAGE_NAME:latest
+      --destination "$CONTAINER_NAME:$CI_COMMIT_SHA"
+      --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME"
+      --destination "$CONTAINER_NAME:latest"

Dockerfile

@@ -3,24 +3,28 @@ FROM thallian/confd-env:latest
 RUN addgroup minecraft -g 2222
 RUN adduser -u 2222 -h /var/lib/minecraft -D -G minecraft minecraft
 
-ENV VERSION=1.17.1
+ENV VERSION=1.18.1
-ENV SERIAL=400
+ENV SERIAL=198
-ENV SHA256_SUM=3b8ea78e28f5f5224ef692762e36150e16c352e9159f6cb00db466a0de787f38
+ENV SHA256_SUM=8074cb747c215777c0d16bae4abbe98acda6b9a1f6a223dd128a44175ed33075
 RUN wget -O /var/lib/minecraft/paper.jar \
 	https://papermc.io/api/v2/projects/paper/versions/$VERSION/builds/$SERIAL/downloads/paper-$VERSION-$SERIAL.jar 
 
 RUN echo "$SHA256_SUM  /var/lib/minecraft/paper.jar" | sha256sum -c - || exit 1
 
 RUN apk add --no-cache \
-    openssl
+    openssl \
-
+	openjdk17-jre-headless
-RUN apk add --no-cache --repository=http://dl-cdn.alpinelinux.org/alpine/edge/community \
-    openjdk17-jre-headless
-
-RUN mkdir -p /etc/services.d/minecraft/
 
 ADD /rootfs /
 
+RUN mkdir /var/lib/minecraft/settings
+WORKDIR /var/lib/minecraft
+
+RUN ln -s ops.json settings/ops.json
+RUN ln -s whitelist.json settings/whitelist.json
+RUN ln -s banned-ips.json settings/banned-ips.json
+RUN ln -s banned-players.json settings/banned-players.json
+
 RUN chown -R minecraft:minecraft /var/lib/minecraft
 
 VOLUME /var/lib/minecraft/world /var/lib/minecraft/world_nether /var/lib/minecraft/world_the_end /var/lib/minecraft/plugins

rootfs/etc/s6-overlay/s6-rc.d/minecraft/dependencies

@@ -0,0 +1 @@
+confd

rootfs/etc/s6-overlay/s6-rc.d/minecraft/run

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+cd /var/lib/minecraft
+exec s6-setuidgid minecraft java -Xms${MIN_RAM:-512M} -Xmx${MAX_RAM:-512M} -XX:+UseG1GC -jar /var/lib/minecraft/paper.jar

rootfs/etc/s6-overlay/s6-rc.d/minecraft/type

@@ -0,0 +1 @@
+longrun

rootfs/etc/services.d/minecraft/run

@@ -1,4 +1,4 @@
-#!/usr/bin/with-contenv sh
+#!/bin/sh
 
 cd /var/lib/minecraft
 exec s6-setuidgid minecraft java -Xms${MIN_RAM:-512M} -Xmx${MAX_RAM:-512M} -XX:+UseG1GC -jar /var/lib/minecraft/paper.jar