From bd96ed7955e76c25c8f1b7e82998c9c9c3eadd64 Mon Sep 17 00:00:00 2001
From: anhefti <andreas.hefti@let.ethz.ch>
Date: Tue, 27 Aug 2019 09:50:09 +0200
Subject: [PATCH] prod

---
 docker/prod/standalone/selfsigned/Dockerfile         | 8 +++-----
 docker/prod/standalone/selfsigned/docker-compose.yml | 2 +-
 src/main/resources/config/application.properties     | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/docker/prod/standalone/selfsigned/Dockerfile b/docker/prod/standalone/selfsigned/Dockerfile
index 8261242c..97d9526d 100644
--- a/docker/prod/standalone/selfsigned/Dockerfile
+++ b/docker/prod/standalone/selfsigned/Dockerfile
@@ -20,13 +20,11 @@ RUN mvn clean install -DskipTests
 FROM openjdk:11-jre-stretch
 
 ARG SEBSERVER_VERSION
+ENV SEBSERVER_VERSION=${SEBSERVER_VERSION}
 
 WORKDIR /sebserver
 COPY --from=1 /sebserver/target/seb-server-"$SEBSERVER_VERSION".jar /sebserver
 
-ARG SEBSERVER_VERSION
-ENV SEBSERVER_VERSION=${SEBSERVER_VERSION}
+ENTRYPOINT exec java -jar seb-server-"${SEBSERVER_VERSION}".jar --spring.config.location=classpath:/config/,file:/config
 
-ENTRYPOINT exec java -jar seb-server-"${SEBSERVER_VERSION}".jar --spring.config.location=classpath:/config/,file:.
-
-EXPOSE $PORT
\ No newline at end of file
+EXPOSE 80
\ No newline at end of file
diff --git a/docker/prod/standalone/selfsigned/docker-compose.yml b/docker/prod/standalone/selfsigned/docker-compose.yml
index 8dd0ca47..0cf767d1 100644
--- a/docker/prod/standalone/selfsigned/docker-compose.yml
+++ b/docker/prod/standalone/selfsigned/docker-compose.yml
@@ -34,7 +34,7 @@ services:
               - SEBSERVER_VERSION=0.4.1-beta-SNAPSHOT
       container_name: seb-server
       volumes:
-        - .:/sebserver
+        - .:/config
       ports:
           - 80:80
       networks:
diff --git a/src/main/resources/config/application.properties b/src/main/resources/config/application.properties
index 8fe4b9bb..d24325ce 100644
--- a/src/main/resources/config/application.properties
+++ b/src/main/resources/config/application.properties
@@ -1,5 +1,5 @@
 spring.application.name=SEB Server
-spring.profiles.active=prod
+spring.profiles.active=dev
 
 spring.mandatory-file-encoding=UTF-8
 spring.http.encoding.charset=UTF-8