VOL-595 - container image name consistency and general cleanup
Change-Id: Iccac1ccba61537cefa046118df139196e9e87713
diff --git a/compose/docker-compose-system-test-encrypted.yml b/compose/docker-compose-system-test-encrypted.yml
index 7973dd7..aff19ca 100644
--- a/compose/docker-compose-system-test-encrypted.yml
+++ b/compose/docker-compose-system-test-encrypted.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: voltha/consul
+ image: "${REGISTRY}voltha/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: voltha/registrator
+ image: "${REGISTRY}gliderlabs/registrator:${REGISTRATOR_TAG:-latest}"
command: [
"-ip=${DOCKER_HOST_IP}",
"-retry-attempts", "100",
@@ -66,7 +66,7 @@
# Fluentd log server
#
fluentd:
- image: fluent/fluentd
+ image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
ports:
- "24224:24224"
volumes:
@@ -79,7 +79,7 @@
# (demo place-holder for external KPI system)
#
grafana:
- image: voltha/grafana
+ image: "${REGISTRY}voltha/grafana:${TAG:-latest}"
ports:
- "8882:80"
- "2003:2003"
@@ -98,7 +98,7 @@
# Shovel (Kafka-graphite-gateway)
#
shovel:
- image: cord/shovel
+ image: "${REGISTRY}voltha/shovel:${TAG:-latest}"
command: [
"/shovel/shovel/main.py",
"--kafka=@kafka",
@@ -116,7 +116,7 @@
# Voltha server instance(s)
#
voltha:
- image: cord/voltha
+ image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
command: [
"/voltha/voltha/main.py",
"-v",
@@ -154,8 +154,8 @@
#
# Voltha cli container
#
- vcli:
- image: cord/vcli
+ cli:
+ image: "${REGISTRY}voltha/cli:${TAG:-latest}"
command: [
"/cli/cli/setup.sh",
"-L"
@@ -175,7 +175,7 @@
# ofagent server instance
#
ofagent:
- image: cord/ofagent
+ image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
command: [
"/ofagent/ofagent/main.py",
"-v",
@@ -200,7 +200,7 @@
# Netconf server instance(s)
#
netconf:
- image: cord/netconf
+ image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
privileged: true
command: [
"/netconf/netconf/main.py",
@@ -228,7 +228,7 @@
# Dashboard daemon
#
dashd:
- image: cord/dashd
+ image: "${REGISTRY}voltha/dashd:${TAG:-latest}"
command: [
"/dashd/dashd/main.py",
"--kafka=@kafka",
@@ -247,7 +247,7 @@
# Nginx service consolidation
#
nginx:
- image: voltha/nginx
+ image: "${REGISTRY}voltha/nginx:${TAG:-latest}"
ports:
- "80:80"
environment:
@@ -267,7 +267,7 @@
# Docker ui
#
portainer:
- image: voltha/portainer
+ image: "${REGISTRY}voltha/portainer:${TAG:-latest}"
ports:
- "9000:9000"
environment: