From 800031d96a0b953c017a7fafa942616bcc03c83c Mon Sep 17 00:00:00 2001 From: neodiX Date: Fri, 28 Feb 2025 16:35:38 +0400 Subject: [PATCH] Revert "split docker images for amd64 and arm64" This reverts commit 609617f0056ac1eff7b34dce146b864de19de527. --- .../docker-ubuntu-branch-image-х86-64.yml | 59 ---------------- ...m64.yml => docker-ubuntu-branch-image.yml} | 8 ++- .../workflows/docker-ubuntu-image-x86-64.yml | 68 ------------------- ...mage-arm64.yml => docker-ubuntu-image.yml} | 6 +- 4 files changed, 8 insertions(+), 133 deletions(-) delete mode 100644 .github/workflows/docker-ubuntu-branch-image-х86-64.yml rename .github/workflows/{docker-ubuntu-branch-image-arm64.yml => docker-ubuntu-branch-image.yml} (88%) delete mode 100644 .github/workflows/docker-ubuntu-image-x86-64.yml rename .github/workflows/{docker-ubuntu-image-arm64.yml => docker-ubuntu-image.yml} (94%) diff --git a/.github/workflows/docker-ubuntu-branch-image-х86-64.yml b/.github/workflows/docker-ubuntu-branch-image-х86-64.yml deleted file mode 100644 index 122ce02d..00000000 --- a/.github/workflows/docker-ubuntu-branch-image-х86-64.yml +++ /dev/null @@ -1,59 +0,0 @@ -name: Docker Ubuntu 22.04 branch image x86-64 - -on: - workflow_dispatch: - push: - branches-ignore: - - master - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - build-and-push: - runs-on: ubuntu-22.04 - steps: - - name: Check out repository - uses: actions/checkout@v3 - with: - submodules: 'recursive' - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3.5.0 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.10.0 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and export to Docker - uses: docker/build-push-action@v6 - with: - load: true - context: ./ - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test - - - name: Test - run: | - docker run --rm -e "TEST=1" ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test - - - name: Get tag as branch name - id: tag - run: | - echo "TAG=${GITHUB_REF##*/}" >> $GITHUB_OUTPUT - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v6 - with: - platforms: linux/amd64 - push: true - context: ./ - tags: | - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.TAG }} diff --git a/.github/workflows/docker-ubuntu-branch-image-arm64.yml b/.github/workflows/docker-ubuntu-branch-image.yml similarity index 88% rename from .github/workflows/docker-ubuntu-branch-image-arm64.yml rename to .github/workflows/docker-ubuntu-branch-image.yml index 7a046395..9e8e4d54 100644 --- a/.github/workflows/docker-ubuntu-branch-image-arm64.yml +++ b/.github/workflows/docker-ubuntu-branch-image.yml @@ -1,4 +1,4 @@ -name: Docker Ubuntu 22.04 branch image arm64 +name: Docker Ubuntu 22.04 branch image on: workflow_dispatch: @@ -12,7 +12,7 @@ env: jobs: build-and-push: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check out repository uses: actions/checkout@v3 @@ -24,6 +24,8 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3.10.0 + with: + driver-opts: image=moby/buildkit:v0.11.0 - name: Login to GitHub Container Registry uses: docker/login-action@v3 @@ -52,7 +54,7 @@ jobs: id: docker_build uses: docker/build-push-action@v6 with: - platforms: linux/arm64 + platforms: linux/amd64,linux/arm64 push: true context: ./ tags: | diff --git a/.github/workflows/docker-ubuntu-image-x86-64.yml b/.github/workflows/docker-ubuntu-image-x86-64.yml deleted file mode 100644 index 6ae6d6fd..00000000 --- a/.github/workflows/docker-ubuntu-image-x86-64.yml +++ /dev/null @@ -1,68 +0,0 @@ -name: Docker Ubuntu 22.04 image x86-64 - -on: - workflow_dispatch: - push: - branches: - - 'master' - -env: - REGISTRY: ghcr.io - IMAGE_NAME: ${{ github.repository }} - -jobs: - build-and-push: - runs-on: ubuntu-22.04 - steps: - - name: Check out repository - uses: actions/checkout@v3 - with: - submodules: 'recursive' - - - name: Set up QEMU - uses: docker/setup-qemu-action@v3.5.0 - - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3.10.0 - - - name: Login to GitHub Container Registry - uses: docker/login-action@v3 - with: - registry: ${{ env.REGISTRY }} - username: ${{ github.repository_owner }} - password: ${{ secrets.GITHUB_TOKEN }} - - - name: Build and export to Docker - uses: docker/build-push-action@v6 - with: - load: true - context: ./ - tags: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test - - - name: Test - run: | - docker run --rm -e "TEST=1" ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:test - - - name: Get next tag - id: tag - run: | - git fetch --all --tags - git tag -l - NEW_TAG=v$(date +'%Y.%m') - FOUND=$(git tag -l | grep $NEW_TAG | wc -l) - if [ $FOUND -eq 0 ]; then - echo "TAG=$NEW_TAG" >> $GITHUB_OUTPUT - else - echo "TAG=$NEW_TAG-$FOUND" >> $GITHUB_OUTPUT - fi - - - name: Build and push - id: docker_build - uses: docker/build-push-action@v6 - with: - platforms: linux/amd64 - push: true - context: ./ - tags: | - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:latest - ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}:${{ steps.tag.outputs.TAG }} diff --git a/.github/workflows/docker-ubuntu-image-arm64.yml b/.github/workflows/docker-ubuntu-image.yml similarity index 94% rename from .github/workflows/docker-ubuntu-image-arm64.yml rename to .github/workflows/docker-ubuntu-image.yml index 2d5e128f..971ceb85 100644 --- a/.github/workflows/docker-ubuntu-image-arm64.yml +++ b/.github/workflows/docker-ubuntu-image.yml @@ -1,4 +1,4 @@ -name: Docker Ubuntu 22.04 image arm64 +name: Docker Ubuntu 22.04 image on: workflow_dispatch: @@ -12,7 +12,7 @@ env: jobs: build-and-push: - runs-on: ubuntu-22.04 + runs-on: ubuntu-24.04 steps: - name: Check out repository uses: actions/checkout@v3 @@ -60,7 +60,7 @@ jobs: id: docker_build uses: docker/build-push-action@v6 with: - platforms: linux/arm64 + platforms: linux/amd64,linux/arm64 push: true context: ./ tags: |