switch to amazon corretto

16ee2f3 Merge branch 'various-docker-fixes' into 'main'
5b3e196 fix docker build and remove release
4bf9d45 Merge branch 'prefix-docker-commands' into 'main'
91b77b3 don't reset head after subtree pull, it breaks things
66b4362 prefix all docker commands with docker-
ba2827a Merge branch 'allow-specify-branch' into 'main'
4de5558 ignore .gitlab
71ff227 Allow pulling specific branch with BRANCH_NAME
6430416 Merge branch 'add-helm-and-kube' into 'main'
bce675f Add install, upgrade, and uninstall for helm
1532f30 Add kubectl.makefile

git-subtree-dir: .gitlab
git-subtree-split: 16ee2f3ddcc1235cb4a6b7a38c82d52859e8408f

.gitea/workflows/minecraft.yaml

@@ -0,0 +1,32 @@
+name: Minecraft Java Image
+run-name: Build and Push the Minecraft Java Image
+on:
+  push:
+    paths:
+      - Dockerfile
+      - IMAGE
+      - VERSION
+      - .gitea/workflows/minecraft.yaml
+  schedule:
+    - cron: '@daily'
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    if: gitea.ref == 'refs/heads/master'
+    steps:
+      - name: Check out repository code
+        uses: actions/checkout@v4
+      - name: Login to Gitea Registry
+        uses: docker/login-action@v2
+        with:
+          registry: gitea.reeseapps.com
+          username: ${{ secrets.REGISTRY_USERNAME }}
+          password: ${{ secrets.REGISTRY_PASSWORD }}
+      - name: Build and push Docker image
+        uses: https://github.com/docker/build-push-action@v5
+        with:
+          context: ${{ gitea.workspace }}
+          file: ${{ gitea.workspace }}/Dockerfile
+          push: true
+          tags: "gitea.reeseapps.com/services/minecraft:latest,gitea.reeseapps.com/services/minecraft:${{gitea.sha}}"
+          no-cache: true

.gitlab/.gitignore

@@ -0,0 +1 @@
+.gitlab

.gitlab/Makefile

@@ -1,34 +1,21 @@
 SHELL := /bin/bash
 
-PROJECT_NAME ?= $(shell git config --local remote.origin.url|sed -n 's#.*/\([^.]*\)\.git#\1#p')
+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"
+MAKE_BRANCH ?= main
 
 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
+include .gitlab/make/kubectl.makefile
 
-.PHONY: warning
+# git subtree add --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main
-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
+	@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git $(MAKE_BRANCH)
-
-.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

@@ -2,8 +2,7 @@
 
 ```bash
 # Add the subtree as a remote
-git remote add common git@gitlab.ducoterra.net:services/common.git
+git subtree add --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash --message "Add Common .gitlab Subtree"
-git subtree add --prefix .gitlab common main
 
 # Now you can run the following to update
 make make-update

.gitlab/make/docker.makefile

@@ -3,27 +3,21 @@ docker-init:
 	@touch VERSION
 	@touch IMAGE
 
-.PHONY: buildx-context
+.PHONY: docker-buildx-context
-buildx-context:
+docker-buildx-context:
-	docker buildx create --name container-builder --use --platform linux/amd64,linux/arm64
+	@docker buildx create --name container-builder --use --platform linux/amd64,linux/arm64
 
-.PHONY: buildx-clear
+.PHONY: docker-buildx-clear
-buildx-clear:
+docker-buildx-clear:
-	docker buildx rm container-builder
+	@docker buildx rm container-builder
 
-.PHONY: build
+.PHONY: docker-build
-build:
+docker-build:
-	docker buildx build --load . -t $(IMAGE)
+	docker build . -t $(IMAGE)
-	@docker buildx build --load . -t $(IMAGE_LATEST)
 
-.PHONY: push
+.PHONY: docker-push
-push:
+docker-push:
-	-make buildx-clear
+	-make docker-buildx-clear
-	@make buildx-context
+	@make docker-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/helm.makefile

@@ -2,3 +2,15 @@
 helm-release:
 	@yq e ".version = \"$(shell cat VERSION)\"" -i helm/Chart.yaml	
 	@yq e ".appVersion = \"$(shell cat VERSION)\"" -i helm/Chart.yaml
+
+.PHONY: install
+install: set-namespace
+	helm install $(PROJECT_NAME) ./helm --set image=$(IMAGE)
+
+.PHONY: upgrade
+upgrade: set-namespace
+	helm upgrade $(PROJECT_NAME) ./helm --set image=$(IMAGE)
+
+.PHONY: uninstall
+uninstall: set-namespace
+	helm uninstall $(PROJECT_NAME)

.gitlab/make/kubectl.makefile

@@ -0,0 +1,11 @@
+.PHONY: set-namespace
+set-namespace:
+	kubectl config set contexts.$(shell kubectl config current-context).namespace $(shell cat NAMESPACE)
+
+.PHONY: create-regcred
+create-regcred:
+	@kubectl create secret docker-registry regcred \
+		--docker-server=registry.ducoterra.net \
+		--docker-username=$(shell vault kv get -field username secret/duconet/basic-auth) \
+		--docker-password='$(shell vault kv get -field password secret/duconet/basic-auth)' \
+		--docker-email=$(shell vault kv get -field username secret/duconet/basic-auth)

.gitlab/make/truenas.makefile

@@ -1,3 +1,5 @@
 .PHONY: chart-release
 chart-release:
 	@rsync -av $(CHART)/helm/ charts/$(CHART)/$(shell cat $(CHART)/VERSION)/
+	@git add charts/$(CHART)
+	@git commit -m "Automated release for chart $(CHART) version $(shell cat $(CHART)/VERSION)" -e

Dockerfile

@@ -1,10 +1,7 @@
-FROM openjdk:latest
+# Read more about Corretto here:
+# https://hub.docker.com/_/amazoncorretto
+FROM docker.io/amazoncorretto:21
 
-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
+CMD ["sh", "-c" , "java -Xmx${MAX_RAM}G -Xms${MIN_RAM}G -jar ./server.jar nogui"]
-# Copy files only if they don't yet exist (server.jar, server.properties, etc) and start the server
-CMD java -Xmx"$MAX_RAM"G -Xms"$MIN_RAM"G -jar ./server.jar nogui

Makefile

@@ -2,12 +2,27 @@ SHELL := /bin/bash
 
 include .gitlab/Makefile
 
+.PHONY: build
+build:
+	@podman build -f Dockerfile -t localhost/minecraft:latest
+
 .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
+	@podman run \
+	-it \
+	--rm \
+	-e SERVER_VERSION=1.21.10 \
+	-v $(PWD)/world:/downloads \
+	--security-opt label=disable \
+	--userns keep-id \
+	docker.io/ducoterra/get-minecraft:latest
 
 .PHONY: run
 run:
-	docker-compose run --service-ports minecraft
+	docker compose -f compose.yaml up minecraft
+
+.PHONY: stop
+stop:
+	docker compose -f compose.yaml down

README.md

@@ -3,11 +3,17 @@
 ## Running Locally
 
 ```bash
+# Build
+make build
+
 # download the most recent version of minecraft
 make get-server
 
 # Run the server
-docker-compose up
+make run
+
+# Stop the server
+make stop
 ```
 
 ## Uploading to Docker Hub
@@ -30,13 +36,13 @@ helm upgrade --install minecraft
 
 Your minecraft server will be available on port 25565 by default.
 
-## Create a Backup
+### Create a Backup in Kubernetes
 
 ```bash
 kubectl cp <pod_name>:/mc_data <backup>
 ```
 
-## Restore from Backup
+### Restore from Backup in Kubernetes
 
 ```bash
 kubectl cp <backup> <pod_name>:/mc_data

VERSION

@@ -1 +1 @@
-1.0.2
+1.0.3

compose.yaml

@@ -1,7 +1,6 @@
-version: '3'
 services:
   minecraft:
-    image: ducoterra/minecraft:1.0.2
+    image: localhost/minecraft:latest
     stdin_open: true
     tty: true
     volumes:
@@ -11,3 +10,6 @@ services:
     environment:
       - MAX_RAM=1
       - MIN_RAM=1
+    security_opt:
+      - "label=disable"
+    userns_mode: keep-id

helm/templates/deploy.yaml

@@ -19,7 +19,7 @@ spec:
         imagePullPolicy: Always
         env:
         - name: SERVER_VERSION
-          value: {{ .Values.server_version }}
+          value: {{ .Values.server_version | quote }}
         volumeMounts:
         - mountPath: /downloads
           name: data

setenv.sh

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

values/values-camcraft.yaml

@@ -1,7 +1,10 @@
-image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+image: ducoterra/minecraft:latest
+get_server:
+  image: ducoterra/get-minecraft:2.0.0
+server_version: "1.16.4"
 port: 20101
-max_cpu: 8
+max_cpu: 4
-max_ram: 8
+max_ram: 4
 server_props: |
   max-tick-time=60000
   generator-settings=

values/values-testcraft.yaml

@@ -1,7 +1,10 @@
-image: hub.ducoterra.net/ducoterra/minecraft:1.16.4
+image: ducoterra/minecraft:latest
-port: 25566
+get_server:
+  image: ducoterra/get-minecraft:2.0.0
+server_version: "1.18"
+port: 20103
 max_cpu: 8
-max_ram: 6
+max_ram: 8
 server_props: |
   max-tick-time=60000
   generator-settings=
@@ -16,7 +19,7 @@ server_props: |
   op-permission-level=4
   pvp=true
   snooper-enabled=true
-  level-type=amplified
+  level-type=default
   hardcore=false
   enable-command-block=false
   max-players=20
@@ -28,15 +31,15 @@ server_props: |
   spawn-npcs=true
   allow-flight=true
   level-name=world
-  view-distance=64
+  view-distance=32
   resource-pack=
   spawn-animals=true
   white-list=true
   generate-structures=true
   online-mode=true
-  max-build-height=512
+  max-build-height=256
   level-seed=
   prevent-proxy-connections=false
   use-native-transport=true
-  motd=This is gonna be interesting
+  motd=Welcome to testcraft!
-  enable-rcon=false
+  enable-rcon=false