diff --git a/examples/canyon/compose.yml b/examples/canyon/compose.yml new file mode 100644 index 00000000..358e1b42 --- /dev/null +++ b/examples/canyon/compose.yml @@ -0,0 +1,13 @@ +services: + mc: + image: itzg/minecraft-server:java8 + environment: + EULA: true + TYPE: canyon + VERSION: b1.7.3 + ports: + - "25565:25565" + volumes: + - mc-data:/data +volumes: + mc-data: diff --git a/scripts/start-deployCanyon b/scripts/start-deployCanyon index dd5411b9..d0fe5323 100755 --- a/scripts/start-deployCanyon +++ b/scripts/start-deployCanyon @@ -18,10 +18,10 @@ githubUrl="https://github.com/KoboDev/SupplyAndDemand/releases/download" canyonBuildJSON=$(curl -fsSL "${canyonJob}/${CANYON_BUILD}/api/json") buildRelPath=$( - jq '.artifacts[0].relativePath' <<< "$canyonBuildJSON" + jq -r '.artifacts[0].relativePath' <<< "$canyonBuildJSON" ) buildNumber=$( - jq '.number'<<< "$canyonBuildJSON" + jq -r '.number'<<< "$canyonBuildJSON" ) baseName=$(basename "${buildRelPath}") @@ -50,7 +50,7 @@ if [ ! -f "$SERVER" ]; then fi curl -fsSL -o "$SERVER" "$downloadUrl" if [ ! -f "$SERVER" ]; then - logError "Failed to download from $downloadUrl (status=$?)" + logError "Failed to download from $downloadUrl" exit 3 fi fi