diff --git a/README.md b/README.md index 32b84ddce4..fb93a06848 100755 --- a/README.md +++ b/README.md @@ -130,6 +130,7 @@ A big THANK YOU goes to: ## Releases +* 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. * 2022-01-03, Release [v4.0-b2](https://github.com/ossrs/srs/releases/tag/v4.0-b2), v4.0-b2, 4.0 beta2, v4.0.215, 144278 lines. * 2021-12-19, Release [v4.0-b1](https://github.com/ossrs/srs/releases/tag/v4.0-b1), v4.0-b1, 4.0 beta1, v4.0.206, 144126 lines. * 2021-12-01, Release [v4.0-b0](https://github.com/ossrs/srs/releases/tag/v4.0-b0), v4.0-b0, 4.0 beta0, v4.0.201, 144022 lines. diff --git a/trunk/Dockerfile b/trunk/Dockerfile index bd37ef08c5..922cf2eedf 100644 --- a/trunk/Dockerfile +++ b/trunk/Dockerfile @@ -3,6 +3,8 @@ FROM ossrs/srs:dev AS build # Install depends tools. RUN yum install -y gcc make gcc-c++ patch unzip perl git +ARG SRS_AUTO_PACKAGER + # Build and install SRS. COPY . /srs WORKDIR /srs/trunk diff --git a/trunk/Dockerfile.pkg b/trunk/Dockerfile.pkg index ca6602ef3b..1fb3d600aa 100644 --- a/trunk/Dockerfile.pkg +++ b/trunk/Dockerfile.pkg @@ -2,6 +2,7 @@ FROM ossrs/srs:dev # version=4.0.145 ARG version +ARG SRS_AUTO_PACKAGER # Install depends tools. RUN yum install -y zip diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 46465c62d5..c45bcf5ea1 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -127,8 +127,8 @@ srs_error_t do_main(int argc, char** argv) srs_trace2(TAG_MAIN, "%s, %s", RTMP_SIG_SRS_SERVER, RTMP_SIG_SRS_LICENSE); srs_trace("authors: %s", RTMP_SIG_SRS_AUTHORS); srs_trace("contributors: %s", SRS_CONSTRIBUTORS); - srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s, osx: %d", - _srs_config->cwd().c_str(), cwd.c_str(), SRS_BUILD_DATE, SRS_USER_CONFIGURE, SRS_UNAME, SRS_OSX_BOOL); + srs_trace("cwd=%s, work_dir=%s, build: %s, configure: %s, uname: %s, osx: %d, pkg: %s", + _srs_config->cwd().c_str(), cwd.c_str(), SRS_BUILD_DATE, SRS_USER_CONFIGURE, SRS_UNAME, SRS_OSX_BOOL, SRS_PACKAGER); srs_trace("configure detail: " SRS_CONFIGURE); #ifdef SRS_EMBEDED_TOOL_CHAIN srs_trace("crossbuild tool chain: " SRS_EMBEDED_TOOL_CHAIN);