andrei-stoica
/
mc-server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: andrei-stoica:580b636045fead49773cf143f37f3108cd3515ac
Branches Tags
andrei-stoica:master
...
compare: andrei-stoica:8b255ad770223359b5df78caa768c2f547f2eb7a
Branches Tags
andrei-stoica:master

3 Commits
580b636045 ... 8b255ad770

Author SHA1 Message Date
Andrei Stoica 8b255ad770 fixed merge conflict 2023-02-21 14:26:46 -05:00
Andrei Stoica 46e0d4c352 updated base docker image 2023-02-21 14:15:31 -05:00
Andrei Stoica 7e6ed82119 update Makefile 2023-02-21 14:14:55 -05:00
3 changed files with 8 additions and 9 deletions
Show Stats Expand all files Collapse all files

10
Makefile
View File

@ -1,11 +1,9 @@
WORKING_DIR := $(shell pwd) WORKING_DIR := $(shell pwd)
.PHONY: deploy deploy-1.15.2 test up down rev?=1.19.3
.PHONY: deploy 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
deploy:
cp build/spigot-$(rev).jar spigot/spigot.jar
test: test:
docker run -it --name mc-test -p 25565:25565 --rm -v $(WORKING_DIR)/spigot:/mc \ docker run -it --name mc-test -p 25565:25565 --rm -v $(WORKING_DIR)/spigot:/mc \

2
build/Dockerfile
View File

@ -1,4 +1,4 @@
FROM openjdk:19-jdk-slim FROM openjdk:19-jdk-slim
RUN apt-get update && apt-get install -y --no-install-recommends \ RUN apt-get update && apt-get install -y --no-install-recommends \
git \ git \

5
build/Makefile
View File

@ -1,11 +1,12 @@
LATEST := $(shell ls -rt build/spigot*.jar | tail -1) LATEST := $(shell ls -rt build/spigot*.jar | tail -1)
rev?=latest
spigot/spigot.jar: build-latest spigot spigot/spigot.jar: build-latest spigot
cp $(LATEST) spigot/spigot.jar cp $(LATEST) spigot/spigot.jar
build-latest: build-image build: build-image
docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \ docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \
-jar BuildTools.jar -jar BuildTools.jar --rev $(rev)
build/spigot-1.19.3.jar: build-image build/spigot-1.19.3.jar: build-image
docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \ docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \