summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYibo Cai <yibo.cai@arm.com>2017-11-08 14:18:31 +0800
committerYibo Cai <yibo.cai@arm.com>2017-11-09 11:06:16 +0800
commit3b6882797c740c8b29dbf1c35884661b60023c5f (patch)
treed12aacd572f9eb2c4b4cd9337c8c89de356ff29e
parent805cbb914fa5927b4b04ea124870c66ecbcba6cc (diff)
deploy/conf: support configurable docker registry
Set COMPASS_DOCKER_REPO to use docker repos other than the default one for x86_64(docker.io/compass4nfv). E.g., to deploy Arm servers, it can be set to "linaro" repo. Change-Id: Ief939e94d4a324dccd1ccf4be4ac75afb2cb0c3e Signed-off-by: Yibo Cai <yibo.cai@arm.com>
-rw-r--r--deploy/conf/compass.conf17
1 files changed, 10 insertions, 7 deletions
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 98ba3027..dc3a975e 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -18,14 +18,17 @@ export NAMESERVERS=${USER_NAMESERVER:-"$COMPASS_SERVER"}
export COMPASS_REPO_PORT="5151"
export OFFLINE_DEPLOY=${OFFLINE_DEPLOY:-'Disable'}
-export COMPASS_DECK="compass4nfv/compass-deck"
-export COMPASS_TASKS="compass4nfv/compass-tasks-osa:euphrates"
+# Set docker registry for architectures other than x86_64
+COMPASS_DOCKER_REPO=${COMPASS_DOCKER_REPO:-compass4nfv}
+
+export COMPASS_DECK="$COMPASS_DOCKER_REPO/compass-deck"
+export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-osa:euphrates"
if [[ "x"$KUBERNETES_VERSION != "x" ]]; then
- export COMPASS_TASKS="compass4nfv/compass-tasks-k8s"
+ export COMPASS_TASKS="$COMPASS_DOCKER_REPO/compass-tasks-k8s"
fi
-export COMPASS_COBBLER="compass4nfv/compass-cobbler"
-export COMPASS_DB="compass4nfv/compass-db"
-export COMPASS_MQ="compass4nfv/compass-mq"
-export COMPASS_REPO="compass4nfv/compass-repo-osa-ubuntu:euphrates"
+export COMPASS_COBBLER="$COMPASS_DOCKER_REPO/compass-cobbler"
+export COMPASS_DB="$COMPASS_DOCKER_REPO/compass-db"
+export COMPASS_MQ="$COMPASS_DOCKER_REPO/compass-mq"
+export COMPASS_REPO="$COMPASS_DOCKER_REPO/compass-repo-osa-ubuntu:euphrates"