Update woken-messages to 3.0.14, align config

Dockerfile

@@ -17,8 +17,14 @@ FROM hbpmip/java-base:11.0.1-1
 RUN apt-get update && apt-get install -y --no-install-recommends curl \
     && rm -rf /var/lib/apt/lists/* /tmp/*
 
-COPY docker/config/application.tmpl /config/application.tmpl
-COPY docker/README.md docker/run.sh /
+COPY docker/config/application.tmpl /opt/portal/config/application.tmpl
+COPY docker/README.md docker/run.sh /opt/portal/
+
+RUN addgroup portal \
+    && adduser --system --disabled-password --uid 1000 --ingroup portal portal \
+    && chmod +x /opt/portal/run.sh \
+    && ln -s /opt/portal/run.sh /run.sh \
+    && chown -R portal:portal /opt/portal
 
 COPY --from=java-build-env /project/target/portal-backend.jar /usr/share/jars/
 
@@ -26,6 +32,7 @@ ARG BUILD_DATE
 ARG VCS_REF
 ARG VERSION
 
+USER portal
 ENV APP_NAME="Portal backend" \
     APP_TYPE="Spring" \
     VERSION=$VERSION \
@@ -33,6 +40,7 @@ ENV APP_NAME="Portal backend" \
     CONTEXT_PATH="/services" \
     BUGSNAG_KEY="dff301aa15eb795a6d8b22b600586f77"
 
+WORKDIR /home/portal
 ENTRYPOINT ["/run.sh"]
 
 # 8080: Web service API, health checks on http://host:8080$CONTEXT_PATH/health

docker/config/application.tmpl

@@ -61,7 +61,7 @@ frontend:
 
 logging:
   level:
-    root: INFO
+    root: {{ default .Env.LOG_LEVEL "INFO" }}
     org:
       springframework:
         web: {{ default .Env.LOGGING_LEVEL_WEB "WARN" }}

docker/run.sh

 #!/bin/sh
 
-OPTS="-template /config/application.tmpl:/config/application.yml"
+OPTS="-template /opt/portal/config/application.tmpl:/opt/portal/config/application.yml"
 if [ ! -z "$PORTAL_DB_SERVER" ]; then
   OPTS="$OPTS -wait tcp://$PORTAL_DB_SERVER -timeout 60s"
 fi
@@ -24,4 +24,8 @@ if [ ! -z "$HTTPS_PROXY_PORT" ]; then
 fi
 JAVA_OPTIONS="$JAVA_OPTIONS -Daeron.term.buffer.length=100m"
 
+export SPRING_CONFIG_LOCATION=file:/opt/portal/config/application.yml
+
+cd /opt/portal
+
 dockerize $OPTS java ${JAVA_OPTIONS} -jar /usr/share/jars/portal-backend.jar

pom.xml

@@ -47,7 +47,7 @@
         <spring-data-jpa.version>1.10.11.RELEASE</spring-data-jpa.version>
         <spring-boot-starter-actuator.version>1.4.7.RELEASE</spring-boot-starter-actuator.version>
         <aspectjweaver.version>1.8.9</aspectjweaver.version>
-        <woken-messages.version>3.0.11</woken-messages.version>
+        <woken-messages.version>3.0.14</woken-messages.version>
         <javax-inject.version>1</javax-inject.version>
         <akka.version>2.5.22</akka.version>
         <spring-context.version>4.3.4.RELEASE</spring-context.version>
@@ -91,6 +91,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-actuator</artifactId>
             <version>${spring-boot-starter-actuator.version}</version>
+             <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.data</groupId>
@@ -100,10 +106,22 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-security</artifactId>
+             <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
+             <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
         </dependency>
         <dependency>
             <groupId>org.springframework.security.oauth</groupId>
@@ -135,6 +153,12 @@
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-test</artifactId>
+             <exclusions>
+                <exclusion>
+                    <groupId>org.springframework.boot</groupId>
+                    <artifactId>spring-boot-starter-logging</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>test</scope>
         </dependency>
         <dependency>

src/main/java/eu/hbp/mip/configuration/AkkaConfiguration.java

@@ -38,7 +38,7 @@ public class AkkaConfiguration {
     private final Config config;
 
     {
-        Config appConfig = ConfigFactory.parseResourcesAnySyntax("akka.conf")
+        Config appConfig = ConfigFactory.parseResourcesAnySyntax("application.conf")
                 .withFallback(ConfigFactory.parseResourcesAnySyntax("kamon.conf"));
         config = ConfigurationLoader.appendClusterConfiguration(appConfig).resolve();
     }

src/main/resources/akka.conf

-# Merged with defaults in woken-messages/reference.conf
-akka {
-  actor {
-    # provider = "cluster"
-  }
-
-  cluster {
-    roles = ["portal"]
-  }
-}

src/main/resources/application.conf

@@ -12,3 +12,9 @@ clustering {
   port = 4489
   port = ${?CLUSTER_PORT}
 }
+
+akka {
+  cluster {
+    roles = ["portal"]
+  }
+}