fix docker stuff

.dockerignore

@@ -1,5 +1,6 @@
 .dockerignore
 .git
 .gitignore
-Dockerfile
+docker/server.Dockerfile
+docker-compose.yml
 server/

Dockerfile

@@ -1,26 +0,0 @@
-FROM ghcr.io/paradigmmc/mcman:latest as builder
-WORKDIR /server
-COPY . .
-RUN mcman build
-
-FROM eclipse-temurin:17-alpine
-USER 1000:1000
-WORKDIR /server
-COPY --from=builder --chown=1000:1000 /server/server/ /server
-VOLUME /server/cache \
-       /server/plugins/Essentials/userdata \
-       /server/plugins/Essentials/warps \
-       /server/plugins/Essentials/kits.yml \
-       /server/plugins/FastAsyncWorldEdit/schematics \
-       /server/plugins/FastAsyncWorldEdit/sessions \
-       /server/plugins/TotalFreedomMod/activitylog.yml \
-       /server/plugins/TotalFreedomMod/database.db \
-       /server/plugins/TotalFreedomMod/indefinitebans.yml \
-       /server/plugins/TotalFreedomMod/permissions.yml \
-       /server/plugins/TotalFreedomMod/punishments.yml \
-       /server/plugins/WorldGuard/cache \
-       /server/plugins/WorldGuard/worlds \
-       /server/worlds
-       /server/ops.json
-
-ENTRYPOINT [ "/server/start.sh" ]

docker-compose.yml

@@ -15,16 +15,14 @@ services:
     image: server
     build:
       context: .
-      dockerfile: ./Dockerfile
+      dockerfile: ./docker/server.Dockerfile
     restart: unless-stopped
     tty: true
     stdin_open: true
-    cap_drop:
-      - ALL
     init: true
     depends_on:
       - database
     ports:
       - 25565:25565
       - 25565:25565/udp
-      - 25765:25765
+      - 25765:25765

docker/entrypoint.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+chown -R server:server /server
+
+su-exec server:server /server/start.sh

docker/server.Dockerfile

@@ -0,0 +1,15 @@
+FROM ghcr.io/paradigmmc/mcman:latest as builder
+WORKDIR /server
+COPY . .
+RUN mcman build
+
+FROM eclipse-temurin:17-alpine
+RUN addgroup -S server && adduser -S server -G server
+RUN apk add --no-cache su-exec
+COPY --from=builder --chown=1000:1000 /server/server/ /server
+
+VOLUME /server
+WORKDIR /server
+
+COPY ./docker/entrypoint.sh /entrypoint.sh
+ENTRYPOINT [ "/entrypoint.sh" ]

server.toml

@@ -13,10 +13,10 @@ TELNET_PORT = "25765"
 # Don't change these if you're running on docker
 DATABASE_HOST = "database"
 DATABASE_PORT = "3306"
-
-DATABASE_NAME = "iptfreedom"
 DATABASE_USER = "root"
+
 DATABASE_PASS = "XTiMm5LkPACxyjJ4bXm5wXsFmHTwYDNY"
+DATABASE_NAME = "iptfreedom"
 
 OWNERS = "maniaplay"
 EXECUTIVES = "G6_"