diff --git a/.github/workflows/action-docker-publish.yml b/.github/workflows/action-docker-publish.yml index 8909dab..0a3a9fe 100644 --- a/.github/workflows/action-docker-publish.yml +++ b/.github/workflows/action-docker-publish.yml @@ -10,54 +10,54 @@ on: jobs: build-ubuntu-2404: - name: Build Ubuntu 24.04 - runs-on: ubuntu-latest - permissions: - packages: write - contents: read - attestations: write - id-token: write - steps: - - name: Checkout - uses: actions/checkout@v5 - - - name: Setup QEMU - uses: docker/setup-qemu-action@v3 - - - name: Login to Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Extract metadata (tags, labels) for Docker - id: meta - uses: docker/metadata-action@v5 - with: - images: | - gameservermanagers/linuxgsm - ghcr.io/gameservermanagers/linuxgsm - tags: | - latest - ubuntu - ubuntu-24.04 - - - name: Build and push (Ubuntu 24.04) - uses: docker/build-push-action@v6 - with: - context: . - file: ./Dockerfile.ubuntu-2404 - platforms: linux/amd64 - push: true - tags: ${{ steps.meta.outputs.tags }} - labels: ${{ steps.meta.outputs.labels }} + name: Build Ubuntu 24.04 + runs-on: ubuntu-latest + permissions: + packages: write + contents: read + attestations: write + id-token: write + steps: + - name: Checkout + uses: actions/checkout@v5 + + - name: Setup QEMU + uses: docker/setup-qemu-action@v3 + + - name: Login to Docker Hub + uses: docker/login-action@v3 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} + + - name: Login to GitHub Container Registry + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.actor }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Extract metadata (tags, labels) for Docker + id: meta + uses: docker/metadata-action@v5 + with: + images: | + gameservermanagers/linuxgsm + ghcr.io/gameservermanagers/linuxgsm + tags: | + latest + ubuntu + ubuntu-24.04 + + - name: Build and push (Ubuntu 24.04) + uses: docker/build-push-action@v6 + with: + context: . + file: ./Dockerfile.ubuntu-2404 + platforms: linux/amd64 + push: true + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} build-ubuntu-2204: name: Build Ubuntu 22.04 @@ -157,7 +157,7 @@ jobs: package-cleanup: name: Cleanup Old GitHub Packages - needs: [ build-ubuntu-2004, build-ubuntu-2204, build-ubuntu-2404 ] + needs: [build-ubuntu-2004, build-ubuntu-2204, build-ubuntu-2404] runs-on: ubuntu-latest steps: - name: Delete Package Versions diff --git a/README.md b/README.md index 1ed95e6..5adba01 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # LinuxGSM Base Docker Image ## This is the base LinuxGSM image only. + ## Use docker-gameserver for full game servers

diff --git a/entrypoint-user.sh b/entrypoint-user.sh index e4c41f9..db72891 100644 --- a/entrypoint-user.sh +++ b/entrypoint-user.sh @@ -106,7 +106,7 @@ fi # Update or validate game server if [ -z "${install}" ]; then echo -e "" - if [ "${VALIDATE_ON_START,,}" = "true" ]; then + if [ "${VALIDATE_ON_START,,}" = "true" ]; then echo -e "Validating ${GAMESERVER}" echo -e "=================================" ./"${GAMESERVER}" validate