Merge pull request #311 from Tencent/maplemiao

feat(docker): do not redirect when single process start and install r…
Tencent · May 9, 2019 · 4f828a3 · 4f828a3
2 parents 08ade90 + fc28436
commit 4f828a3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -2,7 +2,7 @@ FROM node:10
 COPY  . /TSW
 WORKDIR /TSW
 RUN npm install --no-optional
-RUN apt-get update && apt-get install gawk
+RUN apt-get update && apt-get install gawk rsync
 EXPOSE 80
 ENV IS_DOCKER=1
 CMD ["/TSW/bin/proxy/startup.sh"]
diff --git a/bin/proxy/startup.sh b/bin/proxy/startup.sh
@@ -45,7 +45,7 @@ pwd
 IS_DOCKER=${IS_DOCKER:=0}
 if [ ${IS_DOCKER} = 1 ]
 then
-    ./TSW --expose_internals --no-deprecation $CUR_ARGS ./proxy >> ../log/run.log.0 2>&1
+    ./TSW --expose_internals --no-deprecation $CUR_ARGS ./proxy
 else
     ./TSW --expose_internals --no-deprecation $CUR_ARGS ./proxy >> ../log/run.log.0 2>&1 &
     sleep 0.5s

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@tswjs/tsw",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "A Node.js infrastructure which is designed for improving the efficiency of locating problems, providing multiple functions for front-end developers",
   "scripts": {
     "lint": "eslint examples bin test --fix",