compose fixes

odidev · Mar 13, 2016 · d83333b · d83333b
1 parent b4de7f3
commit d83333b
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 63 deletions.
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -1,82 +1,52 @@
 version: '2'
 services:
   config:
-    environment:
-      CONFIG_SERVICE_PASSWORD: dev-password
     build: config
     ports:
       - 8888:8888
 
   registry:
-    environment:
-      CONFIG_SERVICE_PASSWORD: dev-password
     build: registry
-    ports:
-      - 8761:8761
 
   gateway:
-    environment:
-      CONFIG_SERVICE_PASSWORD: dev-password
     build: gateway
 
   auth-service:
-    environment:
-      CONFIG_SERVICE_PASSWORD: dev-password
-      NOTIFICATION_SERVICE_PASSWORD: dev-password
-      STATISTICS_SERVICE_PASSWORD: dev-password
-      ACCOUNT_SERVICE_PASSWORD: dev-password
-      MONGODB_PASSWORD: dev-password
     build: auth-service
     ports:
       - 5000:5000
 
   auth-mongodb:
-    environment:
-      MONGODB_PASSWORD: dev-password
+    build: mongodb
     ports:
       - 25000:27017
 
   account-service:
-    environment:
-      CONFIG_SERVICE_PASSWORD: dev-password
-      MONGODB_PASSWORD: dev-password
-      ACCOUNT_SERVICE_PASSWORD: dev-password
     build: account-service
     ports:
       - 6000:6000
 
   account-mongodb:
-    environment:
-      MONGODB_PASSWORD: dev-password
+    build: mongodb
     ports:
       - 26000:27017
 
   statistics-service:
-    environment:
-      CONFIG_SERVICE_PASSWORD: dev-password
-      MONGODB_PASSWORD: dev-password
-      STATISTICS_SERVICE_PASSWORD: dev-password
     build: statistics-service
     ports:
       - 7000:7000
 
   statistics-mongodb:
-    environment:
-      MONGODB_PASSWORD: dev-password
+    build: mongodb
     ports:
       - 27000:27017
 
   notification-service:
-    environment:
-      CONFIG_SERVICE_PASSWORD: dev-password
-      MONGODB_PASSWORD: dev-password
-      NOTIFICATION_SERVICE_PASSWORD: dev-password
     build: notification-service
     ports:
       - 8000:8000
 
   notification-mongodb:
-    environment:
-      MONGODB_PASSWORD: dev-password
+    build: mongodb
     ports:
       - 28000:27017
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -2,7 +2,7 @@ version: '2'
 services:
   config:
     environment:
-      CONFIG_SERVICE_PASSWORD:
+      CONFIG_SERVICE_PASSWORD: $CONFIG_SERVICE_PASSWORD
     image: sqshq/piggymetrics-config
     restart: always
     logging:
@@ -12,17 +12,19 @@ services:
 
   registry:
     environment:
-      CONFIG_SERVICE_PASSWORD:
+      CONFIG_SERVICE_PASSWORD: $CONFIG_SERVICE_PASSWORD
     image: sqshq/piggymetrics-registry
     restart: always
+    ports:
+      - 8761:8761
     logging:
       options:
         max-size: "10m"
         max-file: "10"
 
   gateway:
     environment:
-      CONFIG_SERVICE_PASSWORD:
+      CONFIG_SERVICE_PASSWORD: $CONFIG_SERVICE_PASSWORD
     image: sqshq/piggymetrics-gateway
     restart: always
     ports:
@@ -34,11 +36,11 @@ services:
 
   auth-service:
     environment:
-      CONFIG_SERVICE_PASSWORD:
-      NOTIFICATION_SERVICE_PASSWORD:
-      STATISTICS_SERVICE_PASSWORD:
-      ACCOUNT_SERVICE_PASSWORD:
-      MONGODB_PASSWORD:
+      CONFIG_SERVICE_PASSWORD: $CONFIG_SERVICE_PASSWORD
+      NOTIFICATION_SERVICE_PASSWORD: $NOTIFICATION_SERVICE_PASSWORD
+      STATISTICS_SERVICE_PASSWORD: $STATISTICS_SERVICE_PASSWORD
+      ACCOUNT_SERVICE_PASSWORD: $ACCOUNT_SERVICE_PASSWORD
+      MONGODB_PASSWORD: $MONGODB_PASSWORD
     image: sqshq/piggymetrics-auth-service
     restart: always
     logging:
@@ -48,9 +50,8 @@ services:
 
   auth-mongodb:
     environment:
-      MONGODB_PASSWORD:
-    build: mongodb
-    image: sqshq/piggymetrics-auth-mongodb
+      MONGODB_PASSWORD: $MONGODB_PASSWORD
+    image: sqshq/piggymetrics-mongodb
     restart: always
     logging:
       options:
@@ -59,9 +60,9 @@ services:
 
   account-service:
     environment:
-      CONFIG_SERVICE_PASSWORD:
-      ACCOUNT_SERVICE_PASSWORD:
-      MONGODB_PASSWORD:
+      CONFIG_SERVICE_PASSWORD: $CONFIG_SERVICE_PASSWORD
+      ACCOUNT_SERVICE_PASSWORD: $ACCOUNT_SERVICE_PASSWORD
+      MONGODB_PASSWORD: $MONGODB_PASSWORD
     image: sqshq/piggymetrics-account-service
     restart: always
     logging:
@@ -72,9 +73,8 @@ services:
   account-mongodb:
     environment:
       INIT_DUMP: account-service-dump.js
-      MONGODB_PASSWORD:
-    build: mongodb
-    image: sqshq/piggymetrics-account-mongodb
+      MONGODB_PASSWORD: $MONGODB_PASSWORD
+    image: sqshq/piggymetrics-mongodb
     restart: always
     logging:
       options:
@@ -83,9 +83,9 @@ services:
 
   statistics-service:
     environment:
-      CONFIG_SERVICE_PASSWORD:
-      STATISTICS_SERVICE_PASSWORD:
-      MONGODB_PASSWORD:
+      CONFIG_SERVICE_PASSWORD: $CONFIG_SERVICE_PASSWORD
+      MONGODB_PASSWORD: $MONGODB_PASSWORD
+      STATISTICS_SERVICE_PASSWORD: $STATISTICS_SERVICE_PASSWORD
     image: sqshq/piggymetrics-statistics-service
     restart: always
     logging:
@@ -95,9 +95,8 @@ services:
 
   statistics-mongodb:
     environment:
-      MONGODB_PASSWORD:
-    build: mongodb
-    image: sqshq/piggymetrics-statistics-mongodb
+      MONGODB_PASSWORD: ${MONGODB_PASSWORD}
+    image: sqshq/piggymetrics-mongodb
     restart: always
     logging:
       options:
@@ -106,9 +105,9 @@ services:
 
   notification-service:
     environment:
-      CONFIG_SERVICE_PASSWORD:
-      STATISTICS_SERVICE_PASSWORD:
-      MONGODB_PASSWORD:
+      CONFIG_SERVICE_PASSWORD: $CONFIG_SERVICE_PASSWORD
+      MONGODB_PASSWORD: $MONGODB_PASSWORD
+      NOTIFICATION_SERVICE_PASSWORD: $NOTIFICATION_SERVICE_PASSWORD
     image: sqshq/piggymetrics-notification-service
     restart: always
     logging:
@@ -117,11 +116,10 @@ services:
         max-file: "10"
 
   notification-mongodb:
-    build: mongodb
-    image: sqshq/piggymetrics-notification-mongodb
+    image: sqshq/piggymetrics-mongodb
     restart: always
     environment:
-      MONGODB_PASSWORD:
+      MONGODB_PASSWORD: $MONGODB_PASSWORD
     logging:
       options:
         max-size: "10m"