fix: arm build image

OldTyT · Feb 9, 2024 · 0778304 · 0778304
1 parent ca4cf51
commit 0778304
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 35 deletions.
diff --git a/.github/workflows/github-docker.yml b/.github/workflows/github-docker.yml
@@ -52,24 +52,20 @@ jobs:
         run: echo "::set-output name=SHORT_COMMIT_ID::$(git rev-parse --short HEAD)"
       - name: Set arm32v6 platform
         run: docker buildx create --platform linux/arm/v6 --name arm --use
+      - name: Docker Login
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REPOSITORY_URL }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build image
         id: docker-build
         run: >-
           docker buildx build
           --platform linux/arm/v6
-          -t $IMAGE_NAME
           -t $REPOSITORY_URL/$IMAGE_NAME:arm32v6-${{ steps.vars.outputs.SHORT_COMMIT_ID }}
           -t $REPOSITORY_URL/$IMAGE_NAME:arm32v6
-          -f docker/arm32v6/Dockerfile .
-      - name: Docker Login
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REPOSITORY_URL }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Publish Image
-        id: docker-push
-        run: docker push --all-tags $REPOSITORY_URL/$IMAGE_NAME
+          -f docker/arm32v6/Dockerfile --push .
   build_arm32v7:
     name: "[arm32v7] Build & Push"
     runs-on: ubuntu-latest
@@ -84,26 +80,22 @@ jobs:
         run: echo "::set-output name=SHORT_COMMIT_ID::$(git rev-parse --short HEAD)"
       - name: Set arm32v7 platform
         run: docker buildx create --platform linux/arm/v7 --name arm --use
+      - name: Docker Login
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REPOSITORY_URL }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build image
         id: docker-build
         run: >-
           docker buildx build
           --platform linux/arm/v7
-          -t $IMAGE_NAME
           -t $REPOSITORY_URL/$IMAGE_NAME:arm32v7-${{ steps.vars.outputs.SHORT_COMMIT_ID }}
           -t $REPOSITORY_URL/$IMAGE_NAME:arm32v7
-          -f docker/arm32v7/Dockerfile .
-      - name: Docker Login
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REPOSITORY_URL }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Publish Image
-        id: docker-push
-        run: docker push --all-tags $REPOSITORY_URL/$IMAGE_NAME
+          -f docker/arm32v7/Dockerfile --push .
   build_arm64v8:
-    name: "[arm64v7] Build & Push"
+    name: "[arm64v8] Build & Push"
     runs-on: ubuntu-latest
     env:
       REPOSITORY_URL: ghcr.io
@@ -116,21 +108,18 @@ jobs:
         run: echo "::set-output name=SHORT_COMMIT_ID::$(git rev-parse --short HEAD)"
       - name: Set arm64v8 platform
         run: docker buildx create --platform linux/arm64/v8 --name arm --use
+      - name: Docker Login
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REPOSITORY_URL }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build image
         id: docker-build
         run: >-
           docker buildx build
           --platform linux/arm64/v8
-          -t $IMAGE_NAME
           -t $REPOSITORY_URL/$IMAGE_NAME:arm64v8-${{ steps.vars.outputs.SHORT_COMMIT_ID }}
           -t $REPOSITORY_URL/$IMAGE_NAME:arm64v8
-          -f docker/arm64v8/Dockerfile .
-      - name: Docker Login
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REPOSITORY_URL }}
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Publish Image
-        id: docker-push
-        run: docker push --all-tags $REPOSITORY_URL/$IMAGE_NAME
+          -t $REPOSITORY_URL/$IMAGE_NAME:latest
+          -f docker/arm64v8/Dockerfile --push .
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,7 +12,7 @@ services:
       - /data:/mnt/docker/redis/data
 
   frigate-telegram:
-    image: ghcr.io/oldtyt/frigate-telegram
+    image: ghcr.io/oldtyt/frigate-telegram:amd64
     restart: always
     networks: [net]
     environment: