Skip to content

Commit a8f4241

Browse files
Jan Lieskovskypskopek
authored andcommitted
[CIAM-711] Update RH-SSO server overlay Zip artifact to
'RH-SSO 7.5.0.CR4' build Also add a note to 'modules.eap' module, about the logic, which is used for the inclusion of necessary EAP modules into the RH-SSO modules (since the approach changed due to OSBS container build system limitations) Drop vim-minimal RPM package Signed-off-by: Jan Lieskovsky <[email protected]>
1 parent 9b0afd5 commit a8f4241

File tree

2 files changed

+41
-5
lines changed

2 files changed

+41
-5
lines changed

modules/eap/module.yaml

Lines changed: 36 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,41 @@
11
schema_version: 1
22
name: eap
3-
description: "Installs base EAP to the image"
3+
description: "Installs base EAP to the image."
4+
5+
# NOTE:
6+
# The former listing of all specific EAP modules to be included into the RH-SSO
7+
# images was replaced with a single 'setup.eap.modules' CEKit module (therefore
8+
# one new layer in the resulting built container image).
9+
#
10+
# This single module combines / concatenates the functionality of all necessary
11+
# EAP modules, listed in the 'used-eap-modules-list.txt' in this directory, and
12+
# respects the internal dependencies between those modules. IOW the prerequisite
13+
# EAP modules are listed before the modules, which depend on them.
14+
#
15+
# This approach was chosen to avoid / overcome the 'max depth exceeded' OSBS
16+
# container build system error message, which got triggered previously by
17+
# performing an OSBS build, listing the necessary specific EAP modules
18+
# one-by-one. Due to the high number of EAP modules, needed to be included,
19+
# there were too many layers in the intermediary image, and the OSBS build
20+
# failed as a whole.
21+
#
22+
# IMPORTANT:
23+
# Do not change this approach!
24+
#
25+
# If you need to add / list additional EAP module, not present yet, append the
26+
# list of artifacts, environment variables, labels (basically all the
27+
# information listed in 'module.yaml' file of the new module, you want to add)
28+
# at the appropriate section of 'module.yaml' file of the existing
29+
# 'setup.eap.modules' module (for example append the labels from the new module
30+
# at the end of 'labels' section of 'setup.eap.modules' module, so the labels
31+
# from the new module are known to 'setup.eap.modules' module too.
32+
#
33+
# Moreover, copy the body of the configure script of that new module at the
34+
# appropriate place of the existing 'configure.sh' script. For each of the
35+
# already included configuration scripts, the 'configure.sh' script contains
36+
# the starting and ending comments, so the order in which the modules need
37+
# to be included, is preserved and respected.
38+
439
version: '1.0'
540

641
modules:

modules/eap/setup/eap/modules/module.yaml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,10 @@ packages:
1717
- python3-requests
1818
# RH-SSO add-on:
1919
# -------------
20-
# Add 'which', 'tree' & 'vim-minimal' RPM packages, which are handy for
20+
# Add 'which' & 'tree' RPM packages, which are handy for
2121
# issue debugging / troubleshooting purposes
2222
- which
2323
- tree
24-
- vim-minimal
2524
# End of RH-SSO add-on
2625
# --------------------
2726
ports:
@@ -34,14 +33,16 @@ artifacts:
3433
target: maven-repo.zip
3534
md5: 244700ed92787ad537e360069d9ca9b1
3635
url: http://$DOWNLOAD_SERVER/devel/candidates/jboss/eap/JBEAP-7.4.0.GA-CR3/jboss-eap-7.4.0.GA-CR3-image-builder-maven-repository.zip
36+
# CIAM-711: Update RH-SSO server overlay to 'RH-SSO 7.5.0.CR4' build
37+
- name: keycloak-server-overlay.zip
38+
md5: 4150d09f7bf5d524b4173f8850a06617
39+
# List remaining (particular RH-SSO build independent) artifacts below
3740
- name: txn-recovery-marker-jdbc-common
3841
target: txn-recovery-marker-jdbc-common-1.1.4.Final-redhat-00001.jar
3942
md5: 305aa706018b1089e5b82528b601541f
4043
- name: txn-recovery-marker-jdbc-hibernate5
4144
target: txn-recovery-marker-jdbc-hibernate5-1.1.4.Final-redhat-00001.jar
4245
md5: 99f2a2e68fb92273b8016e2b199fbd91
43-
- name: keycloak-server-overlay.zip
44-
md5: 487913da76566a0196d158aa6a7b0d99
4546

4647
# The following three Wildfly Galleon plug-in related artifacts are required
4748
# for a successful OSBS build.

0 commit comments

Comments
 (0)