edit

src/docker/build/office/convert/Dockerfile

@@ -6,8 +6,9 @@ ENV DEMETER_HOME=/usr/local/convert
 ENV DEMETER_CONF=env
 ENV PATH=$PATH:$DEMETER_HOME
 
-RUN apk add --no-cache --update git gcc curl gcc g++ python-dev py-gevent py-pip imagemagick imagemagick-dev && \
+RUN apk add --no-cache --update git gcc curl gcc g++ python-dev py-pip imagemagick imagemagick-dev && \
 	pip install --upgrade pip && \
+	pip install gevent==1.2 && \
 	pip install redis && \
 	pip install wand && \
 	pip install -U git+http://git.dever.cc:3000/python/demeter.git && \

src/docker/build/service/consul/consul.sh

@@ -3,7 +3,7 @@ set -e
 
 start_consul()
 {
-	ip=`get_ip 10`
+	ip=`get_ip 10.0.0`
 	if [ "$1" == "server" ]; then
 		process_start consul agent -server -bootstrap-expect 1 -data-dir /root/consul/data -config-dir /root/consul/config -client 0.0.0.0
 	elif [ "$1" == "client" ]; then