Squashed 'minecraft/' changes from 0d2235b..0520668

0520668 Merge update from Common
4497566 Squashed '.gitlab/' changes from 731ada6..cf41f2e
2de53de Remove .common
a85a7aa Merge branch 'common-subtree'
a074005 Add '.gitlab/' from commit '731ada6a3d65b2347ccf204cfe09ee278a4f0594'
422f4d4 remove .gitlab subtree
731ada6 Merge branch 'make-update-fixes' into 'main'
c3e6d73 Switch to "subtree split" push strategy
3c91292 Make user stash their own damn changes
d86b505 Add PROJECT_NAME and VERSION
9d0c9c6 Update README with "common" remote
30fb8c2 Merge branch 'docker-buidlx-overhaul' into 'main'
fd96b3f Merge branch 'git-release' into 'main'
a6053ed Add make git-release
3563c5c Add make docker-release
40a217b Use buildx to create multi-arch images
5e2bc5f Switch to container-builder buildx platform
a5aa0ca Automated release for version 1.0.2
65b3a84 make subtree "split" overhaul
d181d45 Overhaul for get-server v. 2.0.0
9eed509 Don't squash on pull
b07a2c0 Run update after make-push
22a952d Remove warning from make-update
0f6eeb7 Add make-stash-drop command
f81d846 Only pop stash if changes
afed93f Add warning to make-update and make-push
6239af7 Ignore git stash pop failures
2f76759 Add make-push command
66b4fdb Ignore subtree pull failures
da69418 Switch to url-based subtree with `make-update`
ba12c92 Remove docker-run
74a4a4e Transition to .gitlab prefix
3e8ca71 Add chart-release to truenas.makefile
4146777 Add helm.makefile
8a52a21 Switch to multi-makefile strategy
f187522 init

git-subtree-dir: minecraft
git-subtree-split: 05206686ad84ad388c98578becfc5cfe3a13fdb4

.common/Makefile

@@ -1,27 +0,0 @@
-SHELL := /bin/bash
-
-IMAGE ?= $(shell cat IMAGE):$(shell cat VERSION)
-IMAGE_LATEST ?= $(shell cat IMAGE):latest
-PWD ?= $(shell pwd)
-
-.PHONY: buildx-context
-buildx-context:
-	docker buildx create --name arm64 --use --platform linux/amd64,linux/arm64
-
-.PHONY: buildx-clear
-buildx-clear:
-	docker buildx rm arm64
-
-.PHONY: build
-build:
-	docker buildx build --load . -t $(IMAGE)
-	@docker buildx build --load . -t $(IMAGE_LATEST) 
-
-.PHONY: push
-push:
-	docker buildx build --platform linux/amd64 --push . -t $(IMAGE)
-	@docker buildx build --platform linux/amd64 --push . -t $(IMAGE_LATEST)
-
-.PHONY: run
-run:
-	docker run -it -v $(PWD):/mc_data $(IMAGE) bash

.gitignore

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

.gitlab/Makefile

@@ -0,0 +1,18 @@
+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: make-update
+make-update:
+	@git subtree pull --prefix .gitlab --squash --message "Merge update from Common" -q git@gitlab.ducoterra.net:services/common.git main

.gitlab/README.md

@@ -0,0 +1,9 @@
+# Adding the "common" subtree as your .gitlab folder
+
+```bash
+# Add the subtree as a remote
+git subtree add --prefix .gitlab git@gitlab.ducoterra.net:services/common.git main --squash --message "Add Common .gitlab Subtree"
+
+# 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,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

Makefile

@@ -1 +1,13 @@
-include .common/Makefile
+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
+# download the most recent version of minecraft
-docker-compose up 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
+    ```bash
-...
+    make build
-services:
+    make push
-  minecraft:
+    ```
-    build: .
-    image: <your_username>/minecraft:<version>-1
-    ports:
-...
-```
-
-then run
-
-```bash
-docker-compose push
-```
 
 ## Running in kubernetes
 
-In k8s/deploy.yaml, edit the deploy
+Requires helm v3. Edit values.yaml and run the following:
-
-```yaml
-...
-    spec:
-      containers:
-      - name: minecraft
-        image: <your image from above>
-        ports:
-...
-```
-
-Then run the following
 
 ```bash
-kubectl apply -f k8s/pvc
+helm upgrade --install minecraft
-kubectl apply -f k8s
 ```
 
-Your minecraft server will be available on port 25565
+Your minecraft server will be available on port 25565 by default.
 
 ## Create a Backup
 

VERSION

@@ -1 +1 @@
-1.0.0
+1.0.2

docker-compose.yaml

@@ -0,0 +1,13 @@
+version: '3'
+services:
+  minecraft:
+    image: ducoterra/minecraft:1.0.2
+    stdin_open: true
+    tty: true
+    volumes:
+      - ./world:/mc_data
+    ports:
+      - 25565:25565
+    environment:
+      - MAX_RAM=1
+      - MIN_RAM=1

helm/Chart.yaml

@@ -1,7 +1,6 @@
 apiVersion: v2
 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 Minecraft server 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: 1.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.0.0
+appVersion: 1.0.2

helm/templates/deploy.yaml

@@ -23,13 +23,6 @@ spec:
         volumeMounts:
         - mountPath: /downloads
           name: data
-      - name: download-server
-        image: {{ .Values.get_server.image }}
-        imagePullPolicy: Always
-        command: ["bash", "-c", "curl -o server.jar $(cat SERVER_VERSION)"]
-        volumeMounts:
-        - mountPath: /downloads
-          name: data
       containers:
       - name: {{ .Release.Name }}
         image: {{ .Values.image }}

helm/values.yaml

@@ -1,6 +1,6 @@
 image: ducoterra/minecraft:latest
 get_server:
-  image: ducoterra/get-minecraft:latest
+  image: ducoterra/get-minecraft:2.0.0
 server_version: "1.17.1"
 port: 20101
 max_cpu: 4