Update docker-compose.yml

.gitea/workflows/production.yml

@@ -12,15 +12,14 @@ jobs:
     - name: Checkout Repository
       uses: actions/checkout@v4
     
-    - name: Copy docker-compose.yml to server
+    - name: Copy files to server
       uses: appleboy/scp-action@v0.1.7
       with:
         host: ${{ secrets.HOST }}
         username: ${{ secrets.USERNAME }}
         key: ${{ secrets.KEY }}
-        source: "compose-file/docker-compose.yml"
+        source: "configuration,docker-compose.yml,Dockerfile"
         target: "/home/${{ secrets.USERNAME }}/minecraft-server-ironveil"
-        strip_components: 1
 
     - name: Deploy and restart container
       uses: appleboy/ssh-action@v1.2.5
@@ -31,4 +30,4 @@ jobs:
         script: |
           cd minecraft-server-ironveil
           docker compose pull
-          docker compose up -d --force-recreate
+          docker compose up -d --force-recreate --build

.gitea/workflows/publish.yml

@@ -1,54 +0,0 @@
-name: Build and Publish Docker Image
-
-on:
-  push:
-    branches:
-      - main
-      
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-      
-      - name: Download modpack from release
-        run: |
-          curl -L -H "Authorization: token ${{ secrets.GIT_PASSWORD }}" \
-            -o modpack.zip \
-            "https://git.cashew.network/${{ github.repository }}/releases/download/modpack-latest/modpack.zip"
-          unzip -q modpack.zip -d modpack
-          rm modpack.zip
-      
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      
-      - name: Log in to Docker Registry
-        uses: docker/login-action@v3
-        with:
-          registry: git.cashew.network
-          username: ${{ secrets.GIT_USERNAME }}
-          password: ${{ secrets.GIT_PASSWORD }}
-      
-      - name: Extract metadata
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: git.cashew.network/${{ github.repository }}
-          tags: |
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=raw,value=latest
-      
-      - name: Build and push Docker image
-        uses: docker/build-push-action@v5
-        with:
-          context: .
-          push: true
-          tags: ${{ steps.meta.outputs.tags }}
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=registry,ref=git.cashew.network/${{ github.repository }}:buildcache
-          cache-to: type=registry,ref=git.cashew.network/${{ github.repository }}:buildcache,mode=max
-  

.gitignore

@@ -1,3 +1,4 @@
 .env
 world
-modpack
+modpack*
+Dockerfile

Dockerfile

@@ -1,18 +1,17 @@
-# Use an official OpenJDK 17 image
+# Use an official OpenJDK 21 image
-FROM eclipse-temurin:17-jdk
+FROM eclipse-temurin:21-jdk
 
 # Set working directory
 WORKDIR /server
 
 # Copy modpack files
-COPY modpack/ /server/
+COPY modpack/. .
 
 # Copy configuration files
-COPY configuration/ /server/
+COPY configuration/. .
 
 # Make run.sh executable (check if it exists first)
-RUN if [ -f run.sh ]; then chmod +x run.sh; fi && \
+RUN chmod +x /server/run.sh
-    if [ -f /server/run.sh ]; then chmod +x /server/run.sh; fi
 
 # Expose the default Minecraft port (25565)
 EXPOSE 25565
@@ -20,5 +19,8 @@ EXPOSE 25565
 # Expose the default Minecraft RCON port (25575)
 EXPOSE 25575
 
+# Expose dynmap port
+EXPOSE 8123
+
 # Start the server using run.sh
-ENTRYPOINT ["./run.sh"]
+ENTRYPOINT ["/server/run.sh"]

configuration/whitelist.json

@@ -1,4 +1,38 @@
 [
-  "player1",
+    {
-  "player2"
+        "name":"zardzul",
-]
+        "uuid":"9f0f315c-880d-48aa-a786-66ba83dcfb28"
+    },
+    {
+        "name":"CreativeClaws",
+        "uuid":"173c71f5-8de7-4161-bedf-18350b9a7306"
+    },
+    {
+        "name":"Mango_Rain",
+        "uuid":"917a3cfd-4470-452b-82da-6af9c35832ff"
+    },
+    {
+        "name":"CerberusGK",
+        "uuid":"92676552-9c9c-4996-ab8f-d2344ec2068a"
+    },
+    {
+        "name":"c_thijsen",
+        "uuid":"6123dc36-9374-4111-b021-8c04507d380a"
+    },
+    {
+        "name":"Bongo_catto",
+        "uuid":"549e6c7b-8cfc-4a59-ad9d-6bff338932a9"
+    },
+    {
+        "name":"Underkun",
+        "uuid":"69132e65-7ffc-4fa2-b8c2-0610eacf36ad"
+    },
+    {
+        "name":"PenguinLotje",
+        "uuid":"ac06c59b-9f89-4870-889a-3c183b9e6a11"
+    },
+    {
+        "name":"B4nanaJuice",
+        "uuid":"340a9ec8-fe7a-4209-a9e4-cd5d5ddbf128"
+    }
+]

docker-compose.yml

@@ -1,10 +1,11 @@
 services:
   ironveil:
-    image: git.cashew.network/zardzul/minecraft-server-ironveil:latest
+    build: .
     container_name: ironveil
     volumes:
       - ./world:/server/world
     ports:
-      - "25565:25565"
+      - "5101:25565"
-      - "25575:25575"
+      - "5201:25575"
+      - "5301:8123" # dynmap
     restart: unless-stopped