Merge pull request #59 from laincloud/s6

use s6 because of stdout

Author: bibaijin

archon.sh

@@ -3,7 +3,7 @@
 environ=$LAIN_DOMAIN
 
 # specify the client id here
-source ./config
+source /lain/app/config
 
 if [ $console_api_scheme == "https" ]; then
 	ws_scheme="wss";

entry.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # specify the client id, client secret and sso server here
-source ./config
+source /lain/app/config
 
 export SSO_CLIENT_ID=$client_id
 export SSO_CLIENT_SECRET=$client_sec
@@ -18,4 +18,4 @@ export CONSOLE_SENTRY_DSN=$console_sentry_dsn
 export GITLAB_TOKEN=$gitlab_token
 
 mkdir -p /lain/logs
-exec gunicorn -w 3 -b 0.0.0.0:8000 --preload --error-logfile /lain/logs/error.log --access-logfile /lain/logs/access.log console.wsgi 
+exec gunicorn -w 3 -b 0.0.0.0:8000 --preload --error-logfile /lain/logs/error.log --access-logfile /lain/logs/access.log --pythonpath /lain/app console.wsgi

lain.yaml

@@ -1,10 +1,12 @@
 appname: console
 
 build:
-  base: laincloud/centos-lain:20160503
+  base: laincloud/centos-lain:20171212
   prepare:
-    version: "20170612"
+    version: "20171212"
     script:
+      - mkdir -p /root/.pip
+      - cp -f pip.conf /root/.pip/pip.conf
       - yum install -y yum-plugin-ovl
       - yum install -y gcc-c++
       - git clone --depth=1 https://github.com/golang/sys.git $GOPATH/src/golang.org/x/sys
@@ -17,8 +19,6 @@ build:
       - touch /sbin/modprobe && chmod +x /sbin/modprobe
       - pip install -r pip-req.txt
   script:
-    - mkdir -p /root/.pip
-    - cp -f pip.conf /root/.pip/pip.conf
     - cd $(npm root -g)/npm && npm install fs-extra && sed -i -e s/graceful-fs/fs-extra/ -e s/fs\.rename/fs.move/ ./lib/utils/rename.js # fix npm error
     - cd $GOPATH/src/github.com/laincloud/archon && git pull && gobuildweb dist && cp archon-0.1.zip /lain/app/ # note docker may use cache, you should delete the old image
     - unzip -o /lain/app/archon-0.1.zip
@@ -32,15 +32,15 @@ test:
     - CONSOLE_DEBUG=1 py.test  --cov=.
 
 web:
-  cmd: ./archon.sh
+  cmd: /lain/app/archon.sh
   port: 9000
   memory: 256m
   secret_files:
     - config
   secret_files_bypass: True
 
 web.console:
-  cmd: ./entry.sh
+  cmd: /lain/app/entry.sh
   port: 8000
   secret_files:
     - config
@@ -55,4 +55,4 @@ web.console:
     - console_op
 
 notify:
-  slack: "#lain"
+  slack: "#lain"