From d0eca076ef5407d69361225a8a9f74e7bbd4b260 Mon Sep 17 00:00:00 2001
From: "Zhuohuan LI (CARPE DIEM)" <zixia@zixia.net>
Date: Tue, 1 Nov 2016 17:55:57 +0000
Subject: [PATCH] fix tsconfig & chromedriver in Alpine Linux

---
 Dockerfile       | 9 ++++++---
 package.json     | 3 ++-
 script/docker.sh | 2 ++
 tsconfig.json    | 1 +
 4 files changed, 11 insertions(+), 4 deletions(-)
 mode change 100755 => 100644 package.json

diff --git a/Dockerfile b/Dockerfile
index 476aa6f0..b82d3818 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 f23ca09c..f772685e
--- 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 263c9b04..b6ef0eb7 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 b174b3e7..ee93a632 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -27,5 +27,6 @@
      , "example/**/*.ts"
      , "src/**/*.ts"
      , "test/**/*.spec.ts"
+     , "bot/**/*.ts"
   ]
 }
-- 
GitLab