fixed merge conflict
This commit is contained in:
commit
8b255ad770
|
|
@ -8,6 +8,14 @@ build: build-image
|
|||
docker run -it --rm -v $(WORKING_DIR)/build:/mc -w /mc java-build java -cp /mc \
|
||||
-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
|
||||
docker build -t java-build build/
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue