Merge branch '4.0release' into merge/develop

.github/workflows/release.yml

@@ -87,9 +87,9 @@ jobs:
       # Aliyun ACR hub
       # TODO: FIXME: If stable, please set the latest from 4.0 to 5.0
       - name: Login Aliyun docker hub
-        uses: aliyun/acr-login@v1
+        uses: docker/login-action@v1
         with:
-          login-server: https://registry.cn-hangzhou.aliyuncs.com
+          registry: registry.cn-hangzhou.aliyuncs.com
           username: "${{ secrets.ACR_USERNAME }}"
           password: "${{ secrets.ACR_PASSWORD }}"
       - name: Push to Aliyun docker hub
@@ -115,6 +115,36 @@ jobs:
           docker tag ossrs/lighthouse:$SRS_TAG registry.cn-hangzhou.aliyuncs.com/ossrs/lighthouse:latest
           docker push --all-tags registry.cn-hangzhou.aliyuncs.com/ossrs/lighthouse
 
+      # Tencent TCR hub
+      - name: Login Tencent docker hub
+        uses: docker/login-action@v1
+        with:
+          registry: ccr.ccs.tencentyun.com
+          username: "${{ secrets.TCR_USERNAME }}"
+          password: "${{ secrets.TCR_PASSWORD }}"
+      - name: Push to Tencent docker hub
+        run: |
+          docker tag ossrs/srs:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/srs:$SRS_TAG
+          docker tag ossrs/srs:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/srs:$SRS_VERSION
+          docker tag ossrs/srs:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/srs:v$SRS_MAJOR
+          docker tag ossrs/srs:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/srs:$SRS_MAJOR
+          docker tag ossrs/srs:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/srs:latest
+          docker push --all-tags ccr.ccs.tencentyun.com/ossrs/srs
+          #
+          docker tag ossrs/droplet:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/droplet:$SRS_TAG
+          docker tag ossrs/droplet:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/droplet:$SRS_VERSION
+          docker tag ossrs/droplet:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/droplet:v$SRS_MAJOR
+          docker tag ossrs/droplet:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/droplet:$SRS_MAJOR
+          docker tag ossrs/droplet:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/droplet:latest
+          docker push --all-tags ccr.ccs.tencentyun.com/ossrs/droplet
+          #
+          docker tag ossrs/lighthouse:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/lighthouse:$SRS_TAG
+          docker tag ossrs/lighthouse:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/lighthouse:$SRS_VERSION
+          docker tag ossrs/lighthouse:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/lighthouse:v$SRS_MAJOR
+          docker tag ossrs/lighthouse:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/lighthouse:$SRS_MAJOR
+          docker tag ossrs/lighthouse:$SRS_TAG ccr.ccs.tencentyun.com/ossrs/lighthouse:latest
+          docker push --all-tags ccr.ccs.tencentyun.com/ossrs/lighthouse
+
       ##################################################################################################################
       ##################################################################################################################
       ##################################################################################################################

README.md

@@ -134,6 +134,7 @@ We are grateful to the community for contributing bugfix and improvements, pleas
 
 ## Releases
 
+* 2022-02-04, Release [v4.0-b6](https://github.com/ossrs/srs/releases/tag/v4.0-b6), v4.0-b6, 4.0 beta6, v4.0.238, 144437 lines.
 * 2022-01-30, Release [v4.0-b5](https://github.com/ossrs/srs/releases/tag/v4.0-b5), v4.0-b5, 4.0 beta5, v4.0.236, 144416 lines.
 * 2022-01-17, Release [v4.0-b4](https://github.com/ossrs/srs/releases/tag/v4.0-b4), v4.0-b4, 4.0 beta4, v4.0.230, 144393 lines.
 * 2022-01-13, Release [v4.0-b3](https://github.com/ossrs/srs/releases/tag/v4.0-b3), v4.0-b3, 4.0 beta3, v4.0.229, 144393 lines.

trunk/doc/CHANGELOG.md

@@ -32,6 +32,7 @@ The changelog for SRS.
 
 ## SRS 4.0 Changelog
 
+* v4.0, 2022-02-04, Push docker to docker, acr and tcr. v4.0.238
 * v4.0, 2022-02-03, Merge [#2888](https://github.com/ossrs/srs/pull/2888): Fix bug when the value of http header is empty. (#2888). v4.0.237
 * v4.0, 2022-01-30, Refine docker console, preview by players at the same server. v4.0.236
 * v4.0, 2022-01-30, For docker, always use the console for logging. v4.0.235

trunk/src/core/srs_core_version4.hpp

@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       4
 #define VERSION_MINOR       0
-#define VERSION_REVISION    237
+#define VERSION_REVISION    238
 
 #endif