From 155b62390155e1e31961d4ae17c52641766675e8 Mon Sep 17 00:00:00 2001 From: zardzul Date: Fri, 20 Feb 2026 18:04:00 +0100 Subject: [PATCH] add changes to push files to server --- .gitea/workflows/production.yml | 5 +- .gitea/workflows/publish.yml | 54 ------------------ .../server-icon.png | Bin configuration/whitelist.json | 40 ++++++++++++- .../docker-compose.yml => docker-compose.yml | 2 +- 5 files changed, 40 insertions(+), 61 deletions(-) delete mode 100644 .gitea/workflows/publish.yml rename server-icon.png => configuration/server-icon.png (100%) rename compose-file/docker-compose.yml => docker-compose.yml (71%) diff --git a/.gitea/workflows/production.yml b/.gitea/workflows/production.yml index 62b8670..bf95ec3 100644 --- a/.gitea/workflows/production.yml +++ b/.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 diff --git a/.gitea/workflows/publish.yml b/.gitea/workflows/publish.yml deleted file mode 100644 index 50ae5bc..0000000 --- a/.gitea/workflows/publish.yml +++ /dev/null @@ -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 - \ No newline at end of file diff --git a/server-icon.png b/configuration/server-icon.png similarity index 100% rename from server-icon.png rename to configuration/server-icon.png diff --git a/configuration/whitelist.json b/configuration/whitelist.json index f707add..1cb1bc8 100644 --- a/configuration/whitelist.json +++ b/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" + } +] \ No newline at end of file diff --git a/compose-file/docker-compose.yml b/docker-compose.yml similarity index 71% rename from compose-file/docker-compose.yml rename to docker-compose.yml index 2781611..22e9ac4 100644 --- a/compose-file/docker-compose.yml +++ b/docker-compose.yml @@ -1,6 +1,6 @@ services: ironveil: - image: git.cashew.network/zardzul/minecraft-server-ironveil:latest + build: . container_name: ironveil volumes: - ./world:/server/world