Fix #3328: Docker: Avoiding duplicated copy files. v5.0.114

ossrs · Dec 24, 2022 · eb75e37 · eb75e37
1 parent 6f3d6b9
commit eb75e37
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/trunk/Dockerfile b/trunk/Dockerfile
@@ -23,17 +23,9 @@ WORKDIR /srs/trunk
 
 # Build and install SRS.
 # Note that SRT is enabled by default, so we configure without --srt=on.
+# Note that we have copied all files by make install.
 RUN ./configure --gb28181=on --sanitizer-static=on && make && make install
 
-# All config files for SRS.
-RUN cp -R conf /usr/local/srs/conf && \
-    cp research/api-server/static-dir/index.html /usr/local/srs/objs/nginx/html/ && \
-    cp research/api-server/static-dir/favicon.ico /usr/local/srs/objs/nginx/html/ && \
-    cp research/players/crossdomain.xml /usr/local/srs/objs/nginx/html/ && \
-    cp -R research/console /usr/local/srs/objs/nginx/html/ && \
-    cp -R research/players /usr/local/srs/objs/nginx/html/ && \
-    cp -R 3rdparty/signaling/www/demos /usr/local/srs/objs/nginx/html/
-
 ############################################################
 # dist
 ############################################################

diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md
@@ -8,8 +8,9 @@ The changelog for SRS.
 
 ## SRS 5.0 Changelog
 
-* v5.0, 2022-12-18, Merge [#3324](https://github.com/ossrs/srs/pull/3324): Asan: Support parse asan symbol backtrace log. v5.0.114
-* v5.0, 2022-12-20, Merge [#3321](https://github.com/ossrs/srs/pull/3321): GB: Refine lazy object GC. v5.0.113
+* v5.0, 2022-12-24, Fix [#3328](https://github.com/ossrs/srs/issues/3328): Docker: Avoiding duplicated copy files. v5.0.115
+* v5.0, 2022-12-20, Merge [#3321](https://github.com/ossrs/srs/pull/3321): GB: Refine lazy object GC. v5.0.114
+* v5.0, 2022-12-18, Merge [#3324](https://github.com/ossrs/srs/pull/3324): Asan: Support parse asan symbol backtrace log. v5.0.113
 * v5.0, 2022-12-17, Merge [#3323](https://github.com/ossrs/srs/pull/3323): SRT: Fix srt to rtmp crash when sps or pps empty. v5.0.112
 * v5.0, 2022-12-15, For [#3300](https://github.com/ossrs/srs/issues/3300): GB28181: Fix memory overlap for small packets. v5.0.111
 * v5.0, 2022-12-14, For [#939](https://github.com/ossrs/srs/issues/939): FLV: Support set default has_av and disable guessing. v5.0.110

diff --git a/trunk/src/core/srs_core_version5.hpp b/trunk/src/core/srs_core_version5.hpp
@@ -9,6 +9,6 @@
 
 #define VERSION_MAJOR       5
 #define VERSION_MINOR       0
-#define VERSION_REVISION    114
+#define VERSION_REVISION    115
 
 #endif