diff --git a/Dockerfile b/Dockerfile index e37adb5..2177830 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,6 @@ FROM openjdk:8-slim -WORKDIR /mc_server -COPY ./server . +COPY server.jar /server.jar RUN groupadd -r minecraft && useradd --no-log-init -r -g minecraft minecraft WORKDIR /mc_data @@ -9,5 +8,4 @@ RUN chown -R minecraft:minecraft . USER minecraft # Copy files only if they don't yet exist (server.jar, server.properties, etc) and start the server -CMD cp -r /mc_server/. . && \ -java -server -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSIncrementalPacing -XX:ParallelGCThreads="$THREADS" -XX:+AggressiveOpts -Xmx"$MAX_RAM"G -Xms"$MIN_RAM"G -jar server.jar nogui \ No newline at end of file +CMD java -server -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:+CMSIncrementalPacing -XX:ParallelGCThreads="$THREADS" -XX:+AggressiveOpts -Xmx"$MAX_RAM"G -Xms"$MIN_RAM"G -jar /server.jar nogui \ No newline at end of file diff --git a/build.sh b/build.sh deleted file mode 100755 index 8dcd5bc..0000000 --- a/build.sh +++ /dev/null @@ -1,3 +0,0 @@ -docker-compose build mc -docker-compose push mc -kubectl apply -f k8s/ \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index 25cf906..e3304ce 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,15 +3,4 @@ version: '3' services: minecraft: build: . - ports: - - 25565:25565 - volumes: - - ./data:/mc_data - tty: true - stdin_open: true - restart: always - environment: - - MAX_RAM=2 - - MIN_RAM=1 - - THREADS=2 - user: minecraft \ No newline at end of file + image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_2 \ No newline at end of file diff --git a/helm/templates/configmap.yaml b/helm/templates/configmap.yaml new file mode 100644 index 0000000..8357ca2 --- /dev/null +++ b/helm/templates/configmap.yaml @@ -0,0 +1,46 @@ +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ .Release.Name }} +data: + eula.txt: | + eula=true + server.properties: | + # if you see this it worked v2 boogaloo! + max-tick-time=60000 + generator-settings= + force-gamemode=false + allow-nether=true + gamemode=0 + broadcast-console-to-ops=true + enable-query=false + player-idle-timeout=0 + difficulty=3 + spawn-monsters=true + op-permission-level=4 + pvp=true + snooper-enabled=true + level-type=amplified + hardcore=false + enable-command-block=false + max-players=20 + network-compression-threshold=256 + resource-pack-sha1= + max-world-size=29999984 + server-port=25565 + server-ip= + spawn-npcs=true + allow-flight=true + level-name=world + view-distance=32 + resource-pack= + spawn-animals=true + white-list=true + generate-structures=true + online-mode=true + max-build-height=512 + level-seed= + prevent-proxy-connections=false + use-native-transport=true + motd=This is gonna be interesting + enable-rcon=false \ No newline at end of file diff --git a/helm/templates/deploy.yaml b/helm/templates/deploy.yaml index 846ea26..2eef7f9 100644 --- a/helm/templates/deploy.yaml +++ b/helm/templates/deploy.yaml @@ -19,6 +19,12 @@ spec: volumeMounts: - mountPath: /mc_data name: data + - name: properties + mountPath: /mc_data/server.properties + subPath: server.properties + - name: properties + mountPath: /mc_data/eula.txt + subPath: eula.txt tty: true stdin: true env: @@ -33,9 +39,12 @@ spec: memory: "2Gi" cpu: 250m limits: - memory: "4Gi" + memory: "8Gi" cpu: "4" volumes: - name: data persistentVolumeClaim: claimName: {{ .Release.Name }} + - name: properties + configMap: + name: {{ .Release.Name }} \ No newline at end of file diff --git a/helm/values.yaml b/helm/values.yaml index 5cc143f..efd1fbc 100644 --- a/helm/values.yaml +++ b/helm/values.yaml @@ -1,3 +1 @@ -image: hub.ducoterra.net/ducoterra/minecraft -# tag: 1.16.1 -# port: 25565 \ No newline at end of file +image: hub.ducoterra.net/ducoterra/minecraft \ No newline at end of file diff --git a/img/edit.png b/img/edit.png deleted file mode 100644 index 37b1c16..0000000 Binary files a/img/edit.png and /dev/null differ diff --git a/img/main.png b/img/main.png deleted file mode 100644 index d155511..0000000 Binary files a/img/main.png and /dev/null differ diff --git a/img/menu.png b/img/menu.png deleted file mode 100644 index 537ea7e..0000000 Binary files a/img/menu.png and /dev/null differ diff --git a/img/server.png b/img/server.png deleted file mode 100644 index 7f8b73d..0000000 Binary files a/img/server.png and /dev/null differ diff --git a/server/server.jar b/server.jar similarity index 100% rename from server/server.jar rename to server.jar diff --git a/server/eula.txt b/server/eula.txt deleted file mode 100644 index ac74b96..0000000 --- a/server/eula.txt +++ /dev/null @@ -1 +0,0 @@ -eula=true \ No newline at end of file diff --git a/server/server.properties b/server/server.properties deleted file mode 100644 index a362aad..0000000 --- a/server/server.properties +++ /dev/null @@ -1,39 +0,0 @@ -#Minecraft server properties -#Thu Jan 02 01:15:23 UTC 2020 -max-tick-time=60000 -generator-settings= -force-gamemode=false -allow-nether=true -gamemode=0 -broadcast-console-to-ops=true -enable-query=false -player-idle-timeout=0 -difficulty=3 -spawn-monsters=true -op-permission-level=4 -pvp=true -snooper-enabled=true -level-type=amplified -hardcore=false -enable-command-block=false -max-players=20 -network-compression-threshold=256 -resource-pack-sha1= -max-world-size=29999984 -server-port=25565 -server-ip= -spawn-npcs=true -allow-flight=true -level-name=world -view-distance=32 -resource-pack= -spawn-animals=true -white-list=true -generate-structures=true -online-mode=true -max-build-height=512 -level-seed= -prevent-proxy-connections=false -use-native-transport=true -motd=This is gonna be interesting -enable-rcon=false diff --git a/servers.md b/servers.md index c9d1382..67a699d 100644 --- a/servers.md +++ b/servers.md @@ -3,17 +3,17 @@ ## Minecraft ```bash -helm install minecraft ./helm --set tag=1.15.2_7 --set port=25565 +helm upgrade --install minecraft ./helm --set tag=1.15.2_7 --set port=25565 ``` ## Pubcraft ```bash -helm install pubcraft ./helm --set tag=1.15.2_7 --set port=20100 +helm upgrade --install pubcraft ./helm --set tag=1.15.2_7 --set port=20100 ``` ## TestCraft ```bash -helm install testcraft ./helm --set tag=1.16.1 --set port=25566 +helm upgrade --install testcraft ./helm --set tag=1.16.1_2 --set port=25566 ```