diff --git a/.github/workflows/ci-master-pr.yml b/.github/workflows/ci-master-pr.yml index 1d5ff289..d02332e5 100644 --- a/.github/workflows/ci-master-pr.yml +++ b/.github/workflows/ci-master-pr.yml @@ -126,6 +126,7 @@ jobs: platforms: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x' push: true tags: | + ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:nginx ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-nginx ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-nginx cache-to: type=local,dest=/tmp/.buildx-cache @@ -140,6 +141,7 @@ jobs: platforms: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x' push: true tags: | + ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:php ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-php ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-php cache-to: type=local,dest=/tmp/.buildx-cache @@ -154,9 +156,9 @@ jobs: platforms: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x' push: true tags: | + ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:nginx ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-nginx ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-nginx - # ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:nginx cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache - name: Build and push php (release) @@ -169,9 +171,9 @@ jobs: platforms: 'linux/386,linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64,linux/s390x' push: true tags: | + ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:php ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF }}-php ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:${{ steps.prep.outputs.VARIANT_TAG_WITH_REF_AND_SHA_SHORT }}-php - ${{ steps.prep.outputs.CI_PROJECT_NAMESPACE }}/${{ steps.prep.outputs.CI_PROJECT_NAME }}:php cache-from: type=local,src=/tmp/.buildx-cache cache-to: type=local,dest=/tmp/.buildx-cache diff --git a/README.md b/README.md index 75b03df9..27b7a0c5 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![github-actions](https://github.com/startersclan/ASP/workflows/ci-master-pr/badge.svg)](https://github.com/startersclan/ASP/actions) [![github-release](https://img.shields.io/github/v/release/startersclan/ASP?style=flat-square)](https://github.com/startersclan/ASP/releases/) -[![docker-image-size](https://img.shields.io/docker/image-size/startersclan/asp/master-nginx)](https://hub.docker.com/r/startersclan/asp) +[![docker-image-size](https://img.shields.io/docker/image-size/startersclan/asp/nginx)](https://hub.docker.com/r/startersclan/asp) The new BF2Statistics 3.0 ASP, currently in public Beta. The GameSpy server to match is over at https://github.com/BF2Statistics/BattleSpy