Depreciate Arm(hf).

xthursdayx · Jul 28, 2023 · 404c8ca · 404c8ca
1 parent df45f05
commit 404c8ca
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 306 deletions.
diff --git a/.github/workflows/docker-build-and-publish.yml b/.github/workflows/docker-build-and-publish.yml
@@ -140,72 +140,6 @@ jobs:
             ${{ steps.gh-meta.outputs.tags }}-arm64v8
           labels: ${{ steps.dh-meta.outputs.labels }}
 
-  build-unarr-arm32v7:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Docker meta
-        id: dh-meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.DOCKERHUB_SLUG }}
-          flavor: latest=false
-          tags: |
-            type=ref,event=tag
-
-      - name: Docker meta
-        id: gh-meta
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.GHCR_SLUG }}
-          flavor: latest=false
-          tags: |
-            type=ref,event=tag
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Dockerhub
-        uses: docker/login-action@v2
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push container image
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          provenance: false
-          context: unarr
-          file: unarr/Dockerfile.armhf
-          platforms: linux/arm/v7
-          tags: |
-            ${{ env.DOCKERHUB_SLUG }}:unarr-arm32v7
-            ${{ env.DOCKERHUB_SLUG }}:latest-arm32v7
-            ${{ env.GHCR_SLUG }}:unarr-arm32v7
-            ${{ env.GHCR_SLUG }}:latest-arm32v7
-            ${{ steps.dh-meta.outputs.tags }}-arm32v7
-            ${{ steps.gh-meta.outputs.tags }}-arm32v7
-          labels: ${{ steps.dh-meta.outputs.labels }}
-
   build-p7zip-amd64:
     runs-on: ubuntu-latest
     permissions:
@@ -285,49 +219,8 @@ jobs:
             ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8
             ${{ env.GHCR_SLUG }}:p7zip-arm64v8
 
-  build-p7zip-arm32v7:
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v3
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-
-      - name: Login to Dockerhub
-        uses: docker/login-action@v2
-        with:
-          registry: docker.io
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build and push container image
-        uses: docker/build-push-action@v4
-        with:
-          push: true
-          provenance: false
-          context: p7zip
-          file: p7zip/Dockerfile.armhf
-          platforms: linux/arm/v7
-          tags: |
-            ${{ env.DOCKERHUB_SLUG }}:p7zip-arm32v7
-            ${{ env.GHCR_SLUG }}:p7zip-arm32v7
-
   push-manifest:
-    needs: [build-unarr-amd64, build-unarr-arm64v8, build-unarr-arm32v7, build-p7zip-amd64, build-p7zip-arm64v8, build-p7zip-arm32v7]
+    needs: [build-unarr-amd64, build-unarr-arm64v8, build-p7zip-amd64, build-p7zip-arm64v8]
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
@@ -378,69 +271,53 @@ jobs:
           # get artifacts from previous steps and integrate into one multi-arch manifest
           docker pull --platform=linux/amd64 ${{ env.DOCKERHUB_SLUG }}:unarr-amd64
           docker pull --platform=linux/arm64 ${{ env.DOCKERHUB_SLUG }}:unarr-arm64v8
-          docker pull --platform=linux/arm/v7 ${{ env.DOCKERHUB_SLUG }}:unarr-arm32v7
           docker pull --platform=linux/amd64 ${{ env.DOCKERHUB_SLUG }}:latest-amd64
           docker pull --platform=linux/arm64 ${{ env.DOCKERHUB_SLUG }}:latest-arm64v8
-          docker pull --platform=linux/arm/v7 ${{ env.DOCKERHUB_SLUG }}:latest-arm32v7
           docker pull --platform=linux/amd64 ${{ env.DOCKERHUB_SLUG }}:p7zip-amd64
           docker pull --platform=linux/arm64 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8
-          docker pull --platform=linux/arm/v7 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm32v7
           docker pull --platform=linux/amd64 ${{ steps.dh-meta.outputs.tags }}-amd64
           docker pull --platform=linux/arm64 ${{ steps.dh-meta.outputs.tags }}-arm64v8
-          docker pull --platform=linux/arm/v7 ${{ steps.dh-meta.outputs.tags }}-arm32v7
-          docker manifest create ${{ env.DOCKERHUB_SLUG }}:latest ${{ env.DOCKERHUB_SLUG }}:latest-amd64 ${{ env.DOCKERHUB_SLUG }}:latest-arm64v8 ${{ env.DOCKERHUB_SLUG }}:latest-arm32v7
+          docker manifest create ${{ env.DOCKERHUB_SLUG }}:latest ${{ env.DOCKERHUB_SLUG }}:latest-amd64 ${{ env.DOCKERHUB_SLUG }}:latest-arm64v8
           docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:latest --os linux --arch amd64 ${{ env.DOCKERHUB_SLUG }}:latest-amd64
           docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:latest --os linux --arch arm64 --variant v8 ${{ env.DOCKERHUB_SLUG }}:latest-arm64v8
-          docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:latest --os linux --arch arm --variant v7 ${{ env.DOCKERHUB_SLUG }}:latest-arm32v7 
           docker manifest push ${{ env.DOCKERHUB_SLUG }}:latest        
-          docker manifest create ${{ env.DOCKERHUB_SLUG }}:unarr ${{ env.DOCKERHUB_SLUG }}:unarr-amd64 --amend ${{ env.DOCKERHUB_SLUG }}:unarr-arm64v8 --amend ${{ env.DOCKERHUB_SLUG }}:unarr-arm32v7
+          docker manifest create ${{ env.DOCKERHUB_SLUG }}:unarr ${{ env.DOCKERHUB_SLUG }}:unarr-amd64 --amend ${{ env.DOCKERHUB_SLUG }}:unarr-arm64v8 --amend
           docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:unarr --os linux --arch amd64 ${{ env.DOCKERHUB_SLUG }}:unarr-amd64
           docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:unarr --os linux --arch arm64 --variant v8 ${{ env.DOCKERHUB_SLUG }}:unarr-arm64v8
-          docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:unarr --os linux --arch arm --variant v7 ${{ env.DOCKERHUB_SLUG }}:unarr-arm32v7
           docker manifest push ${{ env.DOCKERHUB_SLUG }}:unarr
-          docker manifest create ${{ env.DOCKERHUB_SLUG }}:p7zip ${{ env.DOCKERHUB_SLUG }}:p7zip-amd64 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm32v7
+          docker manifest create ${{ env.DOCKERHUB_SLUG }}:p7zip ${{ env.DOCKERHUB_SLUG }}:p7zip-amd64 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8
           docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:p7zip --os linux --arch amd64 ${{ env.DOCKERHUB_SLUG }}:p7zip-amd64
           docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:p7zip --os linux --arch arm64 --variant v8 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm64v8
-          docker manifest annotate ${{ env.DOCKERHUB_SLUG }}:p7zip --os linux --arch arm --variant v7 ${{ env.DOCKERHUB_SLUG }}:p7zip-arm32v7
           docker manifest push ${{ env.DOCKERHUB_SLUG }}:p7zip
-          docker manifest create ${{ steps.dh-meta.outputs.tags }} ${{ steps.dh-meta.outputs.tags }}-amd64 ${{ steps.dh-meta.outputs.tags }}-arm64v8 ${{ steps.dh-meta.outputs.tags }}-arm32v7
+          docker manifest create ${{ steps.dh-meta.outputs.tags }} ${{ steps.dh-meta.outputs.tags }}-amd64 ${{ steps.dh-meta.outputs.tags }}-arm64v8
           docker manifest annotate ${{ steps.dh-meta.outputs.tags }} --os linux --arch amd64 ${{ steps.dh-meta.outputs.tags }}-amd64
           docker manifest annotate ${{ steps.dh-meta.outputs.tags }} --os linux --arch arm64 --variant v8 ${{ steps.dh-meta.outputs.tags }}-arm64v8
-          docker manifest annotate ${{ steps.dh-meta.outputs.tags }} --os linux --arch arm --variant v7 ${{ steps.dh-meta.outputs.tags }}-arm32v7
           docker manifest push ${{ steps.dh-meta.outputs.tags }}
           
 
       - name: Create manifest for multi-arch images @ GHCR
         run: |
           docker pull --platform=linux/amd64 ${{ env.GHCR_SLUG }}:unarr-amd64
           docker pull --platform=linux/arm64 ${{ env.GHCR_SLUG }}:unarr-arm64v8
-          docker pull --platform=linux/arm/v7 ${{ env.GHCR_SLUG }}:unarr-arm32v7
           docker pull --platform=linux/amd64 ${{ env.GHCR_SLUG }}:latest-amd64
           docker pull --platform=linux/arm64 ${{ env.GHCR_SLUG }}:latest-arm64v8
-          docker pull --platform=linux/arm/v7 ${{ env.GHCR_SLUG }}:latest-arm32v7
           docker pull --platform=linux/amd64 ${{ env.GHCR_SLUG }}:p7zip-amd64
           docker pull --platform=linux/arm64 ${{ env.GHCR_SLUG }}:p7zip-arm64v8
-          docker pull --platform=linux/arm/v7 ${{ env.GHCR_SLUG }}:p7zip-arm32v7
           docker pull --platform=linux/amd64 ${{ steps.gh-meta.outputs.tags }}-amd64
           docker pull --platform=linux/arm64 ${{ steps.gh-meta.outputs.tags }}-arm64v8
-          docker pull --platform=linux/arm/v7 ${{ steps.gh-meta.outputs.tags }}-arm32v7
-          docker manifest create -a ${{ env.GHCR_SLUG }}:unarr ${{ env.GHCR_SLUG }}:unarr-amd64 ${{ env.GHCR_SLUG }}:unarr-arm64v8 ${{ env.GHCR_SLUG }}:unarr-arm32v7
+          docker manifest create -a ${{ env.GHCR_SLUG }}:unarr ${{ env.GHCR_SLUG }}:unarr-amd64 ${{ env.GHCR_SLUG }}:unarr-arm64v8
           docker manifest annotate ${{ env.GHCR_SLUG }}:unarr --os linux --arch amd64 ${{ env.GHCR_SLUG }}:unarr-amd64
           docker manifest annotate ${{ env.GHCR_SLUG }}:unarr --os linux --arch arm64 --variant v8 ${{ env.GHCR_SLUG }}:unarr-arm64v8
-          docker manifest annotate ${{ env.GHCR_SLUG }}:unarr --os linux --arch arm --variant v7 ${{ env.GHCR_SLUG }}:unarr-arm32v7
           docker manifest push ${{ env.GHCR_SLUG }}:unarr
-          docker manifest create ${{ env.GHCR_SLUG }}:p7zip ${{ env.GHCR_SLUG }}:p7zip-amd64 ${{ env.GHCR_SLUG }}:p7zip-arm64v8 ${{ env.GHCR_SLUG }}:p7zip-arm32v7
+          docker manifest create ${{ env.GHCR_SLUG }}:p7zip ${{ env.GHCR_SLUG }}:p7zip-amd64 ${{ env.GHCR_SLUG }}:p7zip-arm64v8
           docker manifest annotate ${{ env.GHCR_SLUG }}:p7zip --os linux --arch amd64 ${{ env.GHCR_SLUG }}:p7zip-amd64
           docker manifest annotate ${{ env.GHCR_SLUG }}:p7zip --os linux --arch arm64 --variant v8 ${{ env.GHCR_SLUG }}:p7zip-arm64v8
-          docker manifest annotate ${{ env.GHCR_SLUG }}:p7zip --os linux --arch arm --variant v7 ${{ env.GHCR_SLUG }}:p7zip-arm32v7
           docker manifest push ${{ env.GHCR_SLUG }}:p7zip
-          docker manifest create ${{ env.GHCR_SLUG }}:latest ${{ env.GHCR_SLUG }}:latest-amd64 ${{ env.GHCR_SLUG }}:latest-arm64v8 ${{ env.GHCR_SLUG }}:latest-arm32v7
+          docker manifest create ${{ env.GHCR_SLUG }}:latest ${{ env.GHCR_SLUG }}:latest-amd64 ${{ env.GHCR_SLUG }}:latest-arm64v8
           docker manifest annotate ${{ env.GHCR_SLUG }}:latest --os linux --arch amd64 ${{ env.GHCR_SLUG }}:latest-amd64
           docker manifest annotate ${{ env.GHCR_SLUG }}:latest --os linux --arch arm64 --variant v8 ${{ env.GHCR_SLUG }}:latest-arm64v8
-          docker manifest annotate ${{ env.GHCR_SLUG }}:latest --os linux --arch arm --variant v7 ${{ env.GHCR_SLUG }}:latest-arm32v7
           docker manifest push ${{ env.GHCR_SLUG }}:latest
-          docker manifest create ${{ steps.gh-meta.outputs.tags }} ${{ steps.gh-meta.outputs.tags }}-amd64 ${{ steps.gh-meta.outputs.tags }}-arm64v8 ${{ steps.gh-meta.outputs.tags }}-arm32v7
+          docker manifest create ${{ steps.gh-meta.outputs.tags }} ${{ steps.gh-meta.outputs.tags }}-amd64 ${{ steps.gh-meta.outputs.tags }}-arm64v8
           docker manifest annotate ${{ steps.gh-meta.outputs.tags }} --os linux --arch amd64 ${{ steps.gh-meta.outputs.tags }}-amd64
           docker manifest annotate ${{ steps.gh-meta.outputs.tags }} --os linux --arch arm64 --variant v8 ${{ steps.gh-meta.outputs.tags }}-arm64v8
-          docker manifest annotate ${{ steps.gh-meta.outputs.tags }} --os linux --arch arm --variant v7 ${{ steps.gh-meta.outputs.tags }}-arm32v7
           docker manifest push ${{ steps.gh-meta.outputs.tags }} 
diff --git a/README.md b/README.md
@@ -170,6 +170,8 @@ Here are the instructions for updating containers:
 
 ## Versions
 
+* **28.07.23:** - Update YACReader to 9.13.1 and depreciated 32-bit Arm(hf) image.
+
 * **25.04.23:** - Update YACReader to 9.12.0.
 
 * **04.04.23:** - Update YACReader to 9.11.0 and fix CI build process.

diff --git a/p7zip/Dockerfile.armhf b/p7zip/Dockerfile.armhf
diff --git a/unarr/Dockerfile.armhf b/unarr/Dockerfile.armhf