Update css file name in conf.py

[externalapi/nbi.git] / docker-compose.yml

diff --git a/docker-compose.yml b/docker-compose.yml
index 3aeb66e..607475c 100644 (file)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,34 +1,57 @@
-version: "3.0"
+#
+#     Copyright (c) 2018 Orange
+#
+#     Licensed under the Apache License, Version 2.0 (the "License");
+#     you may not use this file except in compliance with the License.
+#     You may obtain a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#     Unless required by applicable law or agreed to in writing, software
+#     distributed under the License is distributed on an "AS IS" BASIS,
+#     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#     See the License for the specific language governing permissions and
+#     limitations under the License.
+#
+
+version: "2.1"
 services:
   mongo:
-    image: mongo:3
+    image: mongo:latest
     restart: always
     volumes:
       - /var/lib/mongo
     command: --smallfiles
 
   mariadb:
-    image: mariadb:10
+    image: mariadb:latest
     restart: always
     volumes:
       - /var/lib/mariadb
     environment:
       MYSQL_DATABASE: nbi
-      MYSQL_ROOT_PASSWORD: $SPRING_DATASOURCE_PASSWORD
-# APP  ***************************************************************************************
+      MYSQL_PASSWORD: toto
+      MYSQL_RANDOM_ROOT_PASSWORD: 'yes'
+      MYSQL_USER: rene
+  # APP  ***************************************************************************************
   nbi:
-    build:
-      context: .
-      args:
-        SERVER_PORT: $SERVER_PORT
+    image: ${NEXUS_DOCKER_REPO}/onap/externalapi/nbi:${DOCKER_IMAGE_VERSION:-latest}
     ports:
-    - $SERVER_PORT:$SERVER_PORT
+      - 8080:8080
+    env_file:
+      - .env
     environment:
       SPRING_DATASOURCE_URL: jdbc:mariadb://mariadb:3306/nbi
+      SPRING_DATASOURCE_PASSWORD: toto
+      SPRING_DATASOURCE_USERNAME: rene
       SPRING_DATA_MONGODB_HOST: mongo
+      SDC_HOST: http://${SDC_IP}:8080
+      AAI_HOST: https://${AAI_IP}:8443
+      SO_HOST: http://${SO_IP}:8080
+    restart: on-failure
     depends_on:
-    - mariadb
-    - mongo
+      - mariadb
+      - mongo
 volumes:
   mariadb:
   mongo: