diff --git a/Dockerfile b/Dockerfile index 476aa6f03bfdc6962c0b887a1c27bebd5121d25f..b82d381845a01c58eb93f29192635d72ae71c6ab 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,13 +22,16 @@ RUN apk update && apk upgrade \ RUN mkdir /wechaty WORKDIR /wechaty +# npm `chromedriver` not support alpine linux +# https://github.com/giggio/node-chromedriver/issues/70 COPY package.json . -RUN npm --progress=false install > /dev/null \ - && npm --progress=false install -g yarn > /dev/null \ +RUN sed -i '/chromedriver/d' package.json \ + && npm --progress=false install > /dev/null \ && rm -fr /tmp/* COPY . . -RUN npm --progress false link +RUN sed -i '/chromedriver/d' package.json \ + && npm --progress=false link # Loading from node_modules Folders: https://nodejs.org/api/modules.html # If it is not found there, then it moves to the parent directory, and so on, until the root of the file system is reached. diff --git a/package.json b/package.json old mode 100755 new mode 100644 index f23ca09cb0407fdd79216a1576d1876ed20578fc..f772685e435ef3ca6c9b4cb5381e3992bb11a8f0 --- a/package.json +++ b/package.json @@ -125,7 +125,8 @@ "ts-node": "^1.4.1", "tslint": "^3.15.1", "tuling123-client": "0.0.1", - "typescript": "^2.0.3" + "typescript": "^2.0.3", + "yarn": "^0.16.1" }, "files_comment__whitelist_npm_publish": "http://stackoverflow.com/a/8617868/1123955", "files": [ diff --git a/script/docker.sh b/script/docker.sh index 263c9b0498ca1d3b008f8fbebbe019e5085ee68a..b6ef0eb704656f2a26d161f3f5f6546c5df48390 100755 --- a/script/docker.sh +++ b/script/docker.sh @@ -9,9 +9,11 @@ optRm='--rm' [ -n "$CIRCLECI" ] && optRm='--rm=false' if [ "$1" = "build" ] || [ "$1" = "" ]; then + echo docker build "$optRm" -t "$imageName" . exec docker build "$optRm" -t "$imageName" . exit $? fi +echo docker run -ti "$optRm" -v /dev/shm:/dev/shm "$imageName" $@ exec docker run -ti "$optRm" -v /dev/shm:/dev/shm "$imageName" $@ exit $? diff --git a/tsconfig.json b/tsconfig.json index b174b3e7892f01e8f24666d6eb0992682bf07518..ee93a632539b47ae0f3c4ee32b8eaf983e14b574 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -27,5 +27,6 @@ , "example/**/*.ts" , "src/**/*.ts" , "test/**/*.spec.ts" + , "bot/**/*.ts" ] }