VOL-1613: Redo Makefile and Dockerfile to new standard
Needed for proper releases
Also update system-test compose and docs needed to
run images using new build.
Change-Id: Idc00317de476fe943ec937977bf863a46c1e8305
diff --git a/compose/system-test.yml b/compose/system-test.yml
index 1d6bc51..71dea7c 100644
--- a/compose/system-test.yml
+++ b/compose/system-test.yml
@@ -29,6 +29,7 @@
- 2181:2181
networks:
- default
+ restart: unless-stopped
kafka:
@@ -45,6 +46,7 @@
- 9092:9092
networks:
- default
+ restart: unless-stopped
etcd:
@@ -66,10 +68,11 @@
- 4001
networks:
- default
+ restart: unless-stopped
rw_core:
- image: voltha-rw-core
+ image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-rw-core:${DOCKER_TAG}"
entrypoint:
- /app/rw_core
- -kv_store_type=etcd
@@ -95,7 +98,7 @@
cli:
- image: "${REGISTRY}${REPOSITORY}voltha-cli:latest"
+ image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-cli:${DOCKER_TAG}"
logging:
driver: "json-file"
options:
@@ -110,10 +113,11 @@
- default
ports:
- "5022:22"
+ restart: unless-stopped
ofagent:
- image: "${REGISTRY}${REPOSITORY}voltha-ofagent:latest"
+ image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-ofagent:${DOCKER_TAG}"
logging:
driver: "json-file"
options:
@@ -135,7 +139,7 @@
onos:
- image: "voltha/voltha-onos:latest"
+ image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-onos:${DOCKER_TAG}"
ports:
- "8101:8101" # ssh
- "6653:6653" # OF
@@ -151,7 +155,7 @@
adapter_openolt:
- image: "${REGISTRY}${REPOSITORY}voltha-openolt-adapter${TAG}"
+ image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-openolt-adapter:${DOCKER_TAG}"
logging:
driver: "json-file"
options:
@@ -173,7 +177,7 @@
adapter_openonu:
- image: "${REGISTRY}${REPOSITORY}voltha-openonu-adapter${TAG}"
+ image: "${DOCKER_REGISTRY}${DOCKER_REPOSITORY}voltha-openonu-adapter:${DOCKER_TAG}"
logging:
driver: "json-file"
options: