diff --git a/Dockerfile b/Dockerfile index 2177830..54d95d0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +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 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 -Xmx"$MAX_RAM"G -Xms"$MIN_RAM"G -jar /server.jar nogui \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index e3304ce..dc027f6 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,4 +3,4 @@ version: '3' services: minecraft: build: . - image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_2 \ No newline at end of file + image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_3 \ No newline at end of file diff --git a/testcraft/templates/configmap.yaml b/testcraft/templates/configmap.yaml index 8357ca2..b132e07 100644 --- a/testcraft/templates/configmap.yaml +++ b/testcraft/templates/configmap.yaml @@ -6,7 +6,6 @@ data: eula.txt: | eula=true server.properties: | - # if you see this it worked v2 boogaloo! max-tick-time=60000 generator-settings= force-gamemode=false diff --git a/testcraft/templates/deploy.yaml b/testcraft/templates/deploy.yaml index 2eef7f9..d89bfdb 100644 --- a/testcraft/templates/deploy.yaml +++ b/testcraft/templates/deploy.yaml @@ -13,7 +13,7 @@ spec: spec: containers: - name: {{ .Release.Name }} - image: {{ .Values.image }}:{{ .Values.tag }} + image: {{ .Values.image }} ports: - containerPort: 25565 volumeMounts: @@ -32,8 +32,6 @@ spec: value: "4" - name: MIN_RAM value: "1" - - name: THREADS - value: "4" resources: requests: memory: "2Gi" diff --git a/testcraft/values.yaml b/testcraft/values.yaml index 272b1d8..7b1c687 100644 --- a/testcraft/values.yaml +++ b/testcraft/values.yaml @@ -1,3 +1,2 @@ -image: hub.ducoterra.net/ducoterra/minecraft -tag: 1.16.1_2 +image: hub.ducoterra.net/ducoterra/minecraft:1.16.1_3 port: 25566 \ No newline at end of file