From 7c2cde8a1fb0f7e62874fa1f8d0ceadb81c97968 Mon Sep 17 00:00:00 2001 From: Andrei Stoica Date: Wed, 22 Apr 2020 18:59:23 -0400 Subject: [PATCH] updated makefiles and readme --- Makefile | 7 +++++++ README.md | 4 ++++ build/Makefile | 5 +---- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 81310d8..ee27e3f 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,11 @@ WORKING_DIR := $(shell pwd) +.PHONY: deploy deploy-1.15.2 test up down + +deploy: spigot/spigot.jar + +deploy-1.15.2: build/spigot-1.15.2.jar spigot + cp build/spigot-1.15.2.jar spigot/spigot.jar + test: docker run -it --name mc-test -p 25565:25565 --rm -v $(WORKING_DIR)/spigot:/mc \ diff --git a/README.md b/README.md index 3ddf67e..814fcfe 100644 --- a/README.md +++ b/README.md @@ -13,6 +13,10 @@ The server is configured to use up to 4 GB if ram. To change this you will need > -Xmx4G - maximum 4 GB of memeory +## Warnings +All file permisions are handeled by docker, thus they will be owned by root on +the host filesystem. + ## Building > make build-latest - builds the latest version of of spigot diff --git a/build/Makefile b/build/Makefile index 52dc7e0..94df6d4 100644 --- a/build/Makefile +++ b/build/Makefile @@ -1,11 +1,8 @@ LATEST := $(shell ls -rt build/spigot*.jar | tail -1) -deploy: build-latest spigot +spigot/spigot.jar: build-latest spigot cp $(LATEST) spigot/spigot.jar -deploy-1.15.2: build/spigot-1.15.2.jar spigot - cp build/spigot-1.15.2.jar spigot/spigot.jar - build-latest: build-image docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \ -jar BuildTools.jar