edit

src/docker/build/iot/demeter/Dockerfile

@@ -13,7 +13,7 @@ RUN apk add --no-cache --update py-gevent py-psycopg2 git && \
 	pip install influxdb && \
 	pip install short_url && \
 	#pip install hashlib && \
-	git clone http://git.shemic.com:3000/atom/demeter.git $DEMETER_HOME && \
+	git clone http://git.dever.cc:3000/atom/demeter.git $DEMETER_HOME && \
 	chmod -R 777 $DEMETER_HOME/* && \
 	rm -rf $DEMETER_HOME/runtime/postgresql/*
 

src/docker/build/iot/nongxiaohe/Dockerfile

@@ -3,6 +3,7 @@ FROM docker.shemic.com/dev/python:latest
 MAINTAINER Rabin "https://github.com/shemic"
 
 ENV DEMETER_HOME=/usr/local/demeter
+ENV DEMETER_LIB=/usr/lib/python2.7/site-packages/demeter
 ENV DEMETER_CONF=env
 ENV PATH=$PATH:$DEMETER_HOME
 
@@ -12,11 +13,14 @@ RUN apk add --no-cache --update py-gevent py-psycopg2 git && \
 	pip install paho-mqtt && \
 	pip install influxdb && \
 	pip install short_url && \
-	#pip install hashlib && \
-	git clone http://git.shemic.com:3000/atom/nongxiaohe.git $DEMETER_HOME && \
-	chmod -R 777 $DEMETER_HOME/* && \
-	rm -rf $DEMETER_HOME/runtime/postgresql/*
+	pip install oss2 --upgrade && \
+	#pip install qrcode && \
+	git clone http://git.dever.cc:3000/python/demeter.git $DEMETER_LIB && \
+	git clone http://git.dever.cc:3000/python/nongxiaohe.git $DEMETER_HOME && \
+	#mkdir -p /etc/supervisor/conf.d/ && \
+	chmod -R +x $DEMETER_HOME/*.py
 
 EXPOSE 8087 8088
 
-COPY demeter.sh /entrypoint/demeter.sh
+COPY demeter.sh /entrypoint/demeter.sh
+#COPY supervisor/ /etc/supervisor/

src/docker/build/iot/nongxiaohe/demeter.sh

@@ -2,18 +2,31 @@
 set -e
 start_demeter()
 {
-    install.py
+    cd $DEMETER_LIB
+    git pull
     cd $DEMETER_HOME
+    git reset --hard FETCH_HEAD
     git pull
+    chmod -R +x $DEMETER_HOME/*.py
+    install.py
     process_start admin.py
+    process_start front.py
+    process_start sub.py
+    process_start cron.py
 }
 
 stop_demeter()
 {
 	process_stop admin.py
+    process_stop front.py
+    process_stop sub.py
+    process_stop cron.py
 }
 
 monit_demeter()
 {
     process_monit admin.py
+    process_monit front.py
+    process_monit sub.py
+    process_monit cron.py
 }

src/docker/build/iot/xinnongbaohe/Dockerfile

@@ -15,8 +15,8 @@ RUN apk add --no-cache --update py-gevent py-psycopg2 git && \
 	pip install short_url && \
 	pip install oss2 --upgrade && \
 	#pip install qrcode && \
-	git clone http://git.shemic.com:3000/atom/demeter.git $DEMETER_LIB && \
-	git clone http://git.shemic.com:3000/atom/xinnongbaohe.git $DEMETER_HOME && \
+	git clone http://git.dever.cc:3000/python/demeter.git $DEMETER_LIB && \
+	git clone http://git.dever.cc:3000/python/xinnongbaohe.git $DEMETER_HOME && \
 	#mkdir -p /etc/supervisor/conf.d/ && \
 	chmod -R +x $DEMETER_HOME/*.py
 

src/docker/build/iot/xinnongbaohe/demeter.sh

@@ -6,7 +6,7 @@ start_demeter()
     cd $DEMETER_LIB
     git pull
     cd $DEMETER_HOME
-    git reset --hard
+    git reset --hard FETCH_HEAD
     git pull
     chmod -R +x $DEMETER_HOME/*.py
     install.py