commit bba65ff06acba42c7da84ed59789ed5157508fa0
author David K. Bainbridge <dbainbri@ciena.com> Fri Jan 19 09:26:09 2018 -0800
committer khenaidoo Nursimulu <knursimu@ciena.com> Fri Jan 19 19:33:40 2018 +0000
tree dcd5afdd23c87fbd9456852798582269b886f7c2
parent 8536d1b051d722fbea94db0aefeced45807b0a68

VOL-595 - container image name consistency and general cleanup

Change-Id: Iccac1ccba61537cefa046118df139196e9e87713

compose/docker-compose-fixed-port.yml

diff --git a/compose/docker-compose-fixed-port.yml b/compose/docker-compose-fixed-port.yml
index 5fb8749..d3b1c85 100644
--- a/compose/docker-compose-fixed-port.yml
+++ b/compose/docker-compose-fixed-port.yml
@@ -4,7 +4,7 @@
   # Single-node zookeeper service
   #
   zookeeper:
-    image: wurstmeister/zookeeper
+    image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
     ports:
      - "2181:2181"
     environment:
@@ -13,7 +13,7 @@
   # Single-node kafka service
   #
   kafka:
-    image: wurstmeister/kafka
+    image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
     ports:
      - "9092:9092"
     environment:
@@ -30,7 +30,7 @@
   # Single-node consul agent
   #
   consul:
-    image: consul:latest
+    image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
     command: agent -server -bootstrap -client 0.0.0.0 -ui
     ports:
     - "8300:8300"
@@ -46,7 +46,7 @@
   # Registrator
   #
   registrator:
-    image: gliderlabs/registrator:latest
+    image: "${REGISTRY}gliderlabs/registrator:${REGISTRATOR_TAG:-latest}"
     command: [
       "-ip=${DOCKER_HOST_IP}",
       "-retry-attempts", "100",
@@ -62,7 +62,7 @@
   # Fluentd log server
   #
   fluentd:
-    image: fluent/fluentd
+    image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
     ports:
     - "24224:24224"
     volumes:
@@ -75,7 +75,7 @@
   # (demo place-holder for external KPI system)
   #
   grafana:
-    image: kamon/grafana_graphite
+    image: "${REGISTRY}kamon/grafana_graphite:${GRAPHITE_TAG:-latest}"
     ports:
     - "8882:80"
     - "2003:2003"
@@ -93,7 +93,7 @@
   # Shovel (Kafka-graphite-gateway)
   #
   shovel:
-    image: cord/shovel
+    image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
     command: [
       "/shovel/shovel/main.py",
       "--kafka=@kafka",
@@ -111,7 +111,7 @@
   # Voltha server instance(s)
   #
   voltha:
-    image: cord/voltha
+    image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
     command: [
       "/voltha/voltha/main.py",
       "-v",
@@ -154,7 +154,7 @@
   # ofagent server instance
   #
   ofagent:
-    image: cord/ofagent
+    image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
     command: [
       "/ofagent/ofagent/main.py",
       "-v",
@@ -179,7 +179,7 @@
   # Netconf server instance(s)
   #
   netconf:
-    image: cord/netconf
+    image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
     privileged: true
     command: [
       "/netconf/netconf/main.py",
@@ -207,7 +207,7 @@
   # Dashboard daemon
   #
   dashd:
-    image: cord/dashd
+    image: "${REGISTRY}voltha/dashd:${TAG:-latest}"
     command: [
       "/dashd/dashd/main.py",
       "--kafka=@kafka",