Merge branch 'master' of bitbucket.org:ikflowdat/installer

docker-compose.yml

@@ -1,11 +1,13 @@
-version: "2.0"
+version: "2"
 services:
   base:
     image: fd3-base
     build:
       context: ./base
     links:
-      - mysql:db
+      - mysql:mysql
+      - amqp:amqp
+ 
     environment:
       VIRTUAL_HOST: base.fd3.flowdat.com
       HOST_FTTH: ftth.fd3.flowdat.com
@@ -20,32 +22,31 @@ services:
     build:
       context: ./ftth
     links:
-      - mysql:db
+      - mysql:mysql
       - base:base
       - amqp:amqp
     environment:
       VIRTUAL_HOST: ftth.fd3.flowdat.com
-
       HOST_FTTH: ftth.fd3.flowdat.com
       HOST_BASE: base.fd3.flowdat.com
-
-      OAUTH_CLIENT_ID: "1_4gs3n2b9s7mso00kgogoks4k0ogk0ggs0w0k4k484gkowcg08k"
-      OAUTH_CLIENT_SECRET: 60n93pmoh10c848wg0sc0844ow84sco0sc8gkockow4sg4sc0g
+      OAUTH_CLIENT_ID: 3_2l74ij36dm4gckg80cwokkscgog0kkcwwk4c0wko0sk848oosk
+      OAUTH_CLIENT_SECRET: 3b5nctcr5sqo4ockggssko4o00wcok8w8wkgo8wcoc088wgccg
 
     volumes: 
       - ./ftth/:/opt/ftth/
  
   mysql:
     environment:
-      MYSQL_ROOT_PASSWORD: 235r2342gtfsw
+        MYSQL_ROOT_PASSWORD: 235r2342gtfsw
+        MYSQL_USER: iksop
+        MYSQL_PASSWORD: 235r2342gtfsw
     volumes: 
       - ./mysql/:/var/lib/mysql/
-    labels:
-      io.rancher.service.hash: ff5c1be5e84f2419adf14e165573a7c76c6d58fb
-    image: mysql:latest
+    image: mysql:5.7
 
   amqp:
     image: rabbitmq
+    restart: always
 
   nginx-proxy:
     image: jwilder/nginx-proxy