Fix #608: Update Dockerfile (#611)

wultra · Jan 11, 2023 · 33fa4aa · 33fa4aa
1 parent eba5fba
commit 33fa4aa
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 1 deletion.
diff --git a/Dockerfile b/Dockerfile
@@ -4,7 +4,7 @@ LABEL maintainer="petr@wultra.com"
 # Prepare environment variables
 ENV JAVA_HOME /opt/java/openjdk
 ENV TOMCAT_HOME /usr/local/tomcat
-ENV WAR_VERSION 1.2.0
+ENV WAR_VERSION 1.4.0
 
 # Clear root context
 RUN rm -rf $TOMCAT_HOME/webapps/*

diff --git a/docker/enrollment-server.xml b/docker/enrollment-server.xml
@@ -36,5 +36,15 @@
 
     <!-- Enrollment Server Configuration -->
     <Parameter name="enrollment-server.mtoken.enabled" value="${ENROLLMENT_SERVER_MTOKEN_ENABLED}"/>
+    <Parameter name="enrollment-server.inbox.enabled" value="${ENROLLMENT_SERVER_INBOX_ENABLED}"/>
     <Parameter name="enrollment-server.activation-spawn.enabled" value="${ENROLLMENT_SERVER_ACTIVATION_SPAWN_ENABLED}"/>
+    <Parameter name="enrollment-server.mobile-application.ios.current-version" value="${ENROLLMENT_SERVER_MOBILE_APPLICATION_IOS_CURRENT_VERSION}"/>
+    <Parameter name="enrollment-server.mobile-application.ios.minimal-version" value="${ENROLLMENT_SERVER_MOBILE_APPLICATION_IOS_MINIMAL_VERSION}"/>
+    <Parameter name="enrollment-server.mobile-application.android.current-version" value="${ENROLLMENT_SERVER_MOBILE_APPLICATION_ANDROID_CURRENT_VERSION}"/>
+    <Parameter name="enrollment-server.mobile-application.android.minimal-version" value="${ENROLLMENT_SERVER_MOBILE_APPLICATION_ANDROID_MINIMAL_VERSION}"/>
+
+    <!--  Correlation HTTP Header Configuration  -->
+    <Parameter name="powerauth.service.correlation-header.enabled" value="${ENROLLMENT_SERVER_CORRELATION_HEADER_ENABLED}"/>
+    <Parameter name="powerauth.service.correlation-header.name" value="${ENROLLMENT_SERVER_CORRELATION_HEADER_NAME}"/>
+    <Parameter name="powerauth.service.correlation-header.value.validation-regexp" value="${ENROLLMENT_SERVER_CORRELATION_HEADER_VALUE_VALIDATION_REGEXP}"/>
 </Context>
diff --git a/docker/env.list.tmp b/docker/env.list.tmp
@@ -3,7 +3,15 @@ ENROLLMENT_SERVER_SECURITY_CLIENT_TOKEN=
 ENROLLMENT_SERVER_SECURITY_CLIENT_SECRET=
 ENROLLMENT_SERVER_PUSH_SERVER_URL=
 ENROLLMENT_SERVER_MTOKEN_ENABLED=true
+ENROLLMENT_SERVER_INBOX_ENABLED=true
 ENROLLMENT_SERVER_ACTIVATION_SPAWN_ENABLED=false
+ENROLLMENT_SERVER_MOBILE_APPLICATION_IOS_CURRENT_VERSION=2.0.0
+ENROLLMENT_SERVER_MOBILE_APPLICATION_IOS_MINIMAL_VERSION=1.5.4
+ENROLLMENT_SERVER_MOBILE_APPLICATION_ANDROID_CURRENT_VERSION=1.5.4
+ENROLLMENT_SERVER_MOBILE_APPLICATION_ANDROID_MINIMAL_VERSION=1.4.0
+ENROLLMENT_SERVER_CORRELATION_HEADER_ENABLED=false
+ENROLLMENT_SERVER_CORRELATION_HEADER_NAME=X-Correlation-ID
+ENROLLMENT_SERVER_CORRELATION_HEADER_VALUE_VALIDATION_REGEXP=[a-zA-Z0-9\\-]{8,1024}
 ENROLLMENT_SERVER_DATASOURCE_URL=
 ENROLLMENT_SERVER_DATASOURCE_USERNAME=
 ENROLLMENT_SERVER_DATASOURCE_PASSWORD=

diff --git a/docs/Configuration-Properties.md b/docs/Configuration-Properties.md
@@ -34,7 +34,12 @@ The Enrollment Server uses the following public configuration properties:
 | Property | Default | Note |
 |---|---|---|
 | `enrollment-server.mtoken.enabled` | `true` | Publishing of Mobile Token endpoints can be enabled or disabled using this property. |
+| `enrollment-server.inbox.enabled` | `true` | Publishing of Inbox endpoints can be enabled or disabled using this property. |
 | `enrollment-server.activation-spawn.enabled` | `false` | The activation spawn functionality can be enabled or disabled using this property. |
+| `enrollment-server.mobile-application.ios.current-version` | `2.0.0` | Current version of iOS mobile app. |
+| `enrollment-server.mobile-application.ios.minimal-version` | `1.5.4` | Optional minimal version of iOS mobile app. | 
+| `enrollment-server.mobile-application.android.current-version` | `1.5.4` | Current version of Android mobile app. |
+| `enrollment-server.mobile-application.android.minimal-version` | `1.4.0` | Optional minimal version of android mobile app. |
 
 ## Correlation HTTP Header Configuration