Merge pull request #59 from allemaos/master

change to son-postgres
sonata-nfv · Apr 15, 2019 · c7a44d2 · c7a44d2
2 parents 727291a + 7d0ee04
commit c7a44d2
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '3'
 
 services:
-  tng-vnv-planner-postgres:
+  son-postgres:
     image: ntboes/postgres-uuid
     container_name: son-postgres
     environment:
@@ -18,9 +18,8 @@ services:
     image: registry.sonata-nfv.eu:5000/tng-vnv-planner
     container_name: tng-vnv-planner
     depends_on:
-      - tng-vnv-planner-postgres
+      - son-postgres
     ports:
       - 6100:6100
 volumes:
-  tng-vnv-planner-data:
-
+  tng-vnv-planner-data:
diff --git a/src/main/docker/Dockerfile b/src/main/docker/Dockerfile
@@ -32,6 +32,6 @@
 # encoding: utf-8
 
 FROM openjdk:8-jdk-alpine
-ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=test", "/app.jar"]
+ENTRYPOINT ["java", "-jar", "-Dspring.profiles.active=docker", "/app.jar"]
 EXPOSE 6100
 ADD /libs/${name}-${version}.jar /app.jar