From 090dd49ccddae01c1cc717f9458d613cfbed6cb2 Mon Sep 17 00:00:00 2001
From: Revela <rexmarek@gmail.com>
Date: Mon, 16 Mar 2026 03:52:25 -0500
Subject: [PATCH] Update workflows and Docker image references

- Modify `.gitattributes` to use "ours" merge strategy for specific workflow and Docker Compose files.
- Update `nightly.yml` to allow manual triggering and set permissions for content writing.
- Change Docker image reference for `minecraft-lce-dedicated-server` service to a new source.
---
 .gitattributes                           |  3 +++
 .github/workflows/nightly.yml            | 10 +---------
 docker-compose.dedicated-server.ghcr.yml |  2 +-
 3 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index e69de29b..613d9c7c 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,3 @@
+.github/workflows/docker-nightly.yml merge=ours
+.github/workflows/nightly.yml merge=ours
+docker-compose.dedicated-server.ghcr.yml merge=ours
diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index 5af23fe6..d19e3677 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -1,15 +1,7 @@
 name: Nightly Releases
 
 on:
-  workflow_dispatch: 
-  push:
-    branches:
-    - 'main'
-    - 'feature/dedicated-server'
-    paths-ignore:
-      - '.gitignore'
-      - '*.md'
-      - '.github/*.md'
+  workflow_dispatch:
 
 permissions:
   contents: write
diff --git a/docker-compose.dedicated-server.ghcr.yml b/docker-compose.dedicated-server.ghcr.yml
index 8bcaf484..cd6e45f0 100644
--- a/docker-compose.dedicated-server.ghcr.yml
+++ b/docker-compose.dedicated-server.ghcr.yml
@@ -1,6 +1,6 @@
 services:
   minecraft-lce-dedicated-server:
-    image: ghcr.io/kuwacom/minecraft-lce-dedicated-server:nightly
+    image: ghcr.io/itsrevela/minecraft-lce-dedicated-server:nightly
     container_name: minecraft-lce-dedicated-server
     restart: unless-stopped
     tty: true