From ae185f33f73ebfd150c5c96b2341f540e7961ce6 Mon Sep 17 00:00:00 2001
From: deadprogram <ron@hybridgroup.com>
Date: Tue, 22 Oct 2024 02:01:41 +0200
Subject: [PATCH] build: just build opencv-ffmpeg-gstreamer since the
 dependencies exist already

Signed-off-by: deadprogram <ron@hybridgroup.com>
---
 .github/workflows/docker-alpine-improved.yml | 103 +++++++++----------
 1 file changed, 51 insertions(+), 52 deletions(-)

diff --git a/.github/workflows/docker-alpine-improved.yml b/.github/workflows/docker-alpine-improved.yml
index 5ce65ded..131d3917 100644
--- a/.github/workflows/docker-alpine-improved.yml
+++ b/.github/workflows/docker-alpine-improved.yml
@@ -10,53 +10,53 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  gstreamer:
-    name: gstreamer
-    runs-on: ubuntu-latest
-    permissions:
-      packages: write
-      contents: read
-    steps:
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-      - name: Check out the repo
-        uses: actions/checkout@v4
-      - name: Docker meta
-        id: meta
-        uses: docker/metadata-action@v5
-        with:
-          images: |
-            gocv/gstreamer:1.24-alpine
-            ghcr.io/${{ github.repository_owner }}/gstreamer:1.24-alpine
-          tags: |
-            type=sha,format=long
-            type=raw,value=latest
-      - name: Log in to Docker Hub
-        uses: docker/login-action@v3
-        with:
-          username: ${{ secrets.DOCKER_HUB_USERNAME }}
-          password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
-      - name: Log in to Github Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ghcr.io
-          username: ${{ github.actor }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          file: Dockerfile.gstreamer-static-alpine
-          platforms: linux/amd64,linux/arm64
-          context: .
-          push: true
-          tags: |
-            gocv/gstreamer:1.24-alpine
-            ghcr.io/${{ github.repository_owner }}/gstreamer:1.24-alpine
-          labels: ${{ steps.meta.outputs.labels }}
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
+  # gstreamer:
+  #   name: gstreamer
+  #   runs-on: ubuntu-latest
+  #   permissions:
+  #     packages: write
+  #     contents: read
+  #   steps:
+  #     - name: Set up QEMU
+  #       uses: docker/setup-qemu-action@v3
+  #     - name: Set up Docker Buildx
+  #       uses: docker/setup-buildx-action@v3
+  #     - name: Check out the repo
+  #       uses: actions/checkout@v4
+  #     - name: Docker meta
+  #       id: meta
+  #       uses: docker/metadata-action@v5
+  #       with:
+  #         images: |
+  #           gocv/gstreamer:1.24-alpine
+  #           ghcr.io/${{ github.repository_owner }}/gstreamer:1.24-alpine
+  #         tags: |
+  #           type=sha,format=long
+  #           type=raw,value=latest
+  #     - name: Log in to Docker Hub
+  #       uses: docker/login-action@v3
+  #       with:
+  #         username: ${{ secrets.DOCKER_HUB_USERNAME }}
+  #         password: ${{ secrets.DOCKER_HUB_ACCESS_TOKEN }}
+  #     - name: Log in to Github Container Registry
+  #       uses: docker/login-action@v3
+  #       with:
+  #         registry: ghcr.io
+  #         username: ${{ github.actor }}
+  #         password: ${{ secrets.GITHUB_TOKEN }}
+  #     - name: Build and push
+  #       uses: docker/build-push-action@v6
+  #       with:
+  #         file: Dockerfile.gstreamer-static-alpine
+  #         platforms: linux/amd64,linux/arm64
+  #         context: .
+  #         push: true
+  #         tags: |
+  #           gocv/gstreamer:1.24-alpine
+  #           ghcr.io/${{ github.repository_owner }}/gstreamer:1.24-alpine
+  #         labels: ${{ steps.meta.outputs.labels }}
+  #         cache-from: type=gha
+  #         cache-to: type=gha,mode=max
 
   # ffmpeg:
   #   name: ffmpeg
@@ -109,7 +109,6 @@ jobs:
   opencv:
     name: opencv
     runs-on: ubuntu-latest
-    needs: [gstreamer]
     permissions:
       packages: write
       contents: read
@@ -125,8 +124,8 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            gocv/opencv:4.10.0-alpine
-            ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-alpine
+            gocv/opencv:4.10.0-alpine-ffmpeg-gstreamer
+            ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-alpine-ffmpeg-gstreamer
           tags: |
             type=sha,format=long
             type=raw,value=latest
@@ -149,8 +148,8 @@ jobs:
           context: .
           push: true
           tags: |
-            gocv/opencv:4.10.0-alpine
-            ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-alpine
+            gocv/opencv:4.10.0-alpine-ffmpeg-gstreamer
+            ghcr.io/${{ github.repository_owner }}/opencv:4.10.0-alpine-ffmpeg-gstreamer
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max