edit

src/docker/build/iot/eros/Dockerfile

@@ -13,8 +13,6 @@ ENV NG_NAME=ngrok
 ENV NG_HOME=/usr/local/$NG_NAME
 ENV PATH=$PATH:$NG_HOME/bin
 
-ADD build.sh /
-
 RUN apk add --no-cache --update py-psycopg2 git gcc g++ go git make openssl && \
 	pip3 install --upgrade pip && \
 	pip3 install tornado && \
@@ -29,9 +27,13 @@ RUN apk add --no-cache --update py-psycopg2 git gcc g++ go git make openssl && \
 	git clone http://git.dever.cc:3000/xinnongbaohe/$IOT_NAME.git $IOT_HOME && \
 	rm -R $IOT_HOME/runtime/postgresql && \
 	chmod -R +x $IOT_HOME/*.py && \
-	git clone https://github.com/inconshreveable/ngrok.git --depth=1 $NG_HOME && \
-	sh /build.sh && \
-	apk del gcc g++ git make
+	git clone https://github.com/inconshreveable/ngrok.git --depth=1 $NG_HOME
+	#apk del gcc g++ git make
+
+COPY ngrokroot.crt /usr/local/ngrok/assets/client/tls/ngrokroot.crt
+
+RUN cd $NG_HOME && \
+	GOOS=linux GOARCH=amd64 make release-client
 
 EXPOSE 8090 8091
 

src/docker/build/iot/eros/iot.sh

@@ -21,6 +21,7 @@ start_iot()
     process_start python3 cron.py -m mqtt_sub
     #process_start cron.py -m mqtt_pub
     process_start ngrok -subdomain="f$IOT_FARM" -config="ngrok.cfg" 8091
+    process_start ngrok -subdomain="a$IOT_FARM" -config="ngrok.cfg" 8090
 }
 
 stop_iot()
@@ -56,4 +57,5 @@ monit_iot()
     process_monit python3 cron.py -m timing
     process_monit python3 cron.py -m mqtt_sub
     process_monit ngrok -subdomain="f$IOT_FARM" -config="ngrok.cfg" 8091
+    process_monit ngrok -subdomain="a$IOT_FARM" -config="ngrok.cfg" 8090
 }

src/docker/build/iot/eros/ngrokroot.crt

@@ -0,0 +1,19 @@
+-----BEGIN CERTIFICATE-----
+MIIDBTCCAe2gAwIBAgIJAJA59m3iwz6UMA0GCSqGSIb3DQEBCwUAMBkxFzAVBgNV
+BAMMDm5ncm9rLmRldmVyLmNjMB4XDTE5MTIwNjAyMjMyM1oXDTMzMDgxNDAyMjMy
+M1owGTEXMBUGA1UEAwwObmdyb2suZGV2ZXIuY2MwggEiMA0GCSqGSIb3DQEBAQUA
+A4IBDwAwggEKAoIBAQDuV9OfGxg4v4cH7Kxwn3sRFhtk2DIWew4+YQ/6Mh3NOHHw
+M3E66iwmU2nVfza72JpWDXnzC2isClf0mBdRwH+AaH7iRusQjulNOkXq2kq3NjK+
+++F/XGpi8FLdSTC6Ex6Z3LAnfMhqJh5sqqxgpbmRGugS/MkkWOQYxv1PAHL9OvLw
+CpkMmgz2yHiTPnI8mqda4F7g/XmqqUJbHibdUH9sffWEzfSN2oq9GVfb831nl4iR
+LX5vxHXG51HVnIR2JVdBvG/rI+qc8gNfT7JFoLbkvJVT1zOHBXfqIalk6pDCfWvO
+7MEZ8DoxPLH2JWg00q6ILWe86reUw9huQV2cIgu7AgMBAAGjUDBOMB0GA1UdDgQW
+BBRr/aBWzWq+zeLZuMA0PJUztD79TTAfBgNVHSMEGDAWgBRr/aBWzWq+zeLZuMA0
+PJUztD79TTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBCwUAA4IBAQB6IxZf340G
+JGjWtfoSwoFqHDny91xgin1Q9HFskTSYiEgxJGcs2PFndjFNWMwZI2Z05WbYBxBH
+O59gUHy3vH9HwwkuRBTgoL/8N3swUqKe46uhv9yvU6hxUb5yPSPGJ+CJpBRS3HtM
+VaDKpEEPiymboi19pziVv5g2qn0GhN9A64ktKf31lMUGqWbzAtb53yx5CIHVEHK5
+Plf8NOVuapsXIWSKsoYyXJMrZ2eSfgQ+ovEHBqIdR2Xh68y0zC4Aw0f5vg0shTJl
+d1/ysSgGiqRTWFj04X1xVw4kXrRMHOPW6fgV5T67R86op9ozflR9MqHxW+K69+5u
+M8REotshc7Lw
+-----END CERTIFICATE-----

src/docker/conf/iot.conf

@@ -20,7 +20,7 @@ port = 3001:3000
 image = postgresql
 environment = POSTGRES_PASSWORD=123456
 port = 5432:5432
-alias = psql -U postgres->psql,createdb -h localhost -p 5432 -U postgres xinnongbaohe_zeus->create_xinnongbaohe_zeus,createdb -h localhost -p 5432 -U postgres xinnongbaohe->create_xinnongbaohe
+alias = psql -U postgres->psql,createdb -h localhost -p 5432 -U postgres xinnongbaohe_zeus->create_xinnongbaohe_zeus,createdb -h localhost -p 5432 -U postgres xinnongbaohe_eros->create_xinnongbaohe_eros
 hook.end = pgsql
 
 [xinnongbaohe]
@@ -40,11 +40,11 @@ alias = apidoc
 
 [zeus]
 port = 8087:8087,8088:8088,8089:8089
-command = sh
+command = iot
 
 [eros]
 port = 8081:8081,8090:8090,8091:8091,8092:8092
-command = sh
+command = iot
 
 [ngrok]
 port = 8081:8081,4443:4443