Skip to content
Permalink
Browse files

Merge pull request #5 from docker/4.2

4.2
  • Loading branch information
khazelton committed Oct 19, 2020
2 parents e52afeb + 64a6506 commit 319b40a77e0746bbe10487e6d097837a163cd19b
@@ -3,4 +3,4 @@ Timeout 2400
ProxyTimeout 2400
ProxyBadHeader Ignore

ProxyPass /midpoint ajp://localhost:9090/midpoint timeout=2400 retry=0
ProxyPass /midpoint ajp://localhost:9090/midpoint secret=s3cr3t timeout=2400 retry=0
@@ -3,4 +3,4 @@ Timeout 2400
ProxyTimeout 2400
ProxyBadHeader Ignore

ProxyPass /midpoint ajp://localhost:9090/midpoint timeout=2400 retry=0
ProxyPass /midpoint ajp://localhost:9090/midpoint secret=s3cr3t timeout=2400 retry=0
@@ -3,7 +3,7 @@ Timeout 2400
ProxyTimeout 2400
ProxyBadHeader Ignore

ProxyPass /midpoint ajp://localhost:9090/midpoint timeout=2400 retry=0
ProxyPass /midpoint ajp://localhost:9090/midpoint secret=s3cr3t timeout=2400 retry=0

<Location /midpoint>
AuthType shibboleth
@@ -52,6 +52,7 @@ java -Xmx$MP_MEM_MAX -Xms$MP_MEM_INIT -Dfile.encoding=UTF8 \
-Dspring.profiles.active="`$MP_DIR/active-spring-profiles`" \
-Dserver.tomcat.ajp.enabled=$AJP_ENABLED \
-Dserver.tomcat.ajp.port=$AJP_PORT \
-Dserver.tomcat.ajp.secret=s3cr3t \
-Dlogging.path=/tmp/logtomcat \
$MP_JAVA_OPTS \
-jar $MP_DIR/lib/midpoint.war &>/tmp/logmidpoint-console
@@ -1,4 +1,6 @@
FROM tier/midpoint:latest
# FROM tier/midpoint:latest

FROM docker/midpoint:latest

MAINTAINER info@evolveum.com

@@ -70,7 +70,7 @@
Default GUI authentication sequence.
</description>
<channel>
<channelId>http://midpoint.evolveum.com/xml/ns/public/model/channels-3#user</channelId>
<channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
<default>true</default>
<urlSuffix>gui-default</urlSuffix>
</channel>
@@ -86,7 +86,7 @@
Special GUI authentication sequence that is using just the internal user password.
</description>
<channel>
<channelId>http://midpoint.evolveum.com/xml/ns/public/model/channels-3#user</channelId>
<channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
<default>false</default>
<urlSuffix>emergency</urlSuffix>
</channel>
@@ -104,7 +104,7 @@
Authentication sequence for REST service.
</description>
<channel>
<channelId>http://midpoint.evolveum.com/xml/ns/public/model/channels-3#rest</channelId>
<channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#rest</channelId>
<default>true</default>
<urlSuffix>rest-default</urlSuffix>
</channel>
@@ -120,7 +120,7 @@
Authentication sequence for actuator.
</description>
<channel>
<channelId>http://midpoint.evolveum.com/xml/ns/public/model/channels-3#actuator</channelId>
<channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#actuator</channelId>
<default>true</default>
<urlSuffix>actuator-default</urlSuffix>
</channel>

Large diffs are not rendered by default.

@@ -10,7 +10,7 @@ else
# But if we need to incorporate interim changes to I2 distribution during
# midPoint development cycle, we can specify concrete file from "midpoint-tier"
# download directory by using its name (like "latest-stable").
MP_VERSION="4.1"
MP_VERSION="4.2-SNAPSHOT"
else
MP_VERSION=$tag
fi

0 comments on commit 319b40a

Please sign in to comment.
You can’t perform that action at this time.