From d31d10d8caad9d7154f15042fb21e5cb5aadf9f8 Mon Sep 17 00:00:00 2001 From: zaigie Date: Fri, 2 Feb 2024 14:14:07 +0800 Subject: [PATCH] chore: rename docker ci actions --- .github/workflows/docker-image-agent.yml | 2 +- .github/workflows/docker-image.yml | 52 ++++++++++++------------ 2 files changed, 26 insertions(+), 28 deletions(-) diff --git a/.github/workflows/docker-image-agent.yml b/.github/workflows/docker-image-agent.yml index fcc8979..fc0519c 100644 --- a/.github/workflows/docker-image-agent.yml +++ b/.github/workflows/docker-image-agent.yml @@ -1,4 +1,4 @@ -name: Docker Image CI +name: PST-Agent Docker Image CI on: push: diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 68907f2..061c3d8 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,4 +1,4 @@ -name: Docker Image CI +name: PST Docker Image CI on: push: @@ -8,43 +8,41 @@ env: IMAGE_NAME: palworld-server-tool DOCKER_REGISTRY: jokerwho jobs: - build-image: - runs-on: ubuntu-latest outputs: tags: ${{ steps.output-id.outputs.v }} steps: - - uses: actions/checkout@v3 - - id: output-id - run: | + - uses: actions/checkout@v3 + - id: output-id + run: | VERSION=prod if [[ $GITHUB_REF == refs/tags/* ]]; then VERSION=${GITHUB_REF#refs/tags/v} fi echo "v=${VERSION}" >> $GITHUB_OUTPUT - - - name: Setup Docker Buildx - uses: docker/setup-buildx-action@v2 - - name: Login Docker Hub - uses: docker/login-action@v1 - with: - username: ${{ secrets.DOCKER_HUB_USERNAME }} - password: ${{ secrets.DOCKER_HUB_PWD }} + - name: Setup Docker Buildx + uses: docker/setup-buildx-action@v2 + + - name: Login Docker Hub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_HUB_USERNAME }} + password: ${{ secrets.DOCKER_HUB_PWD }} - - name: Build and push - uses: docker/build-push-action@v4 - with: - context: . - file: ./Dockerfile - platforms: | - linux/amd64 - linux/arm64 - push: true - build-args: version=v${{ steps.output-id.outputs.v }} - tags: | - ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.output-id.outputs.v }} - ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest + - name: Build and push + uses: docker/build-push-action@v4 + with: + context: . + file: ./Dockerfile + platforms: | + linux/amd64 + linux/arm64 + push: true + build-args: version=v${{ steps.output-id.outputs.v }} + tags: | + ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.output-id.outputs.v }} + ${{ env.DOCKER_REGISTRY }}/${{ env.IMAGE_NAME }}:latest