VOL-595 - container image name consistency and general cleanup
Change-Id: Iccac1ccba61537cefa046118df139196e9e87713
diff --git a/compose/docker-compose-docutests.yml b/compose/docker-compose-docutests.yml
index d53b1db..6a0db8c 100644
--- a/compose/docker-compose-docutests.yml
+++ b/compose/docker-compose-docutests.yml
@@ -4,7 +4,7 @@
# Single-node zookeeper service
#
zookeeper:
- image: wurstmeister/zookeeper
+ image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
ports:
- 2181
environment:
@@ -13,7 +13,7 @@
# Single-node kafka service
#
kafka:
- image: wurstmeister/kafka
+ image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
ports:
- 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",
@@ -63,7 +63,7 @@
# Fluentd log server
#
fluentd:
- image: fluent/fluentd
+ image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
ports:
- "24224:24224"
volumes:
@@ -75,7 +75,7 @@
# Voltha server instance(s)
#
voltha:
- image: cord/voltha
+ image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
command: [
"/voltha/voltha/main.py",
"-v",
@@ -115,7 +115,7 @@
# ofagent server instance
#
ofagent:
- image: cord/ofagent
+ image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
command: [
"/ofagent/ofagent/main.py",
"-v",
@@ -140,7 +140,7 @@
# Netconf server instance(s)
#
netconf:
- image: cord/netconf
+ image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
privileged: true
command: [
"/netconf/netconf/main.py",