From c1ca80b09b4645888e550efb0a2700b2ec1f1645 Mon Sep 17 00:00:00 2001
From: ducoterra <git@ducoterra.net>
Date: Wed, 16 Jul 2025 00:10:09 -0400
Subject: [PATCH] use bitnami java image

---
 Dockerfile                          |  7 +------
 Makefile                            | 15 +++++++++++++--
 docker-compose.yaml => compose.yaml |  6 ++++--
 3 files changed, 18 insertions(+), 10 deletions(-)
 rename docker-compose.yaml => compose.yaml (63%)

diff --git a/Dockerfile b/Dockerfile
index 332366b..eaff93e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,10 +1,5 @@
-FROM docker.io/openjdk:latest
+FROM docker.io/bitnami/java:24
 
-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 java -Xmx"$MAX_RAM"G -Xms"$MIN_RAM"G -jar ./server.jar nogui
diff --git a/Makefile b/Makefile
index 996a6d2..1cc2567 100644
--- a/Makefile
+++ b/Makefile
@@ -2,12 +2,23 @@ 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.7 \
+	-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
diff --git a/docker-compose.yaml b/compose.yaml
similarity index 63%
rename from docker-compose.yaml
rename to compose.yaml
index 527768a..2137098 100644
--- a/docker-compose.yaml
+++ b/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
\ No newline at end of file