Skip to content

Commit

Permalink
upgrade to 4.7
Browse files Browse the repository at this point in the history
  • Loading branch information
Slavek Licehammer committed Jul 25, 2023
1 parent a8be04b commit 286f307
Show file tree
Hide file tree
Showing 12 changed files with 149 additions and 62 deletions.
6 changes: 3 additions & 3 deletions Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@ FROM tier/shibboleth_sp:3.3.0_12022021

MAINTAINER info@evolveum.com

RUN rpm --import http://repos.azulsystems.com/RPM-GPG-KEY-azulsystems
RUN curl -o /etc/yum.repos.d/zulu.repo https://repos.azulsystems.com/rhel/zulu.repo
RUN rpm --import https://yum.corretto.aws/corretto.key
RUN curl -L -o /etc/yum.repos.d/corretto.repo https://yum.corretto.aws/corretto.repo
RUN yum -y update
RUN yum -y install \
zulu-11 \
java-17-amazon-corretto-devel \
cron \
supervisor \
libcurl \
Expand Down
2 changes: 1 addition & 1 deletion common.bash
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
maintainer="i2incommon"
imagename="midpoint"
tag="4.6"
tag="4.7"
4 changes: 2 additions & 2 deletions demo/grouper/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ services:
- CREATE_NEW_DATABASE=if_needed

data_init:
image: i2incommon/midpoint:${tag:-4.6}
image: i2incommon/midpoint:${tag:-4.7}
command: >
bash -c "
chmod 777 /opt/mp-pw/ ;
Expand Down Expand Up @@ -229,7 +229,7 @@ services:
build:
context: ./midpoint_server/
args:
tag: ${tag:-4.6}
tag: ${tag:-4.7}
depends_on:
- data_init
- midpoint_data
Expand Down
2 changes: 1 addition & 1 deletion demo/grouper/midpoint_server/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG tag=4.6
ARG tag=4.7

FROM i2incommon/midpoint:${tag}

Expand Down
31 changes: 10 additions & 21 deletions ...erver/container_files/mp-home/post-initial-objects/securityPolicy/000-security-policy.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,13 @@
<authentication>
<modules>
<loginForm>
<name>loginForm</name>
<description>Internal username/password authentication, default user password, login form</description>
<identifier>loginForm</identifier>
</loginForm>
<httpBasic>
<name>httpBasic</name>
<description>Internal username/password authentication, using HTTP basic auth</description>
<identifier>httpBasic</identifier>
</httpBasic>
<saml2>
<name>mySamlSso</name>
<identifier>mySamlSso</identifier>
<description>My internal enterprise SAML-based SSO system.</description>
<serviceProvider>
<entityId>midpointdemo-shibboleth</entityId>
Expand Down Expand Up @@ -45,24 +43,21 @@
</saml2>
</modules>
<sequence>
<name>admin-gui-default</name>
<identifier>admin-gui-default</identifier>
<displayName>Default gui sequence</displayName>
<description>
Default GUI authentication sequence.
</description>
<channel>
<default>true</default>
<channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#user</channelId>
<urlSuffix>gui-default</urlSuffix>
</channel>
<module>
<name>loginForm</name>
<identifier>loginForm</identifier>
<order>1</order>
<necessity>sufficient</necessity>
</module>
</sequence>
<sequence>
<name>admin-gui-emergency</name>
<identifier>admin-gui-emergency</identifier>
<description>
Special GUI authentication sequence that is using just the internal user password.
</description>
Expand All @@ -80,33 +75,27 @@
</module>
</sequence>
<sequence>
<name>rest-default</name>
<description>
Authentication sequence for REST service.
</description>
<identifier>rest-default</identifier>
<channel>
<default>true</default>
<channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#rest</channelId>
<urlSuffix>rest-default</urlSuffix>
</channel>
<module>
<name>httpBasic</name>
<identifier>httpBasic</identifier>
<order>1</order>
<necessity>sufficient</necessity>
</module>
</sequence>
<sequence>
<name>actuator-default</name>
<description>
Authentication sequence for actuator.
</description>
<identifier>actuator-default</identifier>
<channel>
<default>true</default>
<channelId>http://midpoint.evolveum.com/xml/ns/public/common/channels-3#actuator</channelId>
<urlSuffix>actuator-default</urlSuffix>
</channel>
<module>
<name>httpBasic</name>
<identifier>httpBasic</identifier>
<order>1</order>
<necessity>sufficient</necessity>
</module>
Expand Down
122 changes: 114 additions & 8 deletions ...iner_files/mp-home/post-initial-objects/systemConfigurations/010-system-configuration.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -419,8 +419,7 @@
<help>PageSelfDashboard.profile.description</help>
<cssClass>col-md-3</cssClass>
<icon>
<cssClass>fa fa-user</cssClass>
<color>green</color>
<cssClass>bg-green fa fa-user</cssClass>
</icon>
</display>
<panelType>linkWidget</panelType>
Expand All @@ -443,8 +442,7 @@
<help>PageSelfDashboard.credentials.description</help>
<cssClass>col-md-3</cssClass>
<icon>
<cssClass>fa fa-shield-alt</cssClass>
<color>blue</color>
<cssClass>bg-blue fa fa-shield-alt</cssClass>
</icon>
</display>
<panelType>linkWidget</panelType>
Expand All @@ -466,8 +464,7 @@
</label>
<cssClass>col-md-3</cssClass>
<icon>
<cssClass>fa fa-database</cssClass>
<color>purple</color>
<cssClass>bg-purple fa fa-database</cssClass>
</icon>
</display>
<panelType>linkWidget</panelType>
Expand All @@ -489,8 +486,7 @@
</label>
<cssClass>col-md-3</cssClass>
<icon>
<cssClass>fa fa-user</cssClass>
<color>red</color>
<cssClass>bg-red fa fa-user</cssClass>
</icon>
</display>
<panelType>linkWidget</panelType>
Expand Down Expand Up @@ -589,6 +585,26 @@
</collectionRef>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>correlation-case-view</identifier>
<display>
<label>Correlations</label> <!-- "Correlation cases" is too long for the menu -->
<!-- We need to explicitly specify plural label here. Otherwise it will be overwritten by a plural label from archetype. -->
<pluralLabel>
<orig>All correlations</orig>
<translation>
<key>AllCorrelations.title</key>
</translation>
</pluralLabel>
<singularLabel>Correlation</singularLabel>
<tooltip>Correlation cases</tooltip>
</display>
<displayOrder>1040</displayOrder>
<type>CaseType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000345" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>reconciliation-tasks-view</identifier>
<refreshInterval>30</refreshInterval>
Expand Down Expand Up @@ -860,6 +876,50 @@
<collectionRef oid="00000000-0000-0000-0000-000000000171" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>application-role</identifier>
<applicableForOperation>add</applicableForOperation>
<type>RoleType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000328" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>business-role</identifier>
<applicableForOperation>add</applicableForOperation>
<type>RoleType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000321" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>application</identifier>
<display>
<label>Application.panel.applications</label>
</display>
<type>ServiceType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000329" relation="org:default" type="c:ArchetypeType"/>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>event-mark</identifier>
<type>c:MarkType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000700" relation="org:default" type="c:ArchetypeType">
<!-- Event mark -->
</collectionRef>
</collection>
</objectCollectionView>
<objectCollectionView>
<identifier>object-mark</identifier>
<type>c:MarkType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0000-000000000701" relation="org:default" type="c:ArchetypeType">
<!-- Object mark -->
</collectionRef>
</collection>
</objectCollectionView>
</objectCollectionViews>
<objectDetails>
<objectDetailsPage>
Expand Down Expand Up @@ -988,6 +1048,30 @@
</container>
</panel>
</objectDetailsPage>
<objectDetailsPage>
<type>c:UserType</type>
<panel>
<identifier>applications</identifier>
<display>
<label>Application.panel.applications</label>
</display>
<panelType>roleMemberships</panelType>
<listView>
<identifier>applications</identifier>
<type>c:ServiceType</type>
<collection>
<collectionRef oid="00000000-0000-0000-0001-000000000017" type="c:ObjectCollectionType"/>
</collection>
<searchBoxConfiguration>
<objectTypeConfiguration>
<visibility>hidden</visibility>
<defaultValue>ServiceType</defaultValue>
<supportedTypes>ServiceType</supportedTypes>
</objectTypeConfiguration>
</searchBoxConfiguration>
</listView>
</panel>
</objectDetailsPage>
<resourceDetailsPage>
<panel>
<identifier>rw-type-basic</identifier>
Expand Down Expand Up @@ -1287,6 +1371,12 @@
<item>
<path>connectorConfiguration/configurationProperties/port</path>
</item>
<item>
<path>connectorConfiguration/configurationProperties/host</path>
</item>
<item>
<path>connectorConfiguration/configurationProperties/database</path>
</item>
</container>
<container>
<visibility>hidden</visibility>
Expand Down Expand Up @@ -1327,6 +1417,14 @@
<item>
<path>connectorConfiguration/configurationProperties/connectionSecurity</path>
</item>
<item>
<path>connectorConfiguration/configurationProperties/bindDn</path>
<visibility>visible</visibility>
</item>
<item>
<path>connectorConfiguration/configurationProperties/bindPassword</path>
<visibility>visible</visibility>
</item>
</container>
<container>
<visibility>hidden</visibility>
Expand Down Expand Up @@ -1367,6 +1465,14 @@
<item>
<path>connectorConfiguration/configurationProperties/connectionSecurity</path>
</item>
<item>
<path>connectorConfiguration/configurationProperties/bindDn</path>
<visibility>visible</visibility>
</item>
<item>
<path>connectorConfiguration/configurationProperties/bindPassword</path>
<visibility>visible</visibility>
</item>
</container>
<container>
<visibility>hidden</visibility>
Expand Down
4 changes: 2 additions & 2 deletions demo/shibboleth/docker-compose-tests.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ version: "3.3"

services:
data_init:
image: i2incommon/midpoint:${tag:-4.6}
image: i2incommon/midpoint:${tag:-4.7}
command: >
bash -c "
chmod 777 /opt/mp-pw/ ;
Expand Down Expand Up @@ -61,7 +61,7 @@ services:
build:
context: ./midpoint_server/
args:
tag: ${tag:-4.6}
tag: ${tag:-4.7}
command: /usr/local/bin/startup.sh
depends_on:
- data_init
Expand Down
4 changes: 2 additions & 2 deletions demo/shibboleth/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.3"

services:
data_init:
image: i2incommon/midpoint:${tag:-4.6}
image: i2incommon/midpoint:${tag:-4.7}
command: >
bash -c "
chmod 777 /opt/mp-pw/ ;
Expand Down Expand Up @@ -58,7 +58,7 @@ services:
build:
context: ./midpoint_server/
args:
tag: ${tag:-4.6}
tag: ${tag:-4.7}
command: /usr/local/bin/startup.sh
depends_on:
- data_init
Expand Down
2 changes: 1 addition & 1 deletion demo/shibboleth/midpoint_server/Dockerfile
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG tag=4.6
ARG tag=4.7

FROM i2incommon/midpoint:${tag}

Expand Down
Loading

0 comments on commit 286f307

Please sign in to comment.