Use new cache image name. v6.0.86 (#3815)

--------- Co-authored-by: john <hondaxiao@tencent.com>
ossrs · Oct 8, 2023 · d10e16e · d10e16e
1 parent 411ae5a
commit d10e16e
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 20 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -155,9 +155,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       - name: Cross Build for ARMv7 on Ubuntu16
-        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cross-armv7 .
+        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-armv7 .
       - name: Cross Build for ARMv7 on Ubuntu20
-        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cross-armv7 .
+        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-armv7 .
     runs-on: ubuntu-20.04
 
   build-cross-aarch64:
@@ -168,9 +168,9 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3.3.0
       - name: Cross Build for AARCH64 on Ubuntu16
-        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cross-aarch64 .
+        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu16-cache-cross-aarch64 .
       - name: Cross Build for AARCH64 on Ubuntu20
-        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cross-aarch64 .
+        run: DOCKER_BUILDKIT=1 docker build -f trunk/Dockerfile.builds --target ubuntu20-cache-cross-aarch64 .
     runs-on: ubuntu-20.04
 
   test:

diff --git a/README.md b/README.md
@@ -77,7 +77,7 @@ Would you like additional assistance from us? By becoming a sponsor or backer of
 with the support you need:
 
 * Backer: $5 per month, online text chat support through Discord.
-* Sponsor: $100 per month, online meeting support, 1 meeting per month in 1 hour.
+* Sponsor: $100 per month, online text chat plus online meeting support.
 
 Please visit [OpenCollective](https://opencollective.com/srs-server) to become a backer or sponsor, and send 
 us a direct message on [Discord](https://discord.gg/yZ4BnPmHAd). We are currently providing support to the 

diff --git a/trunk/Dockerfile.builds b/trunk/Dockerfile.builds
@@ -47,19 +47,19 @@ COPY . /srs
 RUN cd /srs/trunk && ./configure --srt=on --gb28181=on --apm=on --h265=on && make
 
 ########################################################
-FROM ossrs/srs:ubuntu16-cross-arm AS ubuntu16-cross-armv7
+FROM ossrs/srs:ubuntu16-cache-cross-arm AS ubuntu16-cache-cross-armv7
 COPY . /srs
 RUN cd /srs/trunk && ./configure --cross-build --cross-prefix=arm-linux-gnueabihf- && make
 
-FROM ossrs/srs:ubuntu16-cross-aarch64 AS ubuntu16-cross-aarch64
+FROM ossrs/srs:ubuntu16-cache-cross-aarch64 AS ubuntu16-cache-cross-aarch64
 COPY . /srs
 RUN cd /srs/trunk && ./configure --cross-build --cross-prefix=aarch64-linux-gnu- && make
 
 ########################################################
-FROM ossrs/srs:ubuntu20-cross-arm AS ubuntu20-cross-armv7
+FROM ossrs/srs:ubuntu20-cache-cross-arm AS ubuntu20-cache-cross-armv7
 COPY . /srs
 RUN cd /srs/trunk && ./configure --cross-build --cross-prefix=arm-linux-gnueabihf- && make
 
-FROM ossrs/srs:ubuntu20-cross-aarch64 AS ubuntu20-cross-aarch64
+FROM ossrs/srs:ubuntu20-cache-cross-aarch64 AS ubuntu20-cache-cross-aarch64
 COPY . /srs
 RUN cd /srs/trunk && ./configure --cross-build --cross-prefix=aarch64-linux-gnu- && make
diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
@@ -203,7 +203,7 @@ Toolchain options:
   --extra-flags=<EFLAGS>    Set EFLAGS as CFLAGS and CXXFLAGS. Also passed to ST as EXTRA_CFLAGS.
 
 Cross Build options:        @see https://ossrs.net/lts/zh-cn/docs/v4/doc/arm#ubuntu-cross-build-srs
-  --cross-build             Enable cross-build, please set bellow Toolchain also. Default: $(value2switch $SRS_CROSS_BUILD)
+  --cross=on|off            Enable cross-build, please set bellow Toolchain also. Default: $(value2switch $SRS_CROSS_BUILD)
   --cpu=<CPU>               Toolchain: Select the minimum required CPU for cross-build. For example: --cpu=24kc
   --arch=<ARCH>             Toolchain: Select architecture for cross-build. For example: --arch=aarch64
   --host=<BUILD>            Toolchain: Cross-compile to build programs to run on HOST. For example: --host=aarch64-linux-gnu
@@ -232,6 +232,7 @@ Experts:
   --generic-linux=on|off    Whether run as generic linux, if not CentOS or Ubuntu. Default: $(value2switch $SRS_GENERIC_LINUX)
 
 Deprecated:
+  --cross-build             Enable cross-build, please set bellow Toolchain also. Default: $(value2switch $SRS_CROSS_BUILD)
   --hds=on|off              Whether build the hds streaming, mux RTMP to F4M/F4V files. Default: $(value2switch $SRS_HDS)
   --osx                     Enable build for OSX/Darwin AppleOS. Deprecated for automatically detecting the OS.
   --x86-64                  Enable build for __x86_64 systems. Deprecated for automatically detecting the OS.
@@ -413,6 +414,7 @@ function parse_user_option() {
         --generic-linux)                SRS_GENERIC_LINUX=$(switch2value $value) ;;
 
         # Alias for --arm, cross build.
+        --cross)                        SRS_CROSS_BUILD=$(switch2value $value) ;;
         --cross-build)                  SRS_CROSS_BUILD=YES         ;;
         --enable-cross-compile)         SRS_CROSS_BUILD=YES         ;;
 
@@ -595,7 +597,7 @@ function apply_detail_options() {
     if [[ $SRS_HLS == NO ]]; then SRS_HLS=YES; echo -e "${YELLOW}[WARN] Always enable HLS.${BLACK}"; fi
     if [[ $SRS_DVR == NO ]]; then SRS_DVR=YES; echo -e "${YELLOW}[WARN] Always enable DVR.${BLACK}"; fi
 
-    if [[ $SRS_SANITIZER == RESERVED ]]; then SRS_SANITIZER == NO; fi
+    if [[ $SRS_SANITIZER == RESERVED ]]; then SRS_SANITIZER=NO; fi
 }
 apply_detail_options
 

diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
@@ -7,6 +7,7 @@ The changelog for SRS.
 <a name="v6-changes"></a>
 
 ## SRS 6.0 Changelog
+* v6.0, 2023-10-08, Merge [#3815](https://github.com/ossrs/srs/pull/3815): Use new cache image name. v6.0.86 (#3815)
 * v6.0, 2023-09-26, Merge [#3811](https://github.com/ossrs/srs/pull/3811): Turn off the related utests H265 option. v6.0.85 (#3811)
 * v6.0, 2023-09-25, Merge [#3810](https://github.com/ossrs/srs/pull/3810): Change dev code for John. v6.0.84 (#3810)
 * v6.0, 2023-09-22, Merge [#3777](https://github.com/ossrs/srs/pull/3777): Compile: Add a __GLIBC__ definition for the pthread_setname_np. v6.0.83 (#3777)
@@ -97,6 +98,7 @@ The changelog for SRS.
 <a name="v5-changes"></a>
 
 ## SRS 5.0 Changelog
+* v5.0, 2023-09-28, Merge [#3816](https://github.com/ossrs/srs/pull/3816): cherry-pick from develop, for srt utest. v5.0.185 (#3816)
 * v5.0, 2023-09-21, Merge [#3806](https://github.com/ossrs/srs/pull/3806): Build: Support sys-ssl for srt. v5.0.184 (#3806)
 * v5.0, 2023-09-21, Merge [#3808](https://github.com/ossrs/srs/pull/3808): Upgrade libsrt to v1.5.3. v5.0.183 (#3808)
 * v5.0, 2023-09-21, Merge [#3404](https://github.com/ossrs/srs/pull/3404): WebRTC: Support WHEP for play. v5.0.182 (#3404)

diff --git a/trunk/doc/Dockers.md b/trunk/doc/Dockers.md
@@ -53,16 +53,16 @@ The dependency tree about Dockerfile:
   * [ossrs/srs:ubuntu20-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache)
       * [ossrs/srs:ubuntu20](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20)
           * ubuntu:focal
-  * [ossrs/srs:ubuntu16-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cross-arm)
+  * [ossrs/srs:ubuntu16-cache-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache-cross-arm)
       * [ossrs/srs:ubuntu16](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16)
           * ubuntu:xenial
-  * [ossrs/srs:ubuntu16-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cross-aarch64)
+  * [ossrs/srs:ubuntu16-cache-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache-cross-aarch64)
       * [ossrs/srs:ubuntu16](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16)
           * ubuntu:xenial
-  * [ossrs/srs:ubuntu20-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cross-arm)
+  * [ossrs/srs:ubuntu20-cache-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache-cross-arm)
       * [ossrs/srs:ubuntu20](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20)
           * ubuntu:focal
-  * [ossrs/srs:ubuntu20-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cross-aarch64)
+  * [ossrs/srs:ubuntu20-cache-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache-cross-aarch64)
       * [ossrs/srs:ubuntu20](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20)
           * ubuntu:focal
 
@@ -77,10 +77,10 @@ If need to reconfigure SRS, please update SRS, then update the images:
 * [ossrs/srs:ubuntu16-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache)
 * [ossrs/srs:ubuntu18-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu18-cache)
 * [ossrs/srs:ubuntu20-cache](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache)
-* [ossrs/srs:ubuntu16-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cross-arm)
-* [ossrs/srs:ubuntu16-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cross-aarch64)
-* [ossrs/srs:ubuntu20-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cross-arm)
-* [ossrs/srs:ubuntu20-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cross-aarch64)
+* [ossrs/srs:ubuntu16-cache-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache-cross-arm)
+* [ossrs/srs:ubuntu16-cache-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu16-cache-cross-aarch64)
+* [ossrs/srs:ubuntu20-cache-cross-arm](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache-cross-arm)
+* [ossrs/srs:ubuntu20-cache-cross-aarch64](https://github.com/ossrs/dev-docker/tree/ossrs/srs:ubuntu20-cache-cross-aarch64)
 
 For example, update the [release.yml](https://github.com/ossrs/dev-docker/blob/ubuntu20-cache/.github/workflows/release.yml) for ubuntu20-cache:
 

diff --git a/trunk/src/core/srs_core_version6.hpp b/trunk/src/core/srs_core_version6.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       6
 #define VERSION_MINOR       0
-#define VERSION_REVISION    85
+#define VERSION_REVISION    86
 
 #endif