diff --git a/1.20.1/public/anarchy.lavalawsless.com/Dockerfile b/1.20.1/public/anarchy.lavalawsless.com/Dockerfile index 03b6d06..af3734f 100644 --- a/1.20.1/public/anarchy.lavalawsless.com/Dockerfile +++ b/1.20.1/public/anarchy.lavalawsless.com/Dockerfile @@ -13,9 +13,9 @@ ADD https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact # Install git & build spigot server RUN apk add --no-cache git \ && java -jar /temp/BuildTools.jar --rev latest \ - && mv spigot-*.jar spigot.jar \ && rm -rf /temp \ + # Copy over server properties and world data COPY ./server.properties /spigot-server/ COPY blacklist.json /spigot-server/ @@ -31,7 +31,7 @@ COPY ./eula.txt /spigot-server/ # Accept Minecraft EULA RUN echo "eula=true" > eula.txt - +RUN cd /spigot-server # Start the Spigot server -ENTRYPOINT ["java", "-Xmx1024M", "-Xms1024M", "-jar", "spigot.jar", "nogui"] \ No newline at end of file +ENTRYPOINT ["java", "-Xmx1024M", "-Xms1024M", "-jar", "./spigot-1.20.1.jar", "nogui"] \ No newline at end of file diff --git a/docker-compose.yaml b/docker-compose.yaml index c4bcbc6..9e3ac6e 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -27,25 +27,23 @@ services: - './1.20.1/private/vanilla/.map/world_the_end:/minecraft-server/world_the_end' - './1.20.1/private/vanilla/whitelist.json:/minecraft-server/whitelist.json' networks: - private: - ipv4_address: 172.16.0.2 + - private ports: - "25566:25566" - # Private Test Spigot server - minecraft_spygot_1_20_1: - build: ./1.20.1/private/spigot - volumes: - - './1.20.1/private/spigot/.map/world:/minecraft-server/world' - - './1.20.1/private/spigot/.map/world_nether:/minecraft-server/world_nether' - - './1.20.1/private/spigot/.map/world_the_end:/minecraft-server/world_the_end' - - './1.20.1/private/spigot/whitelist.json:/minecraft-server/whitelist.json' - - './1.20.1/private/spigot/blacklist.json:/minecraft-server/blacklist.json' - networks: - private: - ipv4_address: 172.16.0.3 - ports: - - "25566:25566" +# Private Test Spigot server + # minecraft_spigot_1_20_1: + # build: ./1.20.1/private/spigot + # volumes: + # - './1.20.1/private/spigot/.map/world:/minecraft-server/world' + # - './1.20.1/private/spigot/.map/world_nether:/minecraft-server/world_nether' + # - './1.20.1/private/spigot/.map/world_the_end:/minecraft-server/world_the_end' + # - './1.20.1/private/spigot/whitelist.json:/minecraft-server/whitelist.json' + # - './1.20.1/private/spigot/blacklist.json:/minecraft-server/blacklist.json' + # networks: + # - private + # ports: + # - "25566:25566" # Public Spigot API server lavalawless_spigot_1_20_1: @@ -56,7 +54,6 @@ services: - './1.20.1/public/anarchy.lavalawless.com/.map/world_the_end:/minecraft-server/world_the_end' - './1.20.1/public/anarchy.lavalawless.com/blacklist.json:/minecraft-server/blacklist.json' networks: - public_1: - ipv4_address: 192.168.0.2 + - public_1 ports: - "25567:25567" \ No newline at end of file