From 5f0e0b41f75eb35d060d3587ef8313d0e3cb8afb Mon Sep 17 00:00:00 2001 From: ducoterra Date: Fri, 7 Nov 2025 10:02:48 -0500 Subject: [PATCH] switch to amazon corretto --- Dockerfile | 6 ++++-- Makefile | 6 +++++- README.md | 12 +++++++++--- VERSION | 2 +- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index c9f7882..884c064 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,7 @@ -FROM docker.io/bitnami/java:latest +# Read more about Corretto here: +# https://hub.docker.com/_/amazoncorretto +FROM docker.io/amazoncorretto:21 WORKDIR /mc_data -CMD java -Xmx"$MAX_RAM"G -Xms"$MIN_RAM"G -jar ./server.jar nogui +CMD ["sh", "-c" , "java -Xmx${MAX_RAM}G -Xms${MIN_RAM}G -jar ./server.jar nogui"] diff --git a/Makefile b/Makefile index 1cc2567..d10129f 100644 --- a/Makefile +++ b/Makefile @@ -13,7 +13,7 @@ get-server: @podman run \ -it \ --rm \ - -e SERVER_VERSION=1.21.7 \ + -e SERVER_VERSION=1.21.10 \ -v $(PWD)/world:/downloads \ --security-opt label=disable \ --userns keep-id \ @@ -22,3 +22,7 @@ get-server: .PHONY: run run: docker compose -f compose.yaml up minecraft + +.PHONY: stop +stop: + docker compose -f compose.yaml down \ No newline at end of file diff --git a/README.md b/README.md index 81bb2a4..f80ae27 100644 --- a/README.md +++ b/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 :/mc_data ``` -## Restore from Backup +### Restore from Backup in Kubernetes ```bash kubectl cp :/mc_data diff --git a/VERSION b/VERSION index 6d7de6e..21e8796 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.2 +1.0.3