Remove FFmpeg4 support, for libsrt 1.5.3 does not support it.

ossrs · Jun 19, 2024 · 0e1a230 · 0e1a230
1 parent 26be8e4
commit 0e1a230
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 108 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -21,10 +21,9 @@ jobs:
             base: 'Dockerfile.base'
             base2:  ['Dockerfile.base', 'Dockerfile.base2']
             base3:  ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3']
-            base4:  ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base4']
             base50: ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base50']
             base51: ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base51']
-            base999999:  ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base4', 'Dockerfile.base50', 'Dockerfile.base51', 'Dockerfile.base999999']
+            base999999:  ['Dockerfile.base', 'Dockerfile.base2', 'Dockerfile.base3', 'Dockerfile.base50', 'Dockerfile.base51', 'Dockerfile.base999999']
       ################################################################
       # The github.ref is, for example, refs/tags/v5.0.145 or refs/tags/v5.0-r8
       # Generate variables like:
@@ -40,7 +39,6 @@ jobs:
       base: ${{ steps.filter.outputs.base }}
       base2: ${{ steps.filter.outputs.base2 }}
       base3: ${{ steps.filter.outputs.base3 }}
-      base4: ${{ steps.filter.outputs.base4 }}
       base50: ${{ steps.filter.outputs.base50 }}
       base51: ${{ steps.filter.outputs.base51 }}
       base999999: ${{ steps.filter.outputs.base999999 }}
@@ -190,54 +188,6 @@ jobs:
             registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_TAG }}-base3
     runs-on: ubuntu-20.04
 
-  docker-base4:
-    needs:
-      - docker-base3
-      - envs
-    if: ${{ always() && needs.envs.outputs.base4 == 'true' }}
-    steps:
-      ################################################################
-      - name: Covert output to env
-        run: |
-          echo "SRS_TAG=${{ needs.envs.outputs.SRS_TAG }}" >> $GITHUB_ENV
-      ################################################################
-      - name: Checkout repository
-        uses: actions/checkout@v3
-      ################################################################
-      # See https://github.com/crazy-max/ghaction-docker-buildx#moved-to-docker-organization
-      # https://github.com/docker/setup-qemu-action
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v2
-      # https://github.com/docker/setup-buildx-action
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v2
-      ################################################################
-      - name: Login docker hub
-        uses: docker/login-action@v2
-        with:
-          username: "${{ secrets.DOCKER_USERNAME }}"
-          password: "${{ secrets.DOCKER_PASSWORD }}"
-      - name: Build and push to docker registry
-        run: |
-          docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
-            --output "type=image,push=true" \
-            -t ossrs/srs:${SRS_TAG}-base4 \
-            -f Dockerfile.base4 .
-      ################################################################
-      - name: Login aliyun hub
-        uses: docker/login-action@v2
-        with:
-          registry: registry.cn-hangzhou.aliyuncs.com
-          username: "${{ secrets.ACR_USERNAME }}"
-          password: "${{ secrets.ACR_PASSWORD }}"
-      - name: Copy to Aliyun registry
-        uses: akhilerm/[email protected]
-        with:
-          src: ossrs/srs:${{ env.SRS_TAG }}-base4
-          dst: |
-            registry.cn-hangzhou.aliyuncs.com/ossrs/srs:${{ env.SRS_TAG }}-base4
-    runs-on: ubuntu-20.04
-
   docker-base50:
     needs:
       - docker-base3
@@ -336,7 +286,6 @@ jobs:
 
   docker-base999999:
     needs:
-      - docker-base4
       - docker-base50
       - docker-base51
       - envs

diff --git a/Dockerfile.base4 b/Dockerfile.base4
diff --git a/Dockerfile.base50 b/Dockerfile.base50
@@ -58,3 +58,4 @@ RUN cp /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg5 && \
     cp /usr/local/bin/ffprobe /usr/local/bin/ffprobe5
 RUN ls -lh /usr/local/bin/*
 
+
diff --git a/Dockerfile.base51 b/Dockerfile.base51
@@ -61,3 +61,4 @@ RUN cp /usr/local/bin/ffmpeg /usr/local/bin/ffmpeg5-hevc-over-rtmp && \
     cp /usr/local/bin/ffprobe /usr/local/bin/ffprobe5-hevc-over-rtmp
 RUN ls -lh /usr/local/bin/*
 
+
diff --git a/Dockerfile.base999999 b/Dockerfile.base999999
@@ -4,7 +4,6 @@ ARG ARCH
 #--------------------------build-----------------------------------------------------
 #------------------------------------------------------------------------------------
 # http://releases.ubuntu.com/focal/
-FROM ${ARCH}ossrs/srs:ubuntu20-base4 as build4
 FROM ${ARCH}ossrs/srs:ubuntu20-base50 as build50
 FROM ${ARCH}ossrs/srs:ubuntu20-base51 as build51
 
@@ -28,7 +27,6 @@ ADD Roboto-Regular.ttf NotoSansSC-Regular.ttf /usr/local/share/fonts/
 
 # Copy all FFmpeg versions and cmake and other tools in /usr/local.
 COPY --from=build51 /usr/local /usr/local
-COPY --from=build4 /usr/local/bin/ffmpeg4 /usr/local/bin/ffprobe4 /usr/local/bin/
 COPY --from=build50 /usr/local/bin/ffmpeg5 /usr/local/bin/ffprobe5 /usr/local/bin/
 
 # Note that for armv7, the ffmpeg5-hevc-over-rtmp is actually ffmpeg5.