diff --git a/Dockerfile b/Dockerfile index 9b4c9c3..a04cd9b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM openjdk:8-slim -RUN apt update && apt install -y rsync +RUN apt update && apt install -y rsync htop WORKDIR /mc_server COPY ./server . diff --git a/README.md b/README.md index 4b6f081..65bc7f1 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# Minecraft +# Pubcraft ## Getting server.jar diff --git a/docker-compose.yaml b/docker-compose.yaml index 47ea6f5..86c2450 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -3,7 +3,7 @@ version: '3' services: minecraft: build: . - image: hub.ducoterra.net/ducoterra/minecraft:20w12a.7 + image: hub.ducoterra.net/ducoterra/pubcraft:1.15.2_3 ports: - 25565:25565 volumes: 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/k8s/deploy.yaml b/k8s/deploy.yaml index d420811..ed73137 100644 --- a/k8s/deploy.yaml +++ b/k8s/deploy.yaml @@ -1,19 +1,19 @@ apiVersion: apps/v1 kind: Deployment metadata: - name: minecraft + name: pubcraft spec: selector: matchLabels: - app: minecraft + app: pubcraft template: metadata: labels: - app: minecraft + app: pubcraft spec: containers: - - name: minecraft - image: hub.ducoterra.net/ducoterra/minecraft:20w12a.7 + - name: pubcraft + image: hub.ducoterra.net/ducoterra/pubcraft:1.15.2_3 ports: - containerPort: 25565 volumeMounts: @@ -23,7 +23,7 @@ spec: stdin: true env: - name: MAX_RAM - value: "4" + value: "8" - name: MIN_RAM value: "1" - name: THREADS @@ -33,9 +33,9 @@ spec: memory: "2Gi" cpu: 250m limits: - memory: "4Gi" + memory: "8Gi" cpu: "4" volumes: - name: data persistentVolumeClaim: - claimName: minecraft + claimName: pubcraft diff --git a/k8s/pvc/pvc.yaml b/k8s/pvc/pvc.yaml index 5765652..014ef74 100644 --- a/k8s/pvc/pvc.yaml +++ b/k8s/pvc/pvc.yaml @@ -1,11 +1,11 @@ apiVersion: v1 kind: PersistentVolumeClaim metadata: - name: minecraft + name: pubcraft spec: storageClassName: nfs-encrypted accessModes: - ReadWriteMany resources: requests: - storage: 64Gi \ No newline at end of file + storage: 16Gi \ No newline at end of file diff --git a/k8s/service.yaml b/k8s/service.yaml index 0db9f16..aa58695 100644 --- a/k8s/service.yaml +++ b/k8s/service.yaml @@ -1,12 +1,12 @@ apiVersion: v1 kind: Service metadata: - name: minecraft + name: pubcraft spec: selector: - app: minecraft + app: pubcraft ports: - - port: 25565 + - port: 20100 targetPort: 25565 - name: minecraft + name: pubcraft type: LoadBalancer \ No newline at end of file diff --git a/server/server.jar b/server/server.jar index 617ca23..0727ad1 100644 Binary files a/server/server.jar and b/server/server.jar differ diff --git a/server/server.properties b/server/server.properties index 9aec811..ebc29e4 100644 --- a/server/server.properties +++ b/server/server.properties @@ -25,7 +25,7 @@ server-ip= spawn-npcs=true allow-flight=true level-name=world -view-distance=10 +view-distance=32 resource-pack= spawn-animals=true white-list=true