From 0842229e05de351f23f39b3b6921128be178827f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 8 Feb 2025 15:25:47 +0000 Subject: [PATCH 1/5] chore(deps): bump docker/build-push-action from 6.10.0 to 6.13.0 (#72) Bumps [docker/build-push-action](https://github.com/docker/build-push-action) from 6.10.0 to 6.13.0. - [Release notes](https://github.com/docker/build-push-action/releases) - [Commits](https://github.com/docker/build-push-action/compare/v6.10.0...v6.13.0) --- updated-dependencies: - dependency-name: docker/build-push-action dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/docker-publish.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index a913ede..b1d3f24 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -40,7 +40,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push (Ubuntu 24.04) - uses: docker/build-push-action@v6.10.0 + uses: docker/build-push-action@v6.13.0 with: context: . file: ./Dockerfile.ubuntu-2404 @@ -84,7 +84,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push (Ubuntu 22.04) - uses: docker/build-push-action@v6.10.0 + uses: docker/build-push-action@v6.13.0 with: context: . file: ./Dockerfile.ubuntu-2204 @@ -124,7 +124,7 @@ jobs: password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push (Ubuntu 20.04) - uses: docker/build-push-action@v6.10.0 + uses: docker/build-push-action@v6.13.0 with: context: . file: ./Dockerfile.ubuntu-2004 From 4968706919b8fcfc82a17d000ed1e7b3f1070ee9 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 8 Feb 2025 15:42:23 +0000 Subject: [PATCH 2/5] use github images instead --- Dockerfile.ubuntu-2004 | 2 +- Dockerfile.ubuntu-2204 | 2 +- Dockerfile.ubuntu-2404 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004 index 3056fe3..cbeff71 100644 --- a/Dockerfile.ubuntu-2004 +++ b/Dockerfile.ubuntu-2004 @@ -4,7 +4,7 @@ # https://github.com/GameServerManagers/docker-linuxgsm # -FROM gameservermanagers/steamcmd:ubuntu-20.04 +FROM ghcr.io/gameservermanagers/steamcmd:ubuntu-24.04:ubuntu-20.04 LABEL maintainer="LinuxGSM " ENV DEBIAN_FRONTEND noninteractive diff --git a/Dockerfile.ubuntu-2204 b/Dockerfile.ubuntu-2204 index da8fc89..e8d2225 100644 --- a/Dockerfile.ubuntu-2204 +++ b/Dockerfile.ubuntu-2204 @@ -4,7 +4,7 @@ # https://github.com/GameServerManagers/docker-linuxgsm # -FROM gameservermanagers/steamcmd:ubuntu-22.04 +FROM ghcr.io/gameservermanagers/steamcmd:ubuntu-22.04 LABEL maintainer="LinuxGSM " ENV DEBIAN_FRONTEND noninteractive diff --git a/Dockerfile.ubuntu-2404 b/Dockerfile.ubuntu-2404 index 1fe532b..187a559 100644 --- a/Dockerfile.ubuntu-2404 +++ b/Dockerfile.ubuntu-2404 @@ -4,7 +4,7 @@ # https://github.com/GameServerManagers/docker-linuxgsm # -FROM gameservermanagers/steamcmd:ubuntu-24.04 +FROM ghcr.io/gameservermanagers/steamcmd:ubuntu-24.04 LABEL maintainer="LinuxGSM " ENV DEBIAN_FRONTEND noninteractive From 35f430be96bc8ed2a756614d102acdb6eb7fc794 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 8 Feb 2025 23:33:57 +0000 Subject: [PATCH 3/5] update docker publish --- .github/workflows/docker-publish.yml | 166 ++++++++++++++++----------- 1 file changed, 96 insertions(+), 70 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index b1d3f24..64c10b5 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -5,58 +5,68 @@ on: branches: "main" paths: - Dockerfile* - - entrypoint* schedule: - - cron: "0 2 * * 6" + - cron: "0 1 * * 6" jobs: build-ubuntu-2404: - name: Build Ubuntu 24.04 - runs-on: ubuntu-latest - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: Setup QEMU - uses: docker/setup-qemu-action@v3 - - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v3.8.0 - - - name: Build - run: docker build -t gameservermanagers/linuxgsm:ubuntu-24.04 -f ./Dockerfile.ubuntu-2404 . - - - name: Login to DockerHub - uses: docker/login-action@v3.3.0 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }} - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3.3.0 - with: - registry: ghcr.io - username: ${{ github.actor }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and push (Ubuntu 24.04) - uses: docker/build-push-action@v6.13.0 - with: - context: . - file: ./Dockerfile.ubuntu-2404 - platforms: linux/amd64 - push: true - tags: | - gameservermanagers/linuxgsm:latest - gameservermanagers/linuxgsm:ubuntu - gameservermanagers/linuxgsm:ubuntu-24.04 - ghcr.io/gameservermanagers/linuxgsm:latest - ghcr.io/gameservermanagers/linuxgsm:ubuntu - ghcr.io/gameservermanagers/linuxgsm:ubuntu-24.04 + 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@v4 + + - 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 runs-on: ubuntu-latest + permissions: + packages: write + contents: read + attestations: write + id-token: write steps: - name: Checkout uses: actions/checkout@v4 @@ -64,39 +74,50 @@ jobs: - name: Setup QEMU uses: docker/setup-qemu-action@v3 - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v3.8.0 - - - name: Build - run: docker build -t gameservermanagers/linuxgsm:ubuntu-22.04 -f ./Dockerfile.ubuntu-2204 . - - - name: Login to DockerHub - uses: docker/login-action@v3.3.0 + - 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.3.0 + 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-22.04 + - name: Build and push (Ubuntu 22.04) - uses: docker/build-push-action@v6.13.0 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile.ubuntu-2204 platforms: linux/amd64 push: true - tags: | - gameservermanagers/linuxgsm:ubuntu-22.04 - ghcr.io/gameservermanagers/linuxgsm:ubuntu-22.04 + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} + build-ubuntu-2004: name: Build Ubuntu 20.04 runs-on: ubuntu-latest + permissions: + packages: write + contents: read + attestations: write + id-token: write steps: - name: Checkout uses: actions/checkout@v4 @@ -104,35 +125,40 @@ jobs: - name: Setup QEMU uses: docker/setup-qemu-action@v3 - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v3.8.0 - - - name: Build - run: docker build -t gameservermanagers/linuxgsm:ubuntu-20.04 -f ./Dockerfile.ubuntu-2004 . - - - name: Login to DockerHub - uses: docker/login-action@v3.3.0 + - 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.3.0 + 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-20.04 + - name: Build and push (Ubuntu 20.04) - uses: docker/build-push-action@v6.13.0 + uses: docker/build-push-action@v6 with: context: . file: ./Dockerfile.ubuntu-2004 platforms: linux/amd64 push: true - tags: | - gameservermanagers/linuxgsm:ubuntu-20.04 - ghcr.io/gameservermanagers/linuxgsm:ubuntu-20.04 + tags: ${{ steps.meta.outputs.tags }} + labels: ${{ steps.meta.outputs.labels }} package-cleanup: name: Cleanup Old GitHub Packages From fcff650eca319a3bafbe1b68ce0df476b5376b4d Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 8 Feb 2025 23:37:17 +0000 Subject: [PATCH 4/5] correct tags --- .github/workflows/docker-publish.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml index 64c10b5..0ceff0b 100644 --- a/.github/workflows/docker-publish.yml +++ b/.github/workflows/docker-publish.yml @@ -95,8 +95,6 @@ jobs: gameservermanagers/linuxgsm ghcr.io/gameservermanagers/linuxgsm tags: | - latest - ubuntu ubuntu-22.04 - name: Build and push (Ubuntu 22.04) @@ -146,8 +144,6 @@ jobs: gameservermanagers/linuxgsm ghcr.io/gameservermanagers/linuxgsm tags: | - latest - ubuntu ubuntu-20.04 - name: Build and push (Ubuntu 20.04) From ba9e7295560b1e8fe15ad8b128518cac94509a24 Mon Sep 17 00:00:00 2001 From: Daniel Gibbs Date: Sat, 8 Feb 2025 23:43:55 +0000 Subject: [PATCH 5/5] bug --- Dockerfile.ubuntu-2004 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile.ubuntu-2004 b/Dockerfile.ubuntu-2004 index cbeff71..a2ed47e 100644 --- a/Dockerfile.ubuntu-2004 +++ b/Dockerfile.ubuntu-2004 @@ -4,7 +4,7 @@ # https://github.com/GameServerManagers/docker-linuxgsm # -FROM ghcr.io/gameservermanagers/steamcmd:ubuntu-24.04:ubuntu-20.04 +FROM ghcr.io/gameservermanagers/steamcmd:ubuntu-20.04 LABEL maintainer="LinuxGSM " ENV DEBIAN_FRONTEND noninteractive