Merge from 4.0release

.github/workflows/test.yml

@@ -129,12 +129,35 @@ jobs:
           docker run --rm --env SRS_BRANCH=$SRS_BRANCH --env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
             srs:cov bash -c 'make utest && ./objs/srs_utest && bash auto/codecov.sh'
 
+  multile-archs:
+    name: actions-test-multile-archs
+    runs-on: ubuntu-20.04
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v2
+
+      # 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@v1
+      # https://github.com/docker/setup-buildx-action
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v1
+
+      - name: Build multiple archs image
+        run: |
+          docker buildx build --platform linux/arm/v7,linux/arm64/v8,linux/amd64 \
+            --output "type=image,push=false" \
+            -f trunk/Dockerfile .
+
   done:
     name: actions-test-done
     needs:
       - build
       - utest
       - coverage
+      - multile-archs
     runs-on: ubuntu-20.04
 
     steps:

README.md

@@ -145,6 +145,7 @@ but some third-party libraries are distributed using their [own licenses](https:
 
 ## Releases
 
+* 2022-06-11, Release [v4.0-r0](https://github.com/ossrs/srs/releases/tag/v4.0-r0), v4.0-r0, 4.0 release0, v4.0.252, 144680 lines.
 * 2022-03-19, Release [v4.0-b10](https://github.com/ossrs/srs/releases/tag/v4.0-b10), v4.0-b10, 4.0 beta10, v4.0.251, 144665 lines.
 * 2022-02-15, Release [v4.0-b9](https://github.com/ossrs/srs/releases/tag/v4.0-b9), v4.0-b9, 4.0 beta9, v4.0.245, 144474 lines.
 * 2022-02-11, Release [v4.0-b8](https://github.com/ossrs/srs/releases/tag/v4.0-b8), v4.0-b8, 4.0 beta8, v4.0.241, 144445 lines.

trunk/Dockerfile

@@ -1,14 +1,22 @@
-FROM ossrs/srs:dev AS build
-
-# Install depends tools.
-RUN yum install -y gcc make gcc-c++ patch unzip perl git
+ARG ARCH
+FROM ${ARCH}ossrs/srs:ubuntu20 AS build
 
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
+ARG JOBS=2
 ARG SRS_AUTO_PACKAGER
+RUN echo "BUILDPLATFORM: $BUILDPLATFORM, TARGETPLATFORM: $TARGETPLATFORM, JOBS: $JOBS, PACKAGER: ${#SRS_AUTO_PACKAGER}"
+
+# https://serverfault.com/questions/949991/how-to-install-tzdata-on-a-ubuntu-docker-image
+ENV DEBIAN_FRONTEND noninteractive
+
+# Install depends tools.
+RUN apt-get update && apt-get install -y gcc make g++ patch unzip perl git
 
 # Build and install SRS.
 COPY . /srs
 WORKDIR /srs/trunk
-RUN ./configure --srt=on --jobs=2 && make -j2 && make install
+RUN ./configure --srt=on --jobs=${JOBS} && make -j${JOBS} && make install
 
 # All config files for SRS.
 RUN cp -R conf /usr/local/srs/conf && \
@@ -22,7 +30,11 @@ RUN cp -R conf /usr/local/srs/conf && \
 ############################################################
 # dist
 ############################################################
-FROM centos:7 AS dist
+FROM ${ARCH}ubuntu:focal AS dist
+
+ARG BUILDPLATFORM
+ARG TARGETPLATFORM
+RUN echo "BUILDPLATFORM: $BUILDPLATFORM, TARGETPLATFORM: $TARGETPLATFORM"
 
 # Expose ports for streaming @see https://github.com/ossrs/srs#ports
 EXPOSE 1935 1985 8080 8000/udp 10080/udp

trunk/doc/CHANGELOG.md

@@ -38,6 +38,7 @@ The changelog for SRS.
 
 ## SRS 4.0 Changelog
 
+* v4.0, 2022-06-11, For [#3058](https://github.com/ossrs/srs/pull/3058): Docker: Support x86_64, armv7 and aarch64 docker image (#3058). v4.0.252
 * v4.0, 2022-03-19, For [#2893](https://github.com/ossrs/srs/pull/2893): SRT: Decouple publish with play url (#2893). v4.0.251
 * v4.0, 2022-03-19, Merge [#2908](https://github.com/ossrs/srs/pull/2908): SRT: url supports multiple QueryStrings (#2908). v4.0.250
 * v4.0, 2022-03-17, SRT: Support debug and run with CLion. v4.0.249

trunk/src/app/srs_app_server.cpp

@@ -294,6 +294,11 @@ srs_error_t SrsSignalManager::start()
     sigemptyset(&sa.sa_mask);
     sa.sa_flags = 0;
     sigaction(SRS_SIGNAL_GRACEFULLY_QUIT, &sa, NULL);
+
+    sa.sa_handler = SrsSignalManager::sig_catcher;
+    sigemptyset(&sa.sa_mask);
+    sa.sa_flags = 0;
+    sigaction(SRS_SIGNAL_ASSERT_ABORT, &sa, NULL);
 
     sa.sa_handler = SrsSignalManager::sig_catcher;
     sigemptyset(&sa.sa_mask);
@@ -981,6 +986,13 @@ srs_error_t SrsServer::cycle()
 
 void SrsServer::on_signal(int signo)
 {
+    // For signal to quit with coredump.
+    if (signo == SRS_SIGNAL_ASSERT_ABORT) {
+        srs_trace("abort with coredump, signo=%d", signo);
+        srs_assert(false);
+        return;
+    }
+
     if (signo == SRS_SIGNAL_RELOAD) {
         srs_trace("reload config, signo=%d", signo);
         signal_reload = true;

trunk/src/core/srs_core_version4.hpp

@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       4
 #define VERSION_MINOR       0
-#define VERSION_REVISION    251
+#define VERSION_REVISION    252
 
 #endif

trunk/src/kernel/srs_kernel_consts.hpp

@@ -125,6 +125,8 @@
 // The signal for srs to gracefully quit, do carefully dispose then exit.
 // @see https://github.com/ossrs/srs/issues/1579
 #define SRS_SIGNAL_GRACEFULLY_QUIT SIGQUIT
+// The signal for SRS to abort by assert(false).
+#define SRS_SIGNAL_ASSERT_ABORT SIGABRT
 
 // The application level signals.
 // Persistence the config in memory to config file.