chore(docker): change CMD to bin/proxy/startup.sh

Tencent · Jun 11, 2018 · e7ef9cc · e7ef9cc
1 parent 41ddb7a
commit e7ef9cc
Show file tree

Hide file tree

Showing 15 changed files with 13 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,10 @@
 FROM alpine
-RUN apk --update --no-cache add nodejs git && \
-    git clone /~https://github.com/Tencent/TSW.git
-WORKDIR TSW
+RUN apk --update --no-cache add procps git nodejs bash gawk
+RUN git clone /~https://github.com/Tencent/TSW.git /TSW
+WORKDIR /TSW
 VOLUME /data/release/node_modules/
 RUN npm install --no-optional
 EXPOSE 80
-CMD ["node", "--inspect", "index.js"]
+ENV IS_DOCKER=1
+CMD ["/TSW/bin/proxy/startup.sh"]
 
diff --git a/bin/proxy/dump.alpha.sh b/bin/proxy/dump.alpha.sh
diff --git a/bin/proxy/dump.config.sh b/bin/proxy/dump.config.sh
diff --git a/bin/proxy/dump.cpu.sh b/bin/proxy/dump.cpu.sh
diff --git a/bin/proxy/dump.global.sh b/bin/proxy/dump.global.sh
diff --git a/bin/proxy/dump.h5test.sh b/bin/proxy/dump.h5test.sh
diff --git a/bin/proxy/dump.heap.sh b/bin/proxy/dump.heap.sh
diff --git a/bin/proxy/kill.sh b/bin/proxy/kill.sh
diff --git a/bin/proxy/reload.sh b/bin/proxy/reload.sh
diff --git a/bin/proxy/restart.sh b/bin/proxy/restart.sh
diff --git a/bin/proxy/shutdown.sh b/bin/proxy/shutdown.sh
diff --git a/bin/proxy/so.sh b/bin/proxy/so.sh
diff --git a/bin/proxy/startup.sh b/bin/proxy/startup.sh
@@ -41,7 +41,13 @@ echo "args: $CUR_ARGS"
 
 cd ${CUR_DIR}/../
 pwd
-./TSW --expose_internals $CUR_ARGS ./proxy >> ../log/run.log.0 2>&1 &
 
-echo start done
+IS_DOCKER=${IS_DOCKER:=0}
+if [ ${IS_DOCKER} = 1 ]
+then
+    ./TSW --expose_internals $CUR_ARGS ./proxy >> ../log/run.log.0 2>&1
+else
+    ./TSW --expose_internals $CUR_ARGS ./proxy >> ../log/run.log.0 2>&1 &
+    echo start down
+fi
 
diff --git a/bin/proxy/top.sh b/bin/proxy/top.sh
diff --git a/bin/proxy/top100.sh b/bin/proxy/top100.sh