From f30392864c4f81017cfb46049fde4d722329d089 Mon Sep 17 00:00:00 2001
From: Diamantis Tziotzios <dtziotzios@cite.gr>
Date: Wed, 16 Dec 2020 14:19:58 +0200
Subject: [PATCH] ci updates

---
 dmp-backend/Dockerfile.CI  | 2 +-
 dmp-frontend/Dockerfile.CI | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dmp-backend/Dockerfile.CI b/dmp-backend/Dockerfile.CI
index 944713adf..5b8884b7d 100644
--- a/dmp-backend/Dockerfile.CI
+++ b/dmp-backend/Dockerfile.CI
@@ -12,4 +12,4 @@ RUN mvn package
 FROM openjdk:8-jre-alpine
 WORKDIR /app
 COPY --from=MAVEN_BUILD /build/web/target/web-1.0-SNAPSHOT.jar /app/app.jar
-ENTRYPOINT ["java","-Djava.security.egd=file:/dev/./urandom" ,"-Dspring.profiles.active=${PROF}","-jar","/app.jar"]
\ No newline at end of file
+ENTRYPOINT ["java", "-Djava.security.egd=file:/dev/./urandom", "-Dspring.profiles.active=${PROF}", "-Dspring.config.location=/files/config/", "-jar","/app/app.jar"]
diff --git a/dmp-frontend/Dockerfile.CI b/dmp-frontend/Dockerfile.CI
index b9d0860ec..cde3e5199 100644
--- a/dmp-frontend/Dockerfile.CI
+++ b/dmp-frontend/Dockerfile.CI
@@ -18,7 +18,7 @@ FROM nginx:alpine
 
 #!/bin/sh
 
-COPY nginx.conf.CI /etc/nginx/nginx.conf
+COPY nginx.conf.CI /etc/nginx/conf.d/default.conf
 
 ## Remove default nginx index page
 RUN rm -rf /usr/share/nginx/html/*