Externalise configuration

src/docker/build/Dockerfile

@@ -6,9 +6,8 @@ RUN apt-get update && apt-get install -y wget
 RUN wget https://github.com/jwilder/dockerize/releases/download/v0.2.0/dockerize-linux-amd64-v0.2.0.tar.gz
 RUN tar -C /usr/local/bin -xzvf dockerize-linux-amd64-v0.2.0.tar.gz
 
-RUN mkdir -p /opt/portal/ \
-    && echo -n "#!/bin/sh\n/usr/bin/java -DconfigFile=/opt/portal/config/portal.properties -jar /opt/portal/lib/mip.jar" > /opt/portal/mip.sh \
-    && chmod +x /opt/portal/mip.sh
+COPY mip.sh /opt/portal/
+RUN chmod +x /opt/portal/mip.sh
 EXPOSE 8080
 
 VOLUME /opt/portal/config/
@@ -16,4 +15,4 @@ VOLUME /opt/portal/lib/
 
 WORKDIR /opt/portal/
 
-CMD ["/usr/local/bin/dockerize", "-wait", "tcp://portaldb:5432", "/opt/portal/mip.sh"]
+CMD ["/usr/local/bin/dockerize", "-timeout", "240s", "-wait", "tcp://portaldb:5432", "/opt/portal/mip.sh"]

src/docker/build/mip.sh

+#!/usr/bin/env bash
+
+/usr/bin/java -DconfigFile=/opt/portal/config/application.yml -jar /opt/portal/lib/mip.jar

src/main/resources/application.yml → src/test/docker/application.yml

+# Configuration for the portal running inside a Docker container for development
+
+connection:
+  url: "jdbc:postgresql://portaldb:5432/postgres"
+  username: "postgres"
+  password: "test"
+
+security:
+  enabled: false
+
 hbp:
   client:
     clientId: 996f97c5-a3ca-460e-b18b-00df3e2be89a
@@ -19,4 +29,8 @@ spring:
     chain:
       enabled: true
 
+server:
+  contextPath: /services
+  port: 8080
+  use-forward-headers: true
 

src/test/docker/portal.properties

-# Configuration for the portal running inside a Docker container for development
-
-connection.url="jdbc:postgresql://portaldb:5432/postgres"
-connection.username="postgres"
-connection.password="test"
-
-security.enabled=false