Docker: Refine the main dockerfile. v6.0.54 (#3594)

------

Co-authored-by: Haibo Chen <495810242@qq.com>

.github/workflows/release.yml

@@ -267,7 +267,7 @@ jobs:
           echo "Release ossrs/srs:$SRS_TAG"
           docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
             --output "type=image,push=true" \
-            -t ossrs/srs:$SRS_TAG --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f trunk/Dockerfile .
+            -t ossrs/srs:$SRS_TAG --build-arg SRS_AUTO_PACKAGER=$PACKAGER -f Dockerfile .
       # Docker alias images
       # TODO: FIXME: If stable, please set the latest from 5.0 to 6.0
       - name: Docker alias images for ossrs/srs

.github/workflows/test.yml

@@ -252,7 +252,7 @@ jobs:
             --output "type=image,push=false" \
             --build-arg IMAGE=ossrs/srs:ubuntu20-cache \
             --build-arg INSTALLDEPENDS="NO" \
-            -f trunk/Dockerfile .
+            -f Dockerfile .
     runs-on: ubuntu-20.04
 
   multiple-arch-aarch64:
@@ -273,7 +273,7 @@ jobs:
             --output "type=image,push=false" \
             --build-arg IMAGE=ossrs/srs:ubuntu20-cache \
             --build-arg INSTALLDEPENDS="NO" \
-            -f trunk/Dockerfile .
+            -f Dockerfile .
     runs-on: ubuntu-20.04
 
   multiple-arch-amd64:
@@ -295,7 +295,7 @@ jobs:
           docker buildx build --platform linux/amd64 \
             --output "type=image,push=false" \
             --build-arg IMAGE=ossrs/srs:ubuntu20-cache \
-            -f trunk/Dockerfile .
+            -f Dockerfile .
     runs-on: ubuntu-20.04
 
   fast:

trunk/doc/CHANGELOG.md

@@ -8,6 +8,7 @@ The changelog for SRS.
 
 ## SRS 6.0 Changelog
 
+* v6.0, 2023-06-20, Merge [#3594](https://github.com/ossrs/srs/pull/3594): Docker: Refine the main dockerfile. v6.0.54 (#3592)
 * v6.0, 2023-06-20, Merge [#3592](https://github.com/ossrs/srs/pull/3592): Fix Permission Issue in depend.sh for OpenSSL Compilation. v6.0.53 (#3592)
 * v6.0, 2023-06-20, Merge [#3591](https://github.com/ossrs/srs/pull/3591): Fix crash when process rtcp feedback message. v6.0.52 (#3591)
 * v6.0, 2023-06-15, Merge [#3581](https://github.com/ossrs/srs/pull/3581): WHIP: Add OBS support, ensuring compatibility with a unique SDP. v6.0.51 (#3581)

trunk/doc/Dockers.md

@@ -3,10 +3,14 @@
 About SRS Dockerfile:
 
 * Dockerfile: For release and test.
-* Dockerfile.pkg: For package binary.
-* Dockerfile.builds: For test.
-* Dockerfile.test: For test.
-* Dockerfile.cov: For test and coverage.
+* trunk/Dockerfile.pkg: For package binary.
+* trunk/Dockerfile.builds: For test.
+* trunk/Dockerfile.test: For test.
+* trunk/Dockerfile.cov: For test and coverage.
+
+```bash
+docker build -t srs -f Dockerfile .
+```
 
 ## Dependency Tree
 
@@ -22,18 +26,18 @@ The dependency tree about Dockerfile:
     * [ossrs/srs:ubuntu20](https://github.com/ossrs/dev-docker/tree/ubuntu20)
       * ubuntu:focal
   * ubuntu:focal
-* Dockerfile.test
+* trunk/Dockerfile.test
   * [ossrs/srs:dev-gcc7-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-gcc7-cache)
     * [ossrs/srs:dev-gcc7](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-gcc7)
       * centos:7
-* Dockerfile.cov
+* trunk/Dockerfile.cov
   * [ossrs/srs:dev-gcc7-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-gcc7-cache)
       * [ossrs/srs:dev-gcc7](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-gcc7)
           * centos:7
-* Dockerfile.pkg
+* trunk/Dockerfile.pkg
   * [ossrs/srs:dev](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev)
     * centos:7
-* Dockerfile.builds
+* trunk/Dockerfile.builds
   * [ossrs/srs:dev-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev-cache)
     * [ossrs/srs:dev](https://github.com/ossrs/dev-docker/tree/ossrs/srs:dev)
       * centos:7

trunk/src/core/srs_core_version6.hpp

@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       6
 #define VERSION_MINOR       0
-#define VERSION_REVISION    53
+#define VERSION_REVISION    54
 
 #endif