VOL-595 - container image name consistency and general cleanup
Change-Id: Iccac1ccba61537cefa046118df139196e9e87713
diff --git a/compose/docker-compose-ofagent-test.yml b/compose/docker-compose-ofagent-test.yml
index 20d20ca..d20a6a5 100644
--- a/compose/docker-compose-ofagent-test.yml
+++ b/compose/docker-compose-ofagent-test.yml
@@ -5,7 +5,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"
@@ -21,7 +21,7 @@
# Registrator
#
registrator:
- image: gliderlabs/registrator:latest
+ image: "${REGISTRY}gliderlabs/registrator:${REGISTRATOR_TAG:-latest}"
command: [
"-ip=${DOCKER_HOST_IP}",
"-retry-attempts", "100",
@@ -38,7 +38,7 @@
# Fluentd log server
#
fluentd:
- image: fluent/fluentd
+ image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
ports:
- "24224:24224"
volumes:
@@ -50,7 +50,7 @@
# Voltha server instance(s)
#
voltha:
- image: cord/voltha
+ image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
command: [
"/voltha/voltha/main.py",
"-v",
@@ -88,7 +88,7 @@
- ponmgmt
envoy:
- image: voltha/envoy
+ image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
entrypoint:
- /usr/local/bin/envoyd
- -envoy-cfg-template
@@ -112,8 +112,8 @@
#
# Voltha cli container
#
- vcli:
- image: cord/vcli
+ cli:
+ image: "${REGISTRY}voltha/cli:${TAG:-latest}"
command: [
"/cli/cli/setup.sh",
"-L",
@@ -130,7 +130,7 @@
# onos-1
#
onos1:
- image: cord/onos
+ image: "${REGISTRY}voltha/onos:${TAG:-latest}"
container_name: onos1
ports:
- 6633:6653
@@ -146,7 +146,7 @@
# onos-2
#
onos2:
- image: cord/onos
+ image: "${REGISTRY}voltha/onos:${TAG:-latest}"
container_name: onos2
ports:
- 6644:6653
@@ -162,7 +162,7 @@
# onos-3
#
onos3:
- image: cord/onos
+ image: "${REGISTRY}voltha/onos:${TAG:-latest}"
container_name: onos3
ports:
- 6655:6653
@@ -177,7 +177,7 @@
# ofagent server instance
#
ofagent:
- image: cord/ofagent
+ image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
command: /ofagent/ofagent/main.py -v --consul=${DOCKER_HOST_IP}:8500 --fluentd=fluentd:24224 --controller ${DOCKER_HOST_IP}:6633 ${DOCKER_HOST_IP}:6644 ${DOCKER_HOST_IP}:6655 --grpc-endpoint=@voltha-grpc --instance-id-is-container-name --enable-tls --key-file=/ofagent/pki/voltha.key --cert-file=/ofagent/pki/voltha.crt
depends_on:
- consul