summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMurali Mohan Murthy Potham <murali.p@huawei.com>2017-09-20 08:53:34 +0000
committerGerrit Code Review <gerrit@onap.org>2017-09-20 08:53:34 +0000
commitcdbc3248d61eec82b59fb81144d381cd4f855256 (patch)
tree433e739959d30b2e97f412a45e2303bc32e57047
parent9acded62ee29565d5153d14007ab118c805a8eb8 (diff)
parent984346f6f482323595ca0f5b3eb570291641de70 (diff)
Merge "Add .env file for custom version for docker"
-rw-r--r--vnfmarket-be/deployment/install/.env10
-rw-r--r--vnfmarket-be/deployment/install/docker-compose.yml4
2 files changed, 12 insertions, 2 deletions
diff --git a/vnfmarket-be/deployment/install/.env b/vnfmarket-be/deployment/install/.env
new file mode 100644
index 00000000..83c135f3
--- /dev/null
+++ b/vnfmarket-be/deployment/install/.env
@@ -0,0 +1,10 @@
+# Environment settings
+# used by docker-compose AND by other shell scripts
+
+
+# Tag all images with this
+REFREPO_TAG=1.0-STAGING-latest
+POSTGRES_TAG=latest
+
+NEXUS_REPO=nexus3.onap.org:10001
+
diff --git a/vnfmarket-be/deployment/install/docker-compose.yml b/vnfmarket-be/deployment/install/docker-compose.yml
index caf70cd1..57236875 100644
--- a/vnfmarket-be/deployment/install/docker-compose.yml
+++ b/vnfmarket-be/deployment/install/docker-compose.yml
@@ -1,7 +1,7 @@
postgres:
container_name: "postgres"
restart: "always"
- image: "nexus3.onap.org:10001/onap/refrepo/postgres:latest"
+ image: "${NEXUS_REPO}/onap/refrepo/postgres:${POSTGRES_TAG}"
mem_limit: "1g"
memswap_limit: "1g"
ports:
@@ -11,7 +11,7 @@ postgres:
refrepo:
container_name: "refrepo"
restart: "always"
- image: "nexus3.onap.org:10001/onap/refrepo:1.0-STAGING-latest"
+ image: "${NEXUS_REPO}/onap/refrepo:${REFREPO_TAG}"
ports:
- "8702:8702"
environment: