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

fixed merge conflict

This commit is contained in:
Andrei Stoica 2023-02-21 14:26:46 -05:00
parent 46e0d4c352 580b636045
commit 8b255ad770
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
build/Makefile
View File

@ -8,6 +8,14 @@ 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 --rev $(rev) -jar BuildTools.jar --rev $(rev)
build/spigot-1.19.3.jar: build-image
docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \
-jar BuildTools.jar --rev 1.19.
build/spigot-1.15.2.jar: build-image
docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \
-jar BuildTools.jar --rev 1.15.2
build-image: build/BuildTools.jar build-image: build/BuildTools.jar
docker build -t java-build build/ docker build -t java-build build/