VOL-612 - rename images to work better with public repository
Change-Id: I9679544987c3a08d0001928cfbc39d710a6c1eae
diff --git a/compose/voltha-stack.yml.j2 b/compose/voltha-stack.yml.j2
index 09033d4..77d5d9d 100644
--- a/compose/voltha-stack.yml.j2
+++ b/compose/voltha-stack.yml.j2
@@ -20,31 +20,35 @@
# templating capability, because as of 17.09.0-ce Docker
# cannot use and environment variable for the `replicas`
# attribute on a container. ]
-# REGISTRY - The docker registry from which images should be pulled.
-# If specified if should end in a `/`. Defaults to empty.
-# TAG - The tag that should be used when referencing VOLTHA docker
-# images, defaults to `latest`.
-# CONSUL_ROOT - The local path on which the consul/data and consul/config
-# directories should be created. Defaults to `/var/local`.
-# VOLTHA_LOGS - The location into which `fluentd` should writes logs.
-# Defaults to `/var/log`.
-# RADIUS_ROOT - The location in which the `data/clients.conf` and
-# `data/users` configuration files can be found. Defaults
-# to `/var/local`.
+# REGISTRY - The docker registry host from which images should be
+# pulled, i.e. `private-reg.com:5000/`. If specified
+# it should end in a `/`. Defaults to empty.
+# REPOSITORY - The docker repository name from which voltha specific
+# images should be pulled, i.e. `voltha/`. If specified it
+# should end in a `/`. Defaults to empty.
+# TAG - The tag that should be used when referencing VOLTHA docker
+# images, defaults to `latest`.
+# CONSUL_ROOT - The local path on which the consul/data and consul/config
+# directories should be created. Defaults to `/var/local`.
+# VOLTHA_LOGS - The location into which `fluentd` should writes logs.
+# Defaults to `/var/log`.
+# RADIUS_ROOT - The location in which the `data/clients.conf` and
+# `data/users` configuration files can be found. Defaults
+# to `/var/local`.
# DOCKER_HOST_IP -
-# ZK_TAG - The tag that should be used when referencing the ZooKeeper
-# docker image. Defaults to `3.4.11`.
-# KAFKA_TAG - The tag that should be used when referencing the Kafka
-# docker image. Default to `1.0.0`.
-# CONSUL_TAG - The tag that should be used when referencing the Consul
-# docker image. Defaults to `0.9.2`.
-# RADIUS_TAG - The tag that should be used when referencing the FreeRADIUS
-# docker image. Defaults to `latest`.
+# ZK_TAG - The tag that should be used when referencing the ZooKeeper
+# docker image. Defaults to `latest`.
+# KAFKA_TAG - The tag that should be used when referencing the Kafka
+# docker image. Default to `1.0.0`.
+# CONSUL_TAG - The tag that should be used when referencing the Consul
+# docker image. Defaults to `0.9.2`.
+# RADIUS_TAG - The tag that should be used when referencing the FreeRADIUS
+# docker image. Defaults to `latest`.
version: "3"
services:
zk1:
- image: "${REGISTRY}zookeeper:${ZK_TAG:-3.4.11}"
+ image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -57,7 +61,7 @@
ZOO_SERVERS: server.1=0.0.0.0:2888:3888 server.2=zk2:2888:3888 server.3=zk3:2888:3888
zk2:
- image: "${REGISTRY}zookeeper:${ZK_TAG:-3.4.11}"
+ image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -70,7 +74,7 @@
ZOO_SERVERS: server.1=zk1:2888:3888 server.2=0.0.0.0:2888:3888 server.3=zk3:2888:3888
zk3:
- image: "${REGISTRY}zookeeper:${ZK_TAG:-3.4.11}"
+ image: "${REGISTRY}wurstmeister/zookeeper:${ZK_TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -85,7 +89,7 @@
kafka:
deploy:
mode: global
- image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-1.0.0}"
+ image: "${REGISTRY}wurstmeister/kafka:${KAFKA_TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -104,7 +108,7 @@
- 9092:9092
consul:
- image: ${REGISTRY}consul:${CONSUL_TAG:-0.9.2}
+ image: "${REGISTRY}consul:${CONSUL_TAG:-0.9.2}"
logging:
driver: "json-file"
options:
@@ -152,7 +156,7 @@
{%- endif %}
fluentdactv:
- image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -174,7 +178,7 @@
{%- endif %}
fluentdstby:
- image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -198,7 +202,7 @@
# The Fluentd container is part of the data collection
# infrastructure.
fluentd:
- image: "${REGISTRY}voltha/fluentd:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-fluentd:${TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -254,7 +258,7 @@
# The cluster manager must run on a manager node so that it can
# retrieve service information from manager nodes
onos_cluster_manager:
- image: "${REGISTRY}voltha/unum:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-unum:${TAG:-latest}"
deploy:
replicas: 1
placement:
@@ -283,7 +287,7 @@
replicas: 1
labels:
org.voltha.onos.cluster: "true"
- image: "${REGISTRY}voltha/onos:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-onos:${TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -301,7 +305,7 @@
# The VCORE container is the core capabilities of VOLTHA including
# interacting with device adapters
vcore:
- image: "${REGISTRY}voltha/voltha:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-voltha:${TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -333,7 +337,7 @@
# The OpenFlow Agent support the OpenFlow protocol communication
# between ONOS and VOLTHA.
ofagent:
- image: "${REGISTRY}voltha/ofagent:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-ofagent:${TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -358,7 +362,7 @@
# the VOLTHA components as well as surfaces a REST API and maps
# the requests to GPRC
voltha:
- image: "${REGISTRY}voltha/envoy:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-envoy:${TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -387,7 +391,7 @@
# The CLI container provides an CLI to the VOLTHA capabilitiy
# that can be accessed via SSH.
cli:
- image: "${REGISTRY}voltha/cli:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-cli:${TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -411,7 +415,7 @@
# The Netconf container provides an NETCONF API to be used
# with VOLTHA and maps that to GRPC requests
netconf:
- image: "${REGISTRY}voltha/netconf:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-netconf:${TAG:-latest}"
logging:
driver: "json-file"
options:
@@ -440,7 +444,7 @@
# as other VOLTHA containers and is thus a convenient
# troubleshooting tool
tools:
- image: "${REGISTRY}voltha/tools:${TAG:-latest}"
+ image: "${REGISTRY}${REPOSITORY}voltha-tools:${TAG:-latest}"
logging:
driver: "json-file"
options: