1
0
Fork 0

q3k/minecraft: bump prod to 1.16.1

Change-Id: I4926d17f1d7c07aa3a2c922481be4645291124f3
master
q3k 2020-08-01 12:04:04 +02:00 committed by q3k
parent 509ab6e29a
commit bbb1623cb7
3 changed files with 7 additions and 6 deletions

View File

@ -30,7 +30,7 @@ ARG VERSION=1.16.1
RUN set -e -x ;\
wget --quiet https://papermc.io/api/v1/paper/${VERSION}/latest/download ;\
mv download paper.jar
mv download server.jar
ADD worldedit-bukkit-7.2.0-beta-01.jar .
ADD worldguard-bukkit-7.0.4-beta1.jar .

View File

@ -36,7 +36,7 @@ RUN set -e -x ;\
cp spigot*jar .. ;\
cd .. ;\
rm -rf build ;\
mv spigot*.jar spigot.jar
mv spigot*.jar server.jar
ADD worldedit-bukkit-7.2.0-beta-01.jar .
ADD worldguard-bukkit-7.0.4-beta1.jar .

View File

@ -4,7 +4,8 @@ local defaultWorldguardConfig = import "worldguard.libsonnet";
{
local minecraft = self,
versions:: {
"spigot-1.15.2": "registry.k0.hswaw.net/q3k/minecraft:spigot-1.15.2-r3",
"spigot-1.16.1": "registry.k0.hswaw.net/q3k/minecraft:spigot-1.16.1-r2",
"paper-1.16.1": "registry.k0.hswaw.net/q3k/minecraft:paper-1.16.1-r2",
},
server(name, version):: {
local server = self,
@ -72,7 +73,7 @@ local defaultWorldguardConfig = import "worldguard.libsonnet";
#!/usr/bin/env bash
cd /home/minecraft/world
cp /home/minecraft/config/server.properties .
cp /home/minecraft/spigot.jar .
cp /home/minecraft/server.jar .
mkdir -p plugins/WorldGuard
cp /home/minecraft/worldedit-*.jar plugins
cp /home/minecraft/worldguard-*.jar plugins
@ -80,7 +81,7 @@ local defaultWorldguardConfig = import "worldguard.libsonnet";
echo "eula=true" > eula.txt
bash /home/minecraft/config/overviewer.sh &
exec java -Xmx4G -Xms4G -jar spigot.jar
exec java -Xmx4G -Xms4G -jar server.jar
|||,
overviewersh:: |||
@ -201,7 +202,7 @@ local defaultWorldguardConfig = import "worldguard.libsonnet";
ns: kube.Namespace("minecraft"),
q3k: {
survival: minecraft.server("q3k-survival", "spigot-1.15.2") {
survival: minecraft.server("q3k-survival", "paper-1.16.1") {
properties+: {
motd: "wypierdol z polski kropka pe el",
"enforce-whitelist": true,