Merge changes Ia1e5c405,Ie890b499,Ie8b58f17,I76c96d30,I7814f090, ...

* changes:
  WidgetsControllerTest up
  WidgetsCatalogController up
  WidgetsCatalogMarkupController up
  WidgetsController Up
  WidgetsController Up
  WidgetsController Up
  portal-BE documentation up
  Docker-compose up
  Coverity Scan issues fix

1 files changed, 36 insertions, 0 deletions

diff --git a/portal-BE/docker-compose.yml b/portal-BE/docker-compose.yml
new file mode 100644
index 00000000..7c44e82f
--- /dev/null
+++ b/portal-BE/docker-compose.yml
@@ -0,0 +1,36 @@
+# docker-compose for ONAP portal containers: database, microservice, portal apps.
+# Relies on .env file, which CANNOT be specified via command-line option
+# Works in multiple environments; does not pull from a Nexus registry.
+# Exposes the portal apps docker (but not DB nor WMS dockers) on the host network.
+# Images must be pulled from ONAP Nexus registry after logging in like this:
+# docker login -u USER -p PASS nexus3.onap.org:10001
+# Uses healthcheck feature added in docker-compose v2.1
+
+version: '2.1'
+
+services:
+  portal-db:
+    image: portal_mariadb
+    container_name: portal_mariaDB
+    environment:
+      MYSQL_DATABASE: testdb
+    healthcheck:
+      test: ["CMD", "mysqladmin" ,"ping", "-h", "localhost"]
+    networks:
+      - backend
+
+  portal-app:
+    image: portal_app
+    container_name: portal_APP
+    restart: on-failure
+    ports:
+      - 8080:8080
+    depends_on:
+      portal-db:
+        condition: service_healthy
+    networks:
+      - backend
+
+networks:
+  backend:
+    driver: bridge