Enable running dashboard inside docker container

Change-Id: Ie86cfb786993fa4e5328deac1a49fca4b5a33d25
Issue-ID: NONRTRIC-71
Signed-off-by: RehanRaza <muhammad.rehan.raza@est.tech>

diff --git a/dashboard/webapp-backend/src/main/resources/application.properties b/dashboard/webapp-backend/src/main/resources/application.properties
index 0cb9891..3aa2406 100644 (file)
--- a/dashboard/webapp-backend/src/main/resources/application.properties
+++ b/dashboard/webapp-backend/src/main/resources/application.properties
@@ -42,8 +42,10 @@ portalapi.username =
 portalapi.password =
 
 # endpoint URLs must be supplied at deployment time
+# NOTE: change a1controller.url.prefix to http://localhost:8282 when running
+#       dashboard locally (i.e., not inside the docker container)
 # A1 Controller
-a1controller.url.prefix = http://localhost:8282
+a1controller.url.prefix = http://a1-controller-container:8181
 a1controller.url.suffix = /restconf/operations
 
 # Kubernetes API via https://github.com/nokia/caas-ingress

diff --git a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
index 15c534e..9ec7792 100644 (file)
--- a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
+++ b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
@@ -3,14 +3,14 @@ version: '2.1'
 networks:
   default:
     driver: bridge
-    driver_opts:
-      com.docker.network.driver.mtu: ${MTU}
-
+    name: nonrtric-docker-net
 
 services:
   db:
     image: mysql/mysql-server:5.6
     container_name: sdnc_db_container
+    networks:
+      - default
     ports:
       - "3306"
     environment:
@@ -26,7 +26,9 @@ services:
     image: nonrtric-a1-controller:latest
     depends_on :
       - db
-    container_name: sdnc_controller_container
+    container_name: a1-controller-container
+    networks:
+      - default
     entrypoint: ["/opt/onap/sdnc/bin/startODL.sh"]
     ports:
       - "8282:8181"