Merge pull request edgexfoundry#79 from jpwhitemn/master

Delhi Release Compose files added

Author: Trevor Conn

compose-files/docker-compose-delhi-0.7.0.yml

@@ -13,12 +13,9 @@
 #  *
 #  * @author: Jim White, Dell
 #  * EdgeX Foundry, Developer Docker Compose
-#  * added: Oct 8, 2018
-#  * WARNING - this is an early copy of the Delhi Release developer images from the Nexus repository.
-#  * WARNING - this collection of images should only be used in development and testing situations.
+#  * added: Nov 16, 2018
 #  *******************************************************************************/
 
-
 version: '3'
 volumes:
   db-data:
@@ -27,10 +24,9 @@ volumes:
   consul-data:
   portainer_data:
 
-
 services:
   volume:
-    image: nexus3.edgexfoundry.org:10004/docker-edgex-volume:0.6.0
+    image: edgexfoundry/docker-edgex-volume:0.6.0
     container_name: edgex-files
     networks:
       - edgex-network
@@ -61,7 +57,7 @@ services:
       - volume  
 
   config-seed:
-    image: nexus3.edgexfoundry.org:10004/docker-core-config-seed-go:0.7.0
+    image: edgexfoundry/docker-core-config-seed-go:0.7.0
     container_name: edgex-config-seed
     hostname: edgex-core-config-seed
     networks:
@@ -93,24 +89,8 @@ services:
     depends_on:
       - volume
 
-  sma:
-    image: nexus3.edgexfoundry.org:10004/docker-sys-mgmt-agent-go:0.7.0
-    ports:
-      - "48090:48090"
-    container_name: edgex-sys-mgmt
-    hostname: edgex-sys-mgmt
-    networks:
-      - edgex-network
-    volumes:
-      - db-data:/data/db
-      - log-data:/edgex/logs
-      - consul-config:/consul/config
-      - consul-data:/consul/data
-    depends_on:
-      - volume
-  
   logging:
-    image: nexus3.edgexfoundry.org:10004/docker-support-logging-go:0.7.0
+    image: edgexfoundry/docker-support-logging-go:0.7.0
     ports:
       - "48061:48061"
     container_name: edgex-support-logging
@@ -128,7 +108,7 @@ services:
       - volume
 
   notifications:
-    image: nexus3.edgexfoundry.org:10004/docker-support-notifications-go:0.7.0
+    image: edgexfoundry/docker-support-notifications-go:0.7.0
     ports:
       - "48060:48060"
     container_name: edgex-support-notifications
@@ -144,7 +124,7 @@ services:
       - logging
 
   metadata:
-    image: nexus3.edgexfoundry.org:10004/docker-core-metadata-go:0.7.0
+    image: edgexfoundry/docker-core-metadata-go:0.7.0
     ports:
       - "48081:48081"
     container_name: edgex-core-metadata
@@ -160,7 +140,7 @@ services:
       - logging
 
   data:
-    image: nexus3.edgexfoundry.org:10004/docker-core-data-go:0.7.0
+    image: edgexfoundry/docker-core-data-go:0.7.0
     ports:
       - "48080:48080"
       - "5563:5563"
@@ -177,7 +157,7 @@ services:
       - logging
 
   command:
-    image: nexus3.edgexfoundry.org:10004/docker-core-command-go:0.7.0
+    image: edgexfoundry/docker-core-command-go:0.7.0
     ports:
       - "48082:48082"
     container_name: edgex-core-command
@@ -193,7 +173,7 @@ services:
       - metadata
 
   scheduler:
-    image: nexus3.edgexfoundry.org:10004/docker-support-scheduler-go:0.7.0
+    image: edgexfoundry/docker-support-scheduler-go:0.7.0
     ports:
       - "48085:48085"
     container_name: edgex-support-scheduler
@@ -209,7 +189,7 @@ services:
       - metadata
 
   export-client:
-    image: nexus3.edgexfoundry.org:10004/docker-export-client-go:0.7.0
+    image: edgexfoundry/docker-export-client-go:0.7.0
     ports:
       - "48071:48071"
     container_name: edgex-export-client
@@ -229,7 +209,7 @@ services:
       - EXPORT_CLIENT_CONSUL_HOST=edgex-config-seed
 
   export-distro:
-    image: nexus3.edgexfoundry.org:10004/docker-export-distro-go:0.7.0
+    image: edgexfoundry/docker-export-distro-go:0.7.0
     ports:
       - "48070:48070"
       - "5566:5566"
@@ -251,9 +231,8 @@ services:
       - EXPORT_DISTRO_MQTTS_CERT_FILE=none
       - EXPORT_DISTRO_MQTTS_KEY_FILE=none
 
-#needs to be replaced with version 0.7.0 once updated nexus or docker hub
   rulesengine:
-    image: nexus3.edgexfoundry.org:10004/docker-support-rulesengine:0.7.0
+    image: edgexfoundry/docker-support-rulesengine:0.7.0
     ports:
       - "48075:48075"
     container_name: edgex-support-rulesengine
@@ -265,15 +244,13 @@ services:
       - log-data:/edgex/logs
       - consul-config:/consul/config
       - consul-data:/consul/data
-#    depends_on:
-#      - export-distro
 
 #################################################################
 # Device Services
 #################################################################
 
   device-virtual:
-    image: nexus3.edgexfoundry.org:10004/docker-device-virtual:0.6.0
+    image: edgexfoundry/docker-device-virtual:0.6.0
     ports:
       - "49990:49990"
     container_name: edgex-device-virtual

compose-files/docker-compose.yml

@@ -13,20 +13,20 @@
 #  *
 #  * @author: Jim White, Dell
 #  * EdgeX Foundry, Developer Docker Compose
-#  * added: Feb 3, 2018
+#  * added: Nov 16, 2018
 #  *******************************************************************************/
 
-
 version: '3'
 volumes:
   db-data:
   log-data:
   consul-config:
   consul-data:
+  portainer_data:
 
 services:
   volume:
-    image: edgexfoundry/docker-edgex-volume
+    image: edgexfoundry/docker-edgex-volume:0.6.0
     container_name: edgex-files
     networks:
       - edgex-network
@@ -57,7 +57,7 @@ services:
       - volume  
 
   config-seed:
-    image: edgexfoundry/docker-core-config-seed-go:0.6.1
+    image: edgexfoundry/docker-core-config-seed-go:0.7.0
     container_name: edgex-config-seed
     hostname: edgex-core-config-seed
     networks:
@@ -90,7 +90,7 @@ services:
       - volume
 
   logging:
-    image: edgexfoundry/docker-support-logging-go:0.6.1
+    image: edgexfoundry/docker-support-logging-go:0.7.0
     ports:
       - "48061:48061"
     container_name: edgex-support-logging
@@ -108,7 +108,7 @@ services:
       - volume
 
   notifications:
-    image: edgexfoundry/docker-support-notifications-go:0.6.1
+    image: edgexfoundry/docker-support-notifications-go:0.7.0
     ports:
       - "48060:48060"
     container_name: edgex-support-notifications
@@ -124,7 +124,7 @@ services:
       - logging
 
   metadata:
-    image: edgexfoundry/docker-core-metadata-go:0.6.1
+    image: edgexfoundry/docker-core-metadata-go:0.7.0
     ports:
       - "48081:48081"
     container_name: edgex-core-metadata
@@ -140,7 +140,7 @@ services:
       - logging
 
   data:
-    image: edgexfoundry/docker-core-data-go:0.6.1
+    image: edgexfoundry/docker-core-data-go:0.7.0
     ports:
       - "48080:48080"
       - "5563:5563"
@@ -157,7 +157,7 @@ services:
       - logging
 
   command:
-    image: edgexfoundry/docker-core-command-go:0.6.1
+    image: edgexfoundry/docker-core-command-go:0.7.0
     ports:
       - "48082:48082"
     container_name: edgex-core-command
@@ -173,7 +173,7 @@ services:
       - metadata
 
   scheduler:
-    image: edgexfoundry/docker-support-scheduler:0.6.0
+    image: edgexfoundry/docker-support-scheduler-go:0.7.0
     ports:
       - "48085:48085"
     container_name: edgex-support-scheduler
@@ -189,7 +189,7 @@ services:
       - metadata
 
   export-client:
-    image: edgexfoundry/docker-export-client-go:0.6.1
+    image: edgexfoundry/docker-export-client-go:0.7.0
     ports:
       - "48071:48071"
     container_name: edgex-export-client
@@ -209,9 +209,10 @@ services:
       - EXPORT_CLIENT_CONSUL_HOST=edgex-config-seed
 
   export-distro:
-    image: edgexfoundry/docker-export-distro-go:0.6.1
+    image: edgexfoundry/docker-export-distro-go:0.7.0
     ports:
       - "48070:48070"
+      - "5566:5566"
     container_name: edgex-export-distro
     hostname: edgex-export-distro
     networks:
@@ -231,7 +232,7 @@ services:
       - EXPORT_DISTRO_MQTTS_KEY_FILE=none
 
   rulesengine:
-    image: edgexfoundry/docker-support-rulesengine:0.6.0
+    image: edgexfoundry/docker-support-rulesengine:0.7.0
     ports:
       - "48075:48075"
     container_name: edgex-support-rulesengine
@@ -243,8 +244,6 @@ services:
       - log-data:/edgex/logs
       - consul-config:/consul/config
       - consul-data:/consul/data
-    depends_on:
-      - export-distro
 
 #################################################################
 # Device Services
@@ -268,7 +267,7 @@ services:
       - command
 
 #   device-bluetooth:
-#     image: edgexfoundry/docker-device-bluetooth:0.6.0
+#     image: nexus3.edgexfoundry.org:10004/docker-device-bluetooth:0.6.0
 #     ports:
 #       - "49988:49988"
 #       - "5000:5000"
@@ -290,7 +289,7 @@ services:
 #       - command
 
 #   device-snmp:
-#     image: edgexfoundry/docker-device-snmp:0.6.0
+#     image: nexus3.edgexfoundry.org:10004/docker-device-snmp:0.6.0
 #     ports:
 #       - "49989:49989"
 #     container_name: edgex-device-snmp
@@ -307,7 +306,7 @@ services:
 #       - command
 
 #   device-modbus:
-#     image: edgexfoundry/docker-device-modbus:0.6.0
+#     image: nexus3.edgexfoundry.org:10004/docker-device-modbus:0.6.0
 #     ports:
 #       - "49991:49991"
 #     container_name: edgex-device-modbus
@@ -324,7 +323,7 @@ services:
 #       - command
 
 #   device-fischertechnik:
-#     image: edgexfoundry/docker-device-fischertechnik:0.6.0
+#     image: nexus3.edgexfoundry.org:10004/docker-device-fischertechnik:0.6.0
 #     ports:
 #       - "49985:49985"
 #     container_name: edgex-device-fischertechnik
@@ -341,7 +340,7 @@ services:
 #       - command
 
 #   device-bacnet:
-#     image: edgexfoundry/docker-device-bacnet:0.6.0
+#     image: nexus3.edgexfoundry.org:10004/docker-device-bacnet:0.6.0
 #     ports:
 #       - "49986:49986"
 #       - "5002:5002"
@@ -359,7 +358,7 @@ services:
 #       - command    
 
 #   device-mqtt:
-#     image: edgexfoundry/docker-device-mqtt:0.6.0
+#     image: nexus3.edgexfoundry.org:10004/docker-device-mqtt:0.6.0
 #     ports:
 #       - "49982:49982"
 #       - "14377:14377"
@@ -376,6 +375,26 @@ services:
 #       - data
 #       - command
 
+#################################################################
+# UIs
+#################################################################
+# to be done
+
+#################################################################
+# Tooling
+#################################################################
+
+  portainer:
+    image:  portainer/portainer
+    ports:
+      - "9000:9000"
+    command: -H unix:///var/run/docker.sock
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - portainer_data:/data
+    depends_on:
+      - volume  
+
 networks:
   edgex-network:
     driver: "bridge"