Add '.gitlab/' from commit '731ada6a3d65b2347ccf204cfe09ee278a4f0594'

git-subtree-dir: .gitlab
git-subtree-mainline: 422f4d49bd
git-subtree-split: 731ada6a3d

.gitignore

@@ -1 +1,2 @@
 data/
+world/

.gitlab-ci.yml

@@ -19,20 +19,3 @@ build:
   script:
     - echo $DEPLOY
     - /kaniko/executor --context $CI_PROJECT_DIR --dockerfile $CI_PROJECT_DIR/Dockerfile --destination $CI_REGISTRY_IMAGE:$CI_COMMIT_TAG
-
-deploy_to_prod:
-  variables:
-    DEPLOY: prod
-  stage: deploy
-  only:
-    variables:
-    - $CI_COMMIT_TAG
-  image:
-    name: debian:10
-    entrypoint: [""]
-  script:
-    - apt -qq update >> /dev/null && apt -qq install -y curl >> /dev/null
-    - curl -L -o /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/`curl -s https://storage.googleapis.com/kubernetes-release/release/stable.txt`/bin/linux/amd64/kubectl
-    - chmod +x /usr/local/bin/kubectl
-    - curl https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash
-    - helm template $CI_PROJECT_NAME --set tag=$CI_COMMIT_TAG ./helm | kubectl apply -f -

.gitlab/Makefile

@@ -0,0 +1,34 @@
+SHELL := /bin/bash
+
+PROJECT_NAME ?= $(shell git config --local remote.origin.url|sed -n 's#.*/\([^.]*\)\.git#\1#p')
+VERSION ?= $(shell cat VERSION)
+IMAGE ?= $(shell cat IMAGE):$(VERSION)
+IMAGE_LATEST ?= $(shell cat IMAGE):latest
+PWD ?= $(shell pwd)
+STASH ?= "common-update-stash"
+
+include .gitlab/make/docker.makefile
+include .gitlab/make/helm.makefile
+include .gitlab/make/kaniko.makefile
+include .gitlab/make/truenas.makefile
+include .gitlab/make/git.makefile
+
+.PHONY: warning
+warning:
+	@printf "Running a potentially destructive command. If a conflict occurs, fix the conflict and re-run the command.\n"
+	@printf "Cancel with ctrl + c within 3 seconds."
+	@sleep 3
+
+.PHONY: make-stash-drop
+make-stash-drop:
+	@if [ ! -z "$$(git stash list | grep -r 'stash@{0}.*common')" ]; then git stash drop; fi
+
+.PHONY: make-update
+make-update:
+	@git subtree pull --prefix .gitlab --message "Merge update from Common" -q common main
+
+.PHONY: make-push
+make-push: warning
+	@make make-update
+	@git subtree split --branch common/$(PROJECT_NAME) --prefix .gitlab
+	@git push common common/$(PROJECT_NAME):common/$(PROJECT_NAME)

.gitlab/README.md

@@ -0,0 +1,10 @@
+# Adding the "common" subtree as your .gitlab folder
+
+```bash
+# Add the subtree as a remote
+git remote add common git@gitlab.ducoterra.net:services/common.git
+git subtree add --prefix .gitlab common main
+
+# Now you can run the following to update
+make make-update
+```

.gitlab/make/docker.makefile

@@ -0,0 +1,29 @@
+.PHONY: docker-init
+docker-init:
+	@touch VERSION
+	@touch IMAGE
+
+.PHONY: buildx-context
+buildx-context:
+	docker buildx create --name container-builder --use --platform linux/amd64,linux/arm64
+
+.PHONY: buildx-clear
+buildx-clear:
+	docker buildx rm container-builder
+
+.PHONY: build
+build:
+	docker buildx build --load . -t $(IMAGE)
+	@docker buildx build --load . -t $(IMAGE_LATEST)
+
+.PHONY: push
+push:
+	-make buildx-clear
+	@make buildx-context
+	docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE)
+	@docker buildx build --platform linux/amd64,linux/arm64 --push . -t $(IMAGE_LATEST)
+
+.PHONY: docker-release
+docker-release:
+	@yq e ".services.minecraft.image = \"$(IMAGE)\"" -i docker-compose.yaml
+	@make push

.gitlab/make/git.makefile

@@ -0,0 +1,5 @@
+.PHONY: git-release
+git-release:
+	@git add .
+	@git commit -m "Automated release for version $(VERSION)"
+	@git tag $(VERSION)

.gitlab/make/helm.makefile

@@ -0,0 +1,4 @@
+.PHONY: helm-release
+helm-release:
+	@yq e ".version = \"$(shell cat VERSION)\"" -i helm/Chart.yaml	
+	@yq e ".appVersion = \"$(shell cat VERSION)\"" -i helm/Chart.yaml

.gitlab/make/truenas.makefile

@@ -0,0 +1,3 @@
+.PHONY: chart-release
+chart-release:
+	@rsync -av $(CHART)/helm/ charts/$(CHART)/$(shell cat $(CHART)/VERSION)/

Dockerfile

@@ -1,15 +1,10 @@
-FROM openjdk:8-slim
+FROM openjdk:latest
 
-RUN apt update && apt install -y rsync
-
-WORKDIR /mc_server
-COPY ./server .
-
-RUN groupadd -r minecraft && useradd --no-log-init -r -g minecraft minecraft
+RUN groupadd -r minecraft -g 2000
+RUN useradd --no-log-init minecraft -u 2000 -g 2000 -m
 WORKDIR /mc_data
 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
+CMD java -Xmx"$MAX_RAM"G -Xms"$MIN_RAM"G -jar ./server.jar nogui

IMAGE

@@ -0,0 +1 @@
+ducoterra/minecraft

Makefile

@@ -0,0 +1,13 @@
+SHELL := /bin/bash
+
+include .gitlab/Makefile
+
+.PHONY: get-server
+get-server:
+	@mkdir -p world
+	@echo 'eula=true' > world/eula.txt
+	@docker run -it -e SERVER_VERSION=1.17.1 -v $(PWD)/world:/downloads ducoterra/get-minecraft:latest
+
+.PHONY: run
+run:
+	docker-compose run --service-ports minecraft

README.md

@@ -1,61 +1,34 @@
 # Minecraft
 
-## Getting server.jar
-
-![Click Installations](img/main.png)
-![Select the Options Menu](img/menu.png)
-![Click Edit](img/edit.png)
-![Click Download Server](img/server.png)
-
 ## Running Locally
 
 ```bash
-docker-compose build minecraft
-docker-compose up minecraft
+# download the most recent version of minecraft
+make get-server
+
+# Run the server
+docker-compose up
 ```
 
 ## Uploading to Docker Hub
 
-In docker-compose.yaml, update the image tag to:
+1. Update the version in the VERSION file.
+2. Build and push the new version
 
-```yaml
-...
-services:
-  minecraft:
-    build: .
-    image: <your_username>/minecraft:<version>-1
-    ports:
-...
-```
-
-then run
-
-```bash
-docker-compose push
-```
+    ```bash
+    make build
+    make push
+    ```
 
 ## Running in kubernetes
 
-In k8s/deploy.yaml, edit the deploy
-
-```yaml
-...
-    spec:
-      containers:
-      - name: minecraft
-        image: <your image from above>
-        ports:
-...
-```
-
-Then run the following
+Requires helm v3. Edit values.yaml and run the following:
 
 ```bash
-kubectl apply -f k8s/pvc
-kubectl apply -f k8s
+helm upgrade --install minecraft
 ```
 
-Your minecraft server will be available on port 25565
+Your minecraft server will be available on port 25565 by default.
 
 ## Create a Backup
 
@@ -71,4 +44,10 @@ kubectl cp <backup> <pod_name>:/mc_data
 
 ## Cool seeds
 
-with an amplified world, -8018833100564192815
+### 7485786574821478084
+
+Spawns you next to a nether portal with golden axe and pickaxe. River and Village close by.
+
+### -8018833100564192815
+
+Use with an amplified world, massive island

VERSION

@@ -0,0 +1 @@
+1.0.2

build.sh

@@ -1,3 +0,0 @@
-docker-compose build mc
-docker-compose push mc
-kubectl apply -f k8s/

docker-compose.yaml

@@ -1,17 +1,13 @@
 version: '3'
-
 services:
   minecraft:
-    build: .
+    image: ducoterra/minecraft:1.0.2
+    stdin_open: true
+    tty: true
+    volumes:
+      - ./world:/mc_data
     ports:
       - 25565:25565
-    volumes:
-      - ./data:/mc_data
-    tty: true
-    stdin_open: true
-    restart: always
     environment:
-      - MAX_RAM=2
+      - MAX_RAM=1
       - MIN_RAM=1
-      - THREADS=2
-    user: minecraft

helm/Chart.yaml

@@ -1,7 +1,6 @@
 apiVersion: v2
-name: charts
-description: A Helm chart for Kubernetes
-
+name: minecraft
+description: A Minecraft server for kubernetes
 # A chart can be either an 'application' or a 'library' chart.
 #
 # Application charts are a collection of templates that can be packaged into versioned archives
@@ -11,13 +10,11 @@ description: A Helm chart for Kubernetes
 # a dependency of application charts to inject those utilities and functions into the rendering
 # pipeline. Library charts do not define any templates and therefore cannot be deployed.
 type: application
-
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.1.0
-
+version: 1.0.2
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
-appVersion: 1.16.0
+appVersion: 1.0.2

helm/README.md

@@ -0,0 +1,3 @@
+# Minecraft Server
+
+Creates a vanilla Minecraft server.

helm/app-readme.md

@@ -0,0 +1,3 @@
+# Minecraft Server
+
+Creates a vanilla Minecraft server.

helm/ix_values.yaml

@@ -0,0 +1,2 @@
+image: ducoterra/minecraft:latest
+server_version: "1.17.1"

helm/questions.yaml

@@ -0,0 +1,38 @@
+groups:
+  - name: "Server Config"
+    description: "Minecraft Server Configuration"
+  - name: "Storage"
+    description: "Minecraft Server Storage"
+questions:
+  - variable: server_version
+    description: "Server Version"
+    label: "Version"
+    group: "Server Config"
+    schema:
+      type: string
+      default: "1.17.1"
+      required: false
+  - variable: port
+    description: "Listen Port"
+    group: "Server Config"
+    label: "Port"
+    schema:
+      type: int
+      default: 25565
+      required: true
+  - variable: max_ram
+    description: "Total RAM allocated to the server"
+    group: "Server Config"
+    label: "RAM Limit (GiB)"
+    schema:
+      type: int
+      default: 4
+      required: true
+  - variable: max_cpu
+    description: "# CPU Cores Allocated to the server"
+    group: "Server Config"
+    label: "CPU Limit (# Cores)"
+    schema:
+      type: int
+      default: 4
+      required: true

helm/templates/configmap.yaml

@@ -0,0 +1,8 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Release.Name }}
+data:
+  eula.txt: |
+    eula=true
+  server.properties: {{ toYaml .Values.server_props | indent 2 }}

helm/templates/deploy.yaml

@@ -6,36 +6,58 @@ spec:
   selector:
     matchLabels:
       app: {{ .Release.Name }}
+  strategy:
+    type: Recreate
   template:
     metadata:
       labels:
         app: {{ .Release.Name }}
     spec:
+      initContainers:
+      - name: get-version
+        image: {{ .Values.get_server.image }}
+        imagePullPolicy: Always
+        env:
+        - name: SERVER_VERSION
+          value: {{ .Values.server_version }}
+        volumeMounts:
+        - mountPath: /downloads
+          name: data
       containers:
       - name: {{ .Release.Name }}
-        image: {{ .Values.image }}:{{ .Values.tag }}
+        image: {{ .Values.image }}
+        imagePullPolicy: Always
         ports:
         - containerPort: 25565
         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:
         - name: MAX_RAM
-          value: "4"
+          value: {{ .Values.max_ram | quote }}
         - name: MIN_RAM
           value: "1"
-        - name: THREADS
-          value: "4"
         resources:
           requests:
-            memory: "2Gi"
-            cpu: 250m
+            memory: {{ div .Values.max_ram 2 }}Gi
+            cpu: 1m
           limits:
-            memory: "4Gi"
-            cpu: "4"
+            memory: {{ add 1 .Values.max_ram }}Gi
+            cpu: {{ .Values.max_cpu | quote }}
       volumes:
       - name: data
         persistentVolumeClaim:
           claimName: {{ .Release.Name }}
+      - name: properties
+        configMap:
+          name: {{ .Release.Name }}
+      securityContext:
+        fsGroup: 2000

helm/templates/pvc.yaml

@@ -2,10 +2,11 @@ apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
   name: {{ .Release.Name }}
+  annotations:
+    "helm.sh/resource-policy": keep
 spec:
-  storageClassName: nfs-encrypted
   accessModes:
-    - ReadWriteMany
+    - ReadWriteOnce
   resources:
     requests:
       storage: 32Gi

helm/templates/service.yaml

@@ -6,7 +6,7 @@ spec:
   selector:
     app: {{ .Release.Name }}
   ports:
-  - port: 25565
+  - port: {{ .Values.port }}
     targetPort: 25565
     name: {{ .Release.Name }}
   type: LoadBalancer

helm/values.yaml

@@ -1 +1,45 @@
-image: hub.ducoterra.net/ducoterra/minecraft
+image: ducoterra/minecraft:latest
+get_server:
+  image: ducoterra/get-minecraft:2.0.0
+server_version: "1.17.1"
+port: 20101
+max_cpu: 4
+max_ram: 4
+server_props: |
+  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=default
+  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=256
+  level-seed=
+  prevent-proxy-connections=false
+  use-native-transport=true
+  motd=This is gonna be interesting
+  enable-rcon=false

server/eula.txt

@@ -1 +0,0 @@
-eula=true

server/server.properties

@@ -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=20
-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

servers.md

@@ -0,0 +1,19 @@
+# Servers
+
+## Minecraft
+
+```bash
+helm upgrade --install minecraft ./helm --set tag=1.15.2_7 --set port=25565
+```
+
+## Pubcraft
+
+```bash
+helm upgrade --install pubcraft ./helm --set tag=1.15.2_7 --set port=20100
+```
+
+## TestCraft
+
+```bash
+helm upgrade --install testcraft ./helm --set tag=1.16.1_2 --set port=25566
+```

setenv.sh

@@ -0,0 +1 @@
+kubectl config set current-context k3os-alpha.dnet-ducoterra-minecraft

values/values-camcraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 20101
+max_cpu: 8
+max_ram: 8
+server_props: |
+  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=default
+  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=256
+  level-seed=
+  prevent-proxy-connections=false
+  use-native-transport=true
+  motd=This is gonna be interesting
+  enable-rcon=false

values/values-minecraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 25565
+max_cpu: 8
+max_ram: 6
+server_props: |
+  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=default
+  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=256
+  level-seed=
+  prevent-proxy-connections=false
+  use-native-transport=true
+  motd=This is gonna be interesting
+  enable-rcon=false

values/values-pubcraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 20100
+max_cpu: 8
+max_ram: 6
+server_props: |
+  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=default
+  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=256
+  level-seed=
+  prevent-proxy-connections=false
+  use-native-transport=true
+  motd=This is gonna be interesting
+  enable-rcon=false

values/values-testcraft.yaml

@@ -0,0 +1,42 @@
+image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+port: 25566
+max_cpu: 8
+max_ram: 6
+server_props: |
+  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=64
+  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