Fixed spigot build

nakira974 · Aug 3, 2023 · 4aa80bc · 4aa80bc
1 parent c11b753
commit 4aa80bc
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 31 deletions.
diff --git a/1.20.1/private/spigot/Dockerfile b/1.20.1/private/spigot/Dockerfile
@@ -1,13 +1,22 @@
 # Use the official OpenJDK 17 image as base
-FROM openjdk:17-jdk-alpine
+FROM openjdk:19-jdk-alpine
 
 # Define the working directory
 WORKDIR /spigot-server
 
-# Expose the necessary port 
+# Download BuildTools.jar to build spigot server
+ADD https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar /temp/
+
+# 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
+
+# Expose the necessary port
 EXPOSE 25566
 
-# Copy over server properties and world data
+# Copy over server properties
 COPY ./server.properties /spigot-server/
 COPY ./whitelist.json /spigot-server/
 
@@ -16,20 +25,8 @@ COPY ./.map/world /spigot-server/world
 COPY ./.map/world_nether /spigot-server/world_nether
 COPY ./.map/world_the_end /spigot-server/world_the_end
 
-# Copy EULA 
-COPY ./eula.txt /spigot-server/
-
 # Accept Minecraft EULA
 RUN echo "eula=true" > eula.txt
 
-# Download BuildTools.jar to build spigot server
-ADD https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar /temp/
-
-# 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
-
 # Start the Spigot server
 ENTRYPOINT ["java", "-Xmx1024M", "-Xms1024M", "-jar", "spigot.jar", "nogui"]
diff --git a/1.20.1/private/vanilla/Dockerfile b/1.20.1/private/vanilla/Dockerfile
@@ -1,5 +1,5 @@
 # Use the official OpenJDK 17 image as base
-FROM openjdk:17-jdk-alpine
+FROM openjdk:19-jdk-alpine
 
 # Define the working directory
 WORKDIR /minecraft-server

diff --git a/1.20.1/public/lavalawless.lkh.coffee/Dockerfile b/1.20.1/public/lavalawless.lkh.coffee/Dockerfile
@@ -1,12 +1,21 @@
 # Use the official OpenJDK 17 image as base
-FROM openjdk:17-jdk-alpine
+FROM openjdk:19-jdk-alpine
 
 # Define the working directory
 WORKDIR /spigot-server
 
 # Expose the necessary port
 EXPOSE 25566
 
+# Download BuildTools.jar to build spigot server
+ADD https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar /temp/
+
+# 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/
@@ -22,14 +31,7 @@ COPY ./eula.txt /spigot-server/
 # Accept Minecraft EULA
 RUN echo "eula=true" > eula.txt
 
-# Download BuildTools.jar to build spigot server
-ADD https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar /temp/
 
-# 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
 
 # Start the Spigot server
 ENTRYPOINT ["java", "-Xmx1024M", "-Xms1024M", "-jar", "spigot.jar", "nogui"]
diff --git a/docker-compose.yaml b/docker-compose.yaml
@@ -45,8 +45,6 @@ services:
   # Private vanilla server
   minecraft_vanilla_1_20_1:
     build: ./1.20.1/private/vanilla
-    ports: 
-      - '25565:25565'
     volumes: 
       - './1.20.1/private/vanilla/.map/world:/minecraft-server/world'
       - './1.20.1/private/vanilla/.map/world_nether:/minecraft-server/world_nether'
@@ -55,25 +53,29 @@ services:
     networks:
       private:
         ipv4_address: 172.16.0.2
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.lavalawless.rule=Host(`minecraft.vanilla.lkh.coffee`)"
+      - "traefik.http.services.lavalawless.loadbalancer.server.port=25565"
 
   # Private Test Spigot server
   minecraft_spygot_1_20_1:
     build: ./1.20.1/private/spigot
-    ports:
-      - '25566:25566'
     volumes:
       - './1.20.1/spigot/private/.map/world:/minecraft-server/world'
       - './1.20.1/spigot/private/.map/world_nether:/minecraft-server/world_nether'
       - './1.20.1/spigot/private/.map/world_the_end:/minecraft-server/world_the_end'
     networks:
       private:
         ipv4_address: 172.16.0.3
+    labels:
+      - "traefik.enable=true"
+      - "traefik.http.routers.lavalawless.rule=Host(`minecraft.spigot.lkh.coffee`)"
+      - "traefik.http.services.lavalawless.loadbalancer.server.port=25566"
 
 # Public Spigot API server
   lavalawless_vanilla_1_20_1:
     build: ./1.20.1/public/lavalawless.lkh.coffee
-    ports: 
-      - '25567:25567'
     volumes:
       - './1.20.1/public/lavalawless.lkh.coffee/.map/world:/minecraft-server/world'
       - './1.20.1/public/lavalawless.lkh.coffee/.map/world_nether:/minecraft-server/world_nether'
@@ -85,5 +87,5 @@ services:
 
     labels:
       - "traefik.enable=true"
-      - "traefik.http.routers.lavalawless.rule=Host(`lavalawsless.lkh.coffee`)"
+      - "traefik.http.routers.lavalawless.rule=Host(`anarchy.lavalawsless.com`)"
       - "traefik.http.services.lavalawless.loadbalancer.server.port=25567"