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.
This commit is contained in:
Revela 2026-03-16 03:52:25 -05:00
parent 88274ebad1
commit 090dd49ccd
3 changed files with 5 additions and 10 deletions

3
.gitattributes vendored
View file

@ -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

View file

@ -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

View file

@ -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