Skip to content

Commit 4963df4

Browse files
luck3yluck3y
authored
Merge pull request #264 from luck3y/CLOUD-4107
[CLOUD-4107] OpenJDK 17 images
2 parents 9cb0cec + 60dc370 commit 4963df4

File tree

58 files changed

+1352
-85
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

58 files changed

+1352
-85
lines changed

‎jboss/container/config/7.4/ee-elytron/standalone-openshift.xml‎

Lines changed: 563 additions & 0 deletions
Large diffs are not rendered by default.

‎jboss/container/eap/galleon/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/feature_groups/os-undertow-elytron.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<feature-group-spec name="os-undertow-elytron" xmlns="urn:jboss:galleon:feature-group:1.0">
3+
<feature-group name="undertow-elytron-security"/>
4+
<feature spec="subsystem.undertow">
5+
<feature spec="subsystem.undertow.server">
6+
<param name="server" value="default-server" />
7+
<feature spec="subsystem.undertow.server.host">
8+
<param name="host" value="default-host" />
9+
<feature spec="subsystem.undertow.server.host.setting.http-invoker">
10+
<unset param="security-realm"/>
11+
<param name="http-authentication-factory" value="application-http-authentication"/>
12+
</feature>
13+
</feature>
14+
</feature>
15+
</feature>
16+
<feature-group name="os-undertow"/>
17+
</feature-group-spec>

‎jboss/container/eap/galleon/config/ee/artifacts/opt/jboss/container/eap/galleon/definitions/fat-default-server/provisioning.xml‎ renamed to ‎jboss/container/eap/galleon/config/ee-common/artifacts/opt/jboss/container/eap/galleon/definitions/fat-default-server/provisioning.xml‎

File renamed without changes.

‎jboss/container/eap/galleon/config/ee/artifacts/opt/jboss/container/eap/galleon/definitions/slim-default-server/provisioning.xml‎ renamed to ‎jboss/container/eap/galleon/config/ee-common/artifacts/opt/jboss/container/eap/galleon/definitions/slim-default-server/provisioning.xml‎

File renamed without changes.

‎jboss/container/eap/galleon/config/ee-common/configure.sh‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
#!/bin/sh
2+
# Configure module
3+
set -e
4+
5+
SCRIPT_DIR=$(dirname $0)
6+
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7+
8+
chown -R jboss:root $SCRIPT_DIR
9+
chmod -R ug+rwX $SCRIPT_DIR
10+
11+
pushd ${ARTIFACTS_DIR}
12+
cp -pr * /
13+
popd

‎jboss/container/eap/galleon/config/ee-common/module.yaml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
schema_version: 1
2+
name: jboss.container.eap.galleon.config.ee.common
3+
version: '1.0'
4+
description: Install Galleon ee default configuration.
5+
6+
execute:
7+
- script: configure.sh

‎jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/configs/standalone/standalone.xml/config.xml‎

Lines changed: 107 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,107 @@
1+
<?xml version="1.0" ?>
2+
3+
<config xmlns="urn:jboss:galleon:config:1.0" name="standalone.xml" model="standalone">
4+
<layers>
5+
<!-- we already have all required in default config -->
6+
<!-- Although logically correct, galleon doesn't actually support excluding from model -->
7+
<!-- This is harmless, keeping the exclusion commented for reference until GAL-308 is fixed -->
8+
<!--<exclude name="operator-required"/>-->
9+
<include name="amq6-rar"/>
10+
</layers>
11+
12+
<!-- No sso packages for JDK17 techpreview -->
13+
<!-- <feature-group name="sso"/> -->
14+
15+
<!-- JDK 17 -->
16+
<exclude feature-id="core-service.management.security-realm:security-realm=ApplicationRealm"/>
17+
<exclude feature-id="core-service.management.security-realm:security-realm=ManagementRealm"/>
18+
<feature spec="subsystem.batch-jberet">
19+
<param name="security-domain" value="ApplicationDomain"/>
20+
</feature>
21+
<!-- JDK 17, remoting secured with elytron -->
22+
<feature spec="subsystem.remoting.http-connector">
23+
<param name="http-connector" value="http-remoting-connector"/>
24+
<unset param="security-realm"/>
25+
<param name="sasl-authentication-factory" value="application-sasl-authentication"/>
26+
</feature>
27+
28+
<!-- management -->
29+
<!-- JDK 17, do not exclude identity -->
30+
<!--<exclude spec="core-service.management.access.identity"/>-->
31+
<feature spec="core-service.management.management-interface.http-interface">
32+
<param name="socket-binding" value="management-http"/>
33+
<unset param="http-authentication-factory"/>
34+
<feature spec="core-service.management.management-interface.http-interface.http-upgrade">
35+
<param name="sasl-authentication-factory" value="management-sasl-authentication"/>
36+
</feature>
37+
</feature>
38+
<exclude spec="subsystem.core-management"/>
39+
<feature-group name="os-management"/>
40+
41+
<!-- messaging -->
42+
<feature spec="subsystem.messaging-activemq"/>
43+
<feature-group name="os-messaging"/>
44+
45+
<!-- logging -->
46+
<exclude feature-id="subsystem.logging.pattern-formatter:pattern-formatter=PATTERN"/>
47+
<exclude feature-id="subsystem.logging.periodic-rotating-file-handler:periodic-rotating-file-handler=FILE"/>
48+
<feature-group name="os-logging"/>
49+
50+
<!-- jberet We can't remove it... needs a default job repository -->
51+
<!--<feature spec="subsystem.batch-jberet">
52+
<unset param="default-job-repository"/>
53+
</feature>-->
54+
55+
<!-- datasources -->
56+
<!-- We are not keeping the ExampleDS in the config -->
57+
<exclude feature-id="subsystem.datasources.data-source:data-source=ExampleDS"/>
58+
<feature spec="subsystem.ee.service.default-bindings">
59+
<unset param="datasource"/>
60+
</feature>
61+
62+
<!-- ejb3 -->
63+
<feature spec="subsystem.ejb3">
64+
<param name="default-sfsb-cache" value="distributable"/>
65+
<param name="default-sfsb-passivation-disabled-cache" value="simple"/>
66+
<param name="default-mdb-instance-pool" value="mdb-strict-max-pool"/>
67+
<param name="default-resource-adapter-name" value="${ejb.resource-adapter-name:activemq-ra.rar}"/>
68+
<!-- JDK 17, elytron security -->
69+
<feature spec="subsystem.ejb3.application-security-domain">
70+
<param name="application-security-domain" value="other"/>
71+
<param name="security-domain" value="ApplicationDomain"/>
72+
</feature>
73+
</feature>
74+
<exclude spec="subsystem.ejb3.service.timer-service"/>
75+
76+
<!-- elytron -->
77+
<feature-group name="os-elytron"/>
78+
79+
<!-- clustering -->
80+
<exclude spec="subsystem.infinispan"/>
81+
<exclude spec="subsystem.distributable-web"/>
82+
<feature-group name="os-clustering"/>
83+
84+
<!-- legacy security -->
85+
<!-- JDK 17 excluded fully -->
86+
<exclude feature-id="subsystem.security.security-domain:security-domain=jaspitest"/>
87+
<exclude feature-id="subsystem.security.security-domain:security-domain=other"/>
88+
<exclude feature-id="subsystem.security.security-domain:security-domain=jboss-web-policy"/>
89+
<exclude feature-id="subsystem.security.security-domain:security-domain=jboss-ejb-policy"/>
90+
<exclude spec="subsystem.security"/>
91+
<!-- transactions -->
92+
<feature-group name="tx-recovery"/>
93+
94+
<!-- undertow -->
95+
<exclude feature-id="subsystem.undertow.server.https-listener:server=default-server,https-listener=https"/>
96+
97+
<!-- web-services -->
98+
<feature spec="subsystem.webservices">
99+
<param name="modify-wsdl-address" value="true"/>
100+
<param name="wsdl-host" value="jbossws.undefined.host"/>
101+
</feature>
102+
103+
<feature-group name="os-socket"/>
104+
105+
<feature-group name="os-undertow-elytron"/>
106+
107+
</config>

‎jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/application-security-realm/layer-spec.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" ?>
2+
<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="application-security-realm">
3+
<exclude feature-id="core-service.management.security-realm:security-realm=ApplicationRealm"/>
4+
</layer-spec>

‎jboss/container/eap/galleon/config/ee-elytron/artifacts/opt/jboss/container/eap/galleon/eap-s2i-galleon-pack/src/main/resources/layers/standalone/management-security-realm/layer-spec.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" ?>
2+
<layer-spec xmlns="urn:jboss:galleon:layer-spec:1.0" name="management-security-realm">
3+
<exclude feature-id="core-service.management.security-realm:security-realm=ManagementRealm"/>
4+
</layer-spec>

‎jboss/container/eap/galleon/config/ee-elytron/configure.sh‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
#!/bin/sh
2+
# Configure module
3+
set -e
4+
5+
SCRIPT_DIR=$(dirname $0)
6+
ARTIFACTS_DIR=${SCRIPT_DIR}/artifacts
7+
8+
chown -R jboss:root $SCRIPT_DIR
9+
chmod -R ug+rwX $SCRIPT_DIR
10+
11+
pushd ${ARTIFACTS_DIR}
12+
cp -pr * /
13+
popd
14+
15+
# Remove sso content for JDK17 tech preview image. To be removed when supported.
16+
rm "${GALLEON_FP_PATH}/src/main/resources/feature_groups/sso.xml"
17+
rm -r "${GALLEON_FP_PATH}/src/main/resources/layers/standalone/sso"

0 commit comments

Comments
 (0)