1.修复ci-html无法正常更新的bug。2.完善node-express

ci-html/run.sh

@@ -2,7 +2,9 @@
 
 while [ true ]
 do
-    git fetch
+    cd $local_repo
+    git fetch origin $repo_branch
+    git reset --hard origin/$repo_branch
     rm -rf /usr/share/nginx/html/*
     cp -r $local_repo/$www_for_repo/* /usr/share/nginx/html
     sleep 5m

node-express/Dockerfile

@@ -3,7 +3,6 @@ FROM registry.cn-hangzhou.aliyuncs.com/kennylee/node:alpine
 MAINTAINER kennylee26 <kennylee26@gmail.com>
 
 RUN mkdir /src
-RUN alias cnpm="npm --registry=https://registry.npm.taobao.org --cache=$HOME/.npm/.cache/cnpm --disturl=https://npm.taobao.org/dist --userconfig=$HOME/.cnpmrc"
 RUN cnpm install express-generator nodemon -g
 
 WORKDIR /src

node-express/README.md

@@ -0,0 +1,5 @@
+# node-express
+
+用来执行express应用的运行环境。
+
+目录和存放可参考 https://github.com/b00giZm/docker-compose-nodejs-examples/tree/master/00-basic-express-generator