banana/spigot-docker-build-tools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed saving the spigot API instead of the actual server file

Browse Source
This commit is contained in:
BananaPuncher714
2025-11-15 21:14:10 -05:00
parent 6e936a6bd1
commit 3cec026427
4 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
build-versions.sh
View File

@@ -4,8 +4,6 @@ SCRIPT_DIR=$(dirname "$0")
WORKSPACE=$(pwd) WORKSPACE=$(pwd)
mkdir -p "$SCRIPT_DIR/build"
echo "Got versions $REV" echo "Got versions $REV"
if [ -z "$M2_DIRECTORY" ]; then if [ -z "$M2_DIRECTORY" ]; then
@@ -13,6 +11,12 @@ if [ -z "$M2_DIRECTORY" ]; then
M2_DIRECTORY="$SCRIPT_DIR/m2" M2_DIRECTORY="$SCRIPT_DIR/m2"
fi fi
if [ -z "$BUILD_DIRECTORY" ]; then
echo "build directory not specified, defaulting to $SCRIPT_DIR/build"
BUILD_DIRECTORY="$SCRIPT_DIR/build"
fi
mkdir -p "$BUILD_DIRECTORY"
mkdir -p "$M2_DIRECTORY" mkdir -p "$M2_DIRECTORY"
IFS=',' read -r -a versions <<< "$REV" IFS=',' read -r -a versions <<< "$REV"
@@ -95,7 +99,7 @@ if [ ! -z ${BUILD_JAVA_21+x} ]; then
-e MAVEN_CONFIG=/var/maven/.m2 \ -e MAVEN_CONFIG=/var/maven/.m2 \
-e M2_PATH=/var/maven/.m2 \ -e M2_PATH=/var/maven/.m2 \
-e REV="$BUILD_JAVA_21" \ -e REV="$BUILD_JAVA_21" \
--volume "$SCRIPT_DIR/build:/build" \ --volume "$BUILD_DIRECTORY:/build" \
--volume "$M2_DIRECTORY:/var/maven/.m2" \ --volume "$M2_DIRECTORY:/var/maven/.m2" \
--volume "$SCRIPT_DIR/scripts:/scripts" \ --volume "$SCRIPT_DIR/scripts:/scripts" \
-- docker.io/maven:3.9.11-eclipse-temurin-21 ./scripts/install-spigot.sh -- docker.io/maven:3.9.11-eclipse-temurin-21 ./scripts/install-spigot.sh
@@ -114,7 +118,7 @@ if [ ! -z ${BUILD_JAVA_17+x} ]; then
-e MAVEN_CONFIG=/var/maven/.m2 \ -e MAVEN_CONFIG=/var/maven/.m2 \
-e M2_PATH=/var/maven/.m2 \ -e M2_PATH=/var/maven/.m2 \
-e REV="$BUILD_JAVA_17" \ -e REV="$BUILD_JAVA_17" \
--volume "$SCRIPT_DIR/build:/build" \ --volume "$BUILD_DIRECTORY:/build" \
--volume "$M2_DIRECTORY:/var/maven/.m2" \ --volume "$M2_DIRECTORY:/var/maven/.m2" \
--volume "$SCRIPT_DIR/scripts:/scripts" \ --volume "$SCRIPT_DIR/scripts:/scripts" \
-- docker.io/maven:3.9.11-eclipse-temurin-17 /scripts/install-spigot.sh -- docker.io/maven:3.9.11-eclipse-temurin-17 /scripts/install-spigot.sh
@@ -133,7 +137,7 @@ if [ ! -z ${BUILD_JAVA_8+x} ]; then
-e MAVEN_CONFIG=/var/maven/.m2 \ -e MAVEN_CONFIG=/var/maven/.m2 \
-e M2_PATH=/var/maven/.m2 \ -e M2_PATH=/var/maven/.m2 \
-e REV="$BUILD_JAVA_8" \ -e REV="$BUILD_JAVA_8" \
--volume "$SCRIPT_DIR/build:/build" \ --volume "$BUILD_DIRECTORY:/build" \
--volume "$M2_DIRECTORY:/var/maven/.m2" \ --volume "$M2_DIRECTORY:/var/maven/.m2" \
--volume "$SCRIPT_DIR/scripts:/scripts" \ --volume "$SCRIPT_DIR/scripts:/scripts" \
-- docker.io/maven:3.9.11-eclipse-temurin-8 /scripts/install-spigot.sh -- docker.io/maven:3.9.11-eclipse-temurin-8 /scripts/install-spigot.sh

2
run.sh
View File

@@ -13,7 +13,7 @@ docker run --rm -it \
--user $(id -u):$(id -g) \ --user $(id -u):$(id -g) \
-e MAVEN_CONFIG=/var/maven/.m2 \ -e MAVEN_CONFIG=/var/maven/.m2 \
-e M2_PATH=/var/maven/.m2 \ -e M2_PATH=/var/maven/.m2 \
--volume "$SCRIPT_DIR/build:/build" \ --volume "$BUILD_DIRECTORY:/build" \
--volume "$WORKSPACE:/workspace" \ --volume "$WORKSPACE:/workspace" \
--volume "$M2_DIRECTORY:/var/maven/.m2" \ --volume "$M2_DIRECTORY:/var/maven/.m2" \
--volume "$SCRIPT_DIR/scripts:/scripts" \ --volume "$SCRIPT_DIR/scripts:/scripts" \

11
run_server.sh
View File

@@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ "$#" -le 1 ]; then if [ "$#" -lt 1 ]; then
echo "Using default spigot version 1.21.10" echo "Using default spigot version 1.21.10"
export REV=1.21.10 export REV=1.21.10
else else
@@ -8,6 +8,13 @@ else
export REV="$1" export REV="$1"
fi fi
if [ "$#" -lt 1 ]; then
echo "Saving default "
BUILD_DIRECTORY="/build"
else
BUILD_DIRECTORY="$0"
fi
SCRIPT_DIR=$(dirname "$0") SCRIPT_DIR=$(dirname "$0")
WORKSPACE=$(pwd) WORKSPACE=$(pwd)
@@ -19,7 +26,7 @@ docker run --rm -it \
-p 25565:25565 \ -p 25565:25565 \
-e MAVEN_CONFIG=/var/maven/.m2 \ -e MAVEN_CONFIG=/var/maven/.m2 \
-e M2_PATH=/var/maven/.m2 \ -e M2_PATH=/var/maven/.m2 \
--volume "$SCRIPT_DIR/build:/build" \ --volume "$BUILD_DIRECTORY:/build" \
--volume "$WORKSPACE:/workspace" \ --volume "$WORKSPACE:/workspace" \
--volume "$M2_DIRECTORY:/var/maven/.m2" \ --volume "$M2_DIRECTORY:/var/maven/.m2" \
--volume "$SCRIPT_DIR/scripts:/scripts" \ --volume "$SCRIPT_DIR/scripts:/scripts" \

5
scripts/install-spigot.sh
View File

@@ -16,8 +16,6 @@ for ver in "${versions[@]}"; do
if [ "$?" -eq 0 ]; then if [ "$?" -eq 0 ]; then
echo "Located spigot $ver successfully" echo "Located spigot $ver successfully"
mvn -q org.apache.maven.plugins:maven-dependency-plugin:3.9.0:copy -Dartifact=org.spigotmc:spigot:${ver}-R0.1-SNAPSHOT -DoutputDirectory=/build
else else
echo "Spigot $ver not located, building..." echo "Spigot $ver not located, building..."
if [ ! -d "${HOME}/buildtools" ]; then if [ ! -d "${HOME}/buildtools" ]; then
@@ -29,8 +27,7 @@ for ver in "${versions[@]}"; do
java -jar BuildTools.jar --rev "$ver" java -jar BuildTools.jar --rev "$ver"
ARTIFACT="spigot-${ver}-R0.1-SNAPSHOT.jar" ARTIFACT="spigot-${ver}.jar"
mv "spigot-${ver}.jar" "$ARTIFACT"
mv "$ARTIFACT" /build mv "$ARTIFACT" /build
fi fi
done done