From 1317cf3c93e9d2108bcc6613941a05ef6c3577d4 Mon Sep 17 00:00:00 2001 From: glax Date: Sat, 11 Oct 2025 22:01:20 +0200 Subject: [PATCH] Manifest needs all versions --- ...ing_amd64.yml => docker-image-testing.yml} | 2 +- .../docker-image-testing_amd64v2.yml | 45 ------------------- .../docker-image-testing_amd64v3.yml | 45 ------------------- .../workflows/docker-image-testing_arm64.yml | 45 ------------------- .../workflows/docker-image-testing_armv7.yml | 45 ------------------- 5 files changed, 1 insertion(+), 181 deletions(-) rename .github/workflows/{docker-image-testing_amd64.yml => docker-image-testing.yml} (93%) delete mode 100644 .github/workflows/docker-image-testing_amd64v2.yml delete mode 100644 .github/workflows/docker-image-testing_amd64v3.yml delete mode 100644 .github/workflows/docker-image-testing_arm64.yml delete mode 100644 .github/workflows/docker-image-testing_armv7.yml diff --git a/.github/workflows/docker-image-testing_amd64.yml b/.github/workflows/docker-image-testing.yml similarity index 93% rename from .github/workflows/docker-image-testing_amd64.yml rename to .github/workflows/docker-image-testing.yml index 3f3e13c..fb4edd2 100644 --- a/.github/workflows/docker-image-testing_amd64.yml +++ b/.github/workflows/docker-image-testing.yml @@ -38,7 +38,7 @@ jobs: context: ./ file: ./Dockerfile #platforms: linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/arm/v7 - platforms: linux/amd64 + platforms: linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64 pull: true push: true tags: | diff --git a/.github/workflows/docker-image-testing_amd64v2.yml b/.github/workflows/docker-image-testing_amd64v2.yml deleted file mode 100644 index 0aa5671..0000000 --- a/.github/workflows/docker-image-testing_amd64v2.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: CI amd64v2 - -on: - push: - branches: [ "testing" ] - workflow_dispatch: - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - # https://github.com/docker/setup-qemu-action#usage - - name: Set up QEMU - uses: docker/setup-qemu-action@v3.6.0 - - # https://github.com/marketplace/actions/docker-setup-buildx - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3.11.1 - - # https://github.com/docker/login-action#docker-hub - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - # https://github.com/docker/build-push-action#multi-platform-image - - name: Build and push Website - uses: docker/build-push-action@v6.18.0 - with: - context: ./ - file: ./Dockerfile - #platforms: linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/arm/v7 - platforms: linux/amd64/v2 - pull: true - push: true - tags: | - glax/tranga-website:testing diff --git a/.github/workflows/docker-image-testing_amd64v3.yml b/.github/workflows/docker-image-testing_amd64v3.yml deleted file mode 100644 index f4ce8c3..0000000 --- a/.github/workflows/docker-image-testing_amd64v3.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: CI amd64v3 - -on: - push: - branches: [ "testing" ] - workflow_dispatch: - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - # https://github.com/docker/setup-qemu-action#usage - - name: Set up QEMU - uses: docker/setup-qemu-action@v3.6.0 - - # https://github.com/marketplace/actions/docker-setup-buildx - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3.11.1 - - # https://github.com/docker/login-action#docker-hub - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - # https://github.com/docker/build-push-action#multi-platform-image - - name: Build and push Website - uses: docker/build-push-action@v6.18.0 - with: - context: ./ - file: ./Dockerfile - #platforms: linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/arm/v7 - platforms: linux/amd64/v3 - pull: true - push: true - tags: | - glax/tranga-website:testing diff --git a/.github/workflows/docker-image-testing_arm64.yml b/.github/workflows/docker-image-testing_arm64.yml deleted file mode 100644 index 0ce16ee..0000000 --- a/.github/workflows/docker-image-testing_arm64.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: CI arm64 - -on: - push: - branches: [ "testing" ] - workflow_dispatch: - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - # https://github.com/docker/setup-qemu-action#usage - - name: Set up QEMU - uses: docker/setup-qemu-action@v3.6.0 - - # https://github.com/marketplace/actions/docker-setup-buildx - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3.11.1 - - # https://github.com/docker/login-action#docker-hub - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - # https://github.com/docker/build-push-action#multi-platform-image - - name: Build and push Website - uses: docker/build-push-action@v6.18.0 - with: - context: ./ - file: ./Dockerfile - #platforms: linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/arm/v7 - platforms: linux/arm64 - pull: true - push: true - tags: | - glax/tranga-website:testing diff --git a/.github/workflows/docker-image-testing_armv7.yml b/.github/workflows/docker-image-testing_armv7.yml deleted file mode 100644 index ef43c68..0000000 --- a/.github/workflows/docker-image-testing_armv7.yml +++ /dev/null @@ -1,45 +0,0 @@ -name: CI armv7 - -on: - push: - branches: [ "testing" ] - workflow_dispatch: - -jobs: - - build: - - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v3 - - # https://github.com/docker/setup-qemu-action#usage - - name: Set up QEMU - uses: docker/setup-qemu-action@v3.6.0 - - # https://github.com/marketplace/actions/docker-setup-buildx - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@v3.11.1 - - # https://github.com/docker/login-action#docker-hub - - name: Login to Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - # https://github.com/docker/build-push-action#multi-platform-image - - name: Build and push Website - uses: docker/build-push-action@v6.18.0 - with: - context: ./ - file: ./Dockerfile - #platforms: linux/amd64,linux/amd64/v2,linux/amd64/v3,linux/arm64,linux/arm/v7 - platforms: linux/arm/v7 - pull: true - push: true - tags: | - glax/tranga-website:testing