From ff93bdd14f6a94a1efa97664cbd5e74bf1a69b05 Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 9 Feb 2022 11:42:02 +0800 Subject: [PATCH] Mirror docker images in TCR Singapore. v4.0.240 --- .github/workflows/release.yml | 36 +++++++++++++++++++++++++--- trunk/doc/CHANGELOG.md | 1 + trunk/src/core/srs_core_version4.hpp | 2 +- 3 files changed, 35 insertions(+), 4 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 67ad47f4fc..0030b358f7 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -113,14 +113,44 @@ 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 + # Tencent TCR Singapore hub + - name: Login Tencent Singapore docker hub + uses: docker/login-action@v1 + with: + registry: sgccr.ccs.tencentyun.com + username: "${{ secrets.TCR_USERNAME }}" + password: "${{ secrets.TCR_PASSWORD }}" + - name: Push to Tencent Singapore docker hub + run: | + docker tag ossrs/srs:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/srs:$SRS_TAG + docker tag ossrs/srs:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/srs:$SRS_VERSION + docker tag ossrs/srs:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/srs:v$SRS_MAJOR + docker tag ossrs/srs:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/srs:$SRS_MAJOR + docker tag ossrs/srs:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/srs:latest + docker push --all-tags sgccr.ccs.tencentyun.com/ossrs/srs + # + docker tag ossrs/droplet:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/droplet:$SRS_TAG + docker tag ossrs/droplet:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/droplet:$SRS_VERSION + docker tag ossrs/droplet:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/droplet:v$SRS_MAJOR + docker tag ossrs/droplet:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/droplet:$SRS_MAJOR + docker tag ossrs/droplet:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/droplet:latest + docker push --all-tags sgccr.ccs.tencentyun.com/ossrs/droplet + # + docker tag ossrs/lighthouse:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/lighthouse:$SRS_TAG + docker tag ossrs/lighthouse:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/lighthouse:$SRS_VERSION + docker tag ossrs/lighthouse:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/lighthouse:v$SRS_MAJOR + docker tag ossrs/lighthouse:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/lighthouse:$SRS_MAJOR + docker tag ossrs/lighthouse:$SRS_TAG sgccr.ccs.tencentyun.com/ossrs/lighthouse:latest + docker push --all-tags sgccr.ccs.tencentyun.com/ossrs/lighthouse + + # Tencent TCR Beijing hub + - name: Login Tencent Beijing 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 + - name: Push to Tencent Beijing 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 diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 1c74e51a97..fa41087f25 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -8,6 +8,7 @@ The changelog for SRS. ## SRS 4.0 Changelog +* v4.0, 2022-02-09, Mirror docker images in TCR Singapore. v4.0.240 * v4.0, 2022-02-08, Refine the error for WebRTC H5 publisher. v4.0.239 * 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 diff --git a/trunk/src/core/srs_core_version4.hpp b/trunk/src/core/srs_core_version4.hpp index fc349fb927..80f29b78ef 100644 --- a/trunk/src/core/srs_core_version4.hpp +++ b/trunk/src/core/srs_core_version4.hpp @@ -9,6 +9,6 @@ #define VERSION_MAJOR 4 #define VERSION_MINOR 0 -#define VERSION_REVISION 239 +#define VERSION_REVISION 240 #endif