Skip to content

Commit c3744b6

Browse files
authored
Merge pull request #321 from Tencent/dev
Dev 2 master
2 parents 9c73b2a + 4f828a3 commit c3744b6

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ FROM node:10
22
COPY . /TSW
33
WORKDIR /TSW
44
RUN npm install --no-optional
5-
RUN apt-get update && apt-get install gawk
5+
RUN apt-get update && apt-get install gawk rsync
66
EXPOSE 80
77
ENV IS_DOCKER=1
88
CMD ["/TSW/bin/proxy/startup.sh"]

bin/proxy/startup.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ pwd
4545
IS_DOCKER=${IS_DOCKER:=0}
4646
if [ ${IS_DOCKER} = 1 ]
4747
then
48-
./TSW --expose_internals --no-deprecation $CUR_ARGS ./proxy >> ../log/run.log.0 2>&1
48+
./TSW --expose_internals --no-deprecation $CUR_ARGS ./proxy
4949
else
5050
./TSW --expose_internals --no-deprecation $CUR_ARGS ./proxy >> ../log/run.log.0 2>&1 &
5151
sleep 0.5s

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@tswjs/tsw",
3-
"version": "1.3.0",
3+
"version": "1.4.0",
44
"description": "A Node.js infrastructure which is designed for improving the efficiency of locating problems, providing multiple functions for front-end developers",
55
"scripts": {
66
"lint": "eslint examples bin test --fix",

0 commit comments

Comments
 (0)