Skip to content

Commit 9cb056a

Browse files
lgrateaulgrateau
authored
Merge pull request #272 from ODMDev/vnext-release
Vnext release
2 parents 6e54884 + 94a7b39 commit 9cb056a

32 files changed

+282
-59
lines changed

‎.env

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# ODM product version
2-
ODMVERSION=8.10.4
2+
ODMVERSION=8.10.5.1
33

44
# ODM database schema version
55
ODMDBVERSION=8.10.next
@@ -14,7 +14,7 @@ REPOSITORY=ibmcom
1414
PREFIXIMAGE=odm
1515

1616
# Liberty Version
17-
FROMLIBERTY=ibmcom/websphere-liberty:20.0.0.6-kernel-java8-ibmjava-ubi
17+
FROMLIBERTY=ibmcom/websphere-liberty:21.0.0.3-kernel-java8-ibmjava-ubi
1818

1919
# Postgres Version
2020
FROMPOSTGRES=postgres:12

‎.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ env:
1616
secure: MR+cKxC7Big1DcXqbimRt4BLdUyIz7Bh8/gxtjmpJ+vr046jVec1mlnQyRtPAAAlS8W1OZrEuY9YzYl4Gq5s7dieEk/ERUwuQeUTXkg3jzFdC05JbcYWhDlsjLbZuLjVamH2wcXnf3VpJDZ/lqM1Tn2wTGkn5cqT8UdLC3qRDgRyKCT8mnKoIEkw2Bx8YyRZ2FR2xg8UjDXRnNf5El0jJCnK5d82YumOeMYN7PUBRkyypv/obluE1dcZ1gbFdj3ln7s752+Rjmh0R3+GvV67pApv0HlS6ceDETp+ynh2tDFCuLJtevJTfwTW2KOST9Mo53vuBSFpi+Ts8Yb08rYpK6eg4zbje3NSLsLPoKLlHSQSAWsuzrBGk4KlnjdzcUmB+RgDbRFrz3Vo+vhQfG+4qdmX4mNIE9/OP4s6BaLagt6iYmJDlXj7rOky9EbttxXYUJaw5wtkBafYG4bJjVaqJk0KJRrYIArTRTibKcH9U+hrJeLbepHMLtEAP930I7S+TAPQ70Zi0lnJrvAf/Cm7mT9Js+Uah3hijkrOu1NjHe2d8jF8kNmhHbIckhvNwkXqLbd58ypjDBVABGIHHUtmX3mVCrfkCyCFVJqCzPw1ZzlLWZ4qi90WhsAnGL0ySI3sp3vqVdZ3gqFs7QzIMPtLXUOgDji62W3qZopgK2NdWkI=
1717
before_install:
1818
- mkdir -p $HOME/.cache
19-
19+
- echo "${REGISTRY_PASSWORD}" | docker login docker.io --username ${REGISTRY_USER} --password-stdin
2020
- curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add -
2121
- sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable"
2222
- sudo apt-get update

‎common/config/authOidc/resAdministrators.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<user name="resAdmUser1" access-id="${odm.resAdministrators.user1}"/>
22
<user name="resAdmUser2" access-id="${odm.resAdministrators.user2}"/>
33
<user name="resAdmUser3" access-id="${odm.resAdministrators.user3}"/>
4+
<user name="resAdmUser4" access-id="${odm.resAdministrators.user4}"/>
5+
<user name="resAdmUser5" access-id="${odm.resAdministrators.user5}"/>
6+
<user name="resAdmUser6" access-id="${odm.resAdministrators.user6}"/>
47
<group name="resAdmGroup1" access-id="${odm.resAdministrators.group1}"/>
58
<group name="resAdmGroup2" access-id="${odm.resAdministrators.group2}"/>
69
<group name="resAdmGroup3" access-id="${odm.resAdministrators.group3}"/>
10+
<group name="resAdmGroup4" access-id="${odm.resAdministrators.group4}"/>
11+
<group name="resAdmGroup5" access-id="${odm.resAdministrators.group5}"/>
12+
<group name="resAdmGroup6" access-id="${odm.resAdministrators.group6}"/>

‎common/config/authOidc/resDeployers.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<user name="resDepUser1" access-id="${odm.resDeployers.user1}"/>
22
<user name="resDepUser2" access-id="${odm.resDeployers.user2}"/>
33
<user name="resDepUser3" access-id="${odm.resDeployers.user3}"/>
4+
<user name="resDepUser4" access-id="${odm.resDeployers.user4}"/>
5+
<user name="resDepUser5" access-id="${odm.resDeployers.user5}"/>
6+
<user name="resDepUser6" access-id="${odm.resDeployers.user6}"/>
47
<group name="resDepGroup1" access-id="${odm.resDeployers.group1}"/>
58
<group name="resDepGroup2" access-id="${odm.resDeployers.group2}"/>
69
<group name="resDepGroup3" access-id="${odm.resDeployers.group3}"/>
10+
<group name="resDepGroup4" access-id="${odm.resDeployers.group4}"/>
11+
<group name="resDepGroup5" access-id="${odm.resDeployers.group5}"/>
12+
<group name="resDepGroup6" access-id="${odm.resDeployers.group6}"/>

‎common/config/authOidc/resExecutors.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<user name="resExeUser1" access-id="${odm.resExecutors.user1}"/>
22
<user name="resExeUser2" access-id="${odm.resExecutors.user2}"/>
33
<user name="resExeUser3" access-id="${odm.resExecutors.user3}"/>
4+
<user name="resExeUser4" access-id="${odm.resExecutors.user4}"/>
5+
<user name="resExeUser5" access-id="${odm.resExecutors.user5}"/>
6+
<user name="resExeUser6" access-id="${odm.resExecutors.user6}"/>
47
<group name="resExeGroup1" access-id="${odm.resExecutors.group1}"/>
58
<group name="resExeGroup2" access-id="${odm.resExecutors.group2}"/>
69
<group name="resExeGroup3" access-id="${odm.resExecutors.group3}"/>
10+
<group name="resExeGroup4" access-id="${odm.resExecutors.group4}"/>
11+
<group name="resExeGroup5" access-id="${odm.resExecutors.group5}"/>
12+
<group name="resExeGroup6" access-id="${odm.resExecutors.group6}"/>

‎common/config/authOidc/resMonitors.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<user name="resMonUser1" access-id="${odm.resMonitors.user1}"/>
22
<user name="resMonUser2" access-id="${odm.resMonitors.user2}"/>
33
<user name="resMonUser3" access-id="${odm.resMonitors.user3}"/>
4+
<user name="resMonUser4" access-id="${odm.resMonitors.user4}"/>
5+
<user name="resMonUser5" access-id="${odm.resMonitors.user5}"/>
6+
<user name="resMonUser6" access-id="${odm.resMonitors.user6}"/>
47
<group name="resMonGroup1" access-id="${odm.resMonitors.group1}"/>
58
<group name="resMonGroup2" access-id="${odm.resMonitors.group2}"/>
69
<group name="resMonGroup3" access-id="${odm.resMonitors.group3}"/>
10+
<group name="resMonGroup4" access-id="${odm.resMonitors.group4}"/>
11+
<group name="resMonGroup5" access-id="${odm.resMonitors.group5}"/>
12+
<group name="resMonGroup6" access-id="${odm.resMonitors.group6}"/>

‎common/config/authOidc/rtsAdministrators.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<user name="rtsAdmUser1" access-id="${odm.rtsAdministrators.user1}"/>
22
<user name="rtsAdmUser2" access-id="${odm.rtsAdministrators.user2}"/>
33
<user name="rtsAdmUser3" access-id="${odm.rtsAdministrators.user3}"/>
4+
<user name="rtsAdmUser4" access-id="${odm.rtsAdministrators.user4}"/>
5+
<user name="rtsAdmUser5" access-id="${odm.rtsAdministrators.user5}"/>
6+
<user name="rtsAdmUser6" access-id="${odm.rtsAdministrators.user6}"/>
47
<group name="rtsAdmGroup1" access-id="${odm.rtsAdministrators.group1}"/>
58
<group name="rtsAdmGroup2" access-id="${odm.rtsAdministrators.group2}"/>
69
<group name="rtsAdmGroup3" access-id="${odm.rtsAdministrators.group3}"/>
10+
<group name="rtsAdmGroup4" access-id="${odm.rtsAdministrators.group4}"/>
11+
<group name="rtsAdmGroup5" access-id="${odm.rtsAdministrators.group5}"/>
12+
<group name="rtsAdmGroup6" access-id="${odm.rtsAdministrators.group6}"/>

‎common/config/authOidc/rtsConfigManagers.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<user name="rtsCfgUser1" access-id="${odm.rtsConfigManagers.user1}"/>
22
<user name="rtsCfgUser2" access-id="${odm.rtsConfigManagers.user2}"/>
33
<user name="rtsCfgUser3" access-id="${odm.rtsConfigManagers.user3}"/>
4+
<user name="rtsCfgUser4" access-id="${odm.rtsConfigManagers.user4}"/>
5+
<user name="rtsCfgUser5" access-id="${odm.rtsConfigManagers.user5}"/>
6+
<user name="rtsCfgUser6" access-id="${odm.rtsConfigManagers.user6}"/>
47
<group name="rtsCfgGroup1" access-id="${odm.rtsConfigManagers.group1}"/>
58
<group name="rtsCfgGroup2" access-id="${odm.rtsConfigManagers.group2}"/>
69
<group name="rtsCfgGroup3" access-id="${odm.rtsConfigManagers.group3}"/>
10+
<group name="rtsCfgGroup4" access-id="${odm.rtsConfigManagers.group4}"/>
11+
<group name="rtsCfgGroup5" access-id="${odm.rtsConfigManagers.group5}"/>
12+
<group name="rtsCfgGroup6" access-id="${odm.rtsConfigManagers.group6}"/>

‎common/config/authOidc/rtsInstallers.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
<user name="rtsInstUser1" access-id="${odm.rtsInstallers.user1}"/>
22
<user name="rtsInstUser2" access-id="${odm.rtsInstallers.user2}"/>
33
<user name="rtsInstUser3" access-id="${odm.rtsInstallers.user3}"/>
4+
<user name="rtsInstUser4" access-id="${odm.rtsInstallers.user4}"/>
5+
<user name="rtsInstUser5" access-id="${odm.rtsInstallers.user5}"/>
6+
<user name="rtsInstUser6" access-id="${odm.rtsInstallers.user6}"/>
47
<group name="rtsInstGroup1" access-id="${odm.rtsInstallers.group1}"/>
58
<group name="rtsInstGroup2" access-id="${odm.rtsInstallers.group2}"/>
69
<group name="rtsInstGroup3" access-id="${odm.rtsInstallers.group3}"/>
10+
<group name="rtsInstGroup4" access-id="${odm.rtsInstallers.group4}"/>
11+
<group name="rtsInstGroup5" access-id="${odm.rtsInstallers.group5}"/>
12+
<group name="rtsInstGroup6" access-id="${odm.rtsInstallers.group6}"/>

‎common/resources/ibm-docs.crt

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIGRDCCBSygAwIBAgISBGekf/7rGwi26Xz73I6OvoTFMA0GCSqGSIb3DQEBCwUA
3+
MDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNyeXB0MQswCQYDVQQD
4+
EwJSMzAeFw0yMTA0MjkwMjQ1MjBaFw0yMTA3MjgwMjQ1MjBaMEUxQzBBBgNVBAMT
5+
OmlibWRvY3MtcHJvZHVjdGlvbi1kYWwudXMtc291dGguY29udGFpbmVycy5hcHBk
6+
b21haW4uY2xvdWQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC90T79
7+
NWdfsNivV8aqu8CMvpIfIM2/LVjLk5HSNLy9fl6iPhmJ/QyY8V9yh7cWn1puTMuW
8+
fretN2uY9s2+Xzd+XUyJ8sScOHI40lOmZo0NJ+4PBO9V+vM6kqd3s4rwsMHhWrZP
9+
e8OxL9U/VrG/Xiujgld7IdbPVXq2Jlxm0GZGv+dsLNLmR4OLdyXYN7aWqTPBRbqR
10+
QUR5kQ0/wCFUhMcur0ZDziIKTU6JOuYF1EfHbP0cm+zfHcCPVF78eOjgJHZQ49ke
11+
xQUYbQLy5J80dTGTS3xZsT+g6g35LHfcqCeFrT6eoHmF3ovbSlCUcgfXF2npavJ7
12+
0Yh6trU6mHXK+w73AgMBAAGjggM/MIIDOzAOBgNVHQ8BAf8EBAMCBaAwHQYDVR0l
13+
BBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB/wQCMAAwHQYDVR0OBBYE
14+
FLQbWDFIvzFbkhXxuY596Fmi0CRlMB8GA1UdIwQYMBaAFBQusxe3WFbLrlAJQOYf
15+
r52LFMLGMFUGCCsGAQUFBwEBBEkwRzAhBggrBgEFBQcwAYYVaHR0cDovL3IzLm8u
16+
bGVuY3Iub3JnMCIGCCsGAQUFBzAChhZodHRwOi8vcjMuaS5sZW5jci5vcmcvMIIB
17+
DwYDVR0RBIIBBjCCAQKCYiouaWJtZG9jcy1wcm9kdWN0aW9uLWRhbC02MDk5MTIz
18+
Y2U3NzRlNTkyYTUxOWQ3YzMzZGI4MjY1ZS0wMDAwLnVzLXNvdXRoLmNvbnRhaW5l
19+
cnMuYXBwZG9tYWluLmNsb3VkgmBpYm1kb2NzLXByb2R1Y3Rpb24tZGFsLTYwOTkx
20+
MjNjZTc3NGU1OTJhNTE5ZDdjMzNkYjgyNjVlLTAwMDAudXMtc291dGguY29udGFp
21+
bmVycy5hcHBkb21haW4uY2xvdWSCOmlibWRvY3MtcHJvZHVjdGlvbi1kYWwudXMt
22+
c291dGguY29udGFpbmVycy5hcHBkb21haW4uY2xvdWQwTAYDVR0gBEUwQzAIBgZn
23+
gQwBAgEwNwYLKwYBBAGC3xMBAQEwKDAmBggrBgEFBQcCARYaaHR0cDovL2Nwcy5s
24+
ZXRzZW5jcnlwdC5vcmcwggECBgorBgEEAdZ5AgQCBIHzBIHwAO4AdAD2XJQv0Xcw
25+
IhRUGAgwlFaO400TGTO/3wwvIAvMTvFk4wAAAXkbuyXGAAAEAwBFMEMCIBsjAbrG
26+
9kLGSVuQGUwb0NcxVTUG1JsFePs8JwZYjlhsAh8ddDRpg+QgDMaWCF4bKIfGbuUm
27+
GoD0AYeuPhxLvnDcAHYAlCC8Ho7VjWyIcx+CiyIsDdHaTV5sT5Q9YdtOL1hNosIA
28+
AAF5G7sl1AAABAMARzBFAiBsPI0YmvwUKqaCuIBODy6BfQ7+07CiyKyM7yKeKAzt
29+
YAIhAKxXfyAS277G9CySQNDMVp6eBLA/MM/RYyqJMxFFZQYzMA0GCSqGSIb3DQEB
30+
CwUAA4IBAQBbH5QIu3xD7ixh3pe3YKV1XhP7ge8R0kkUYPp0pjdmbB/0Ydw2xyYd
31+
U6INemlmpmDYYlExdfGzQ3NSKGZPIpX8YV7nf620h/EAL9XzawR6/GM+CMBQ5cEj
32+
xQuTPJWEYba9MmWimYwkazbNZGmlmFBbOIzyKoNjTfarzvIp+h+bYpK3HHHOJKQk
33+
QojQRTZ7odJPJ3YJqfCsPHm+rz/wY0+TdBsrTonBDQDPxvrL7/q+I/Fu8qag5k5/
34+
pSwexj/PGwDQTZw/YcQ4QVDhL2StgntvCbSnAZuqfcvGsvtmne9M0s3pLIaZzRvl
35+
hObPHoVTQvl4IEbAxmaPJKUmyo2p+3xz
36+
-----END CERTIFICATE-----

‎common/resources/ibm-public.crt

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
-----BEGIN CERTIFICATE-----
2+
MIIJRDCCCCygAwIBAgIQDmawg9RSDxVkfwCV86ESfTANBgkqhkiG9w0BAQsFADBe
3+
MQswCQYDVQQGEwJVUzEVMBMGA1UEChMMRGlnaUNlcnQgSW5jMRkwFwYDVQQLExB3
4+
d3cuZGlnaWNlcnQuY29tMR0wGwYDVQQDExRHZW9UcnVzdCBSU0EgQ0EgMjAxODAe
5+
Fw0yMDExMDcwMDAwMDBaFw0yMTExMTEyMzU5NTlaMH0xCzAJBgNVBAYTAlVTMREw
6+
DwYDVQQIEwhOZXcgWW9yazEPMA0GA1UEBxMGQXJtb25rMTQwMgYDVQQKEytJbnRl
7+
cm5hdGlvbmFsIEJ1c2luZXNzIE1hY2hpbmVzIENvcnBvcmF0aW9uMRQwEgYDVQQD
8+
Ewt3d3cuaWJtLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBANVp
9+
gR6uHrfyHNhwIK75bDC0BUqdz782n3rn33baJUaFlY3AqzNM4mf6zo5JxzmXW2ey
10+
NQ4B+PN4lzIQal2ShZBm7m9se9ORfokdZS3EwU56FgaVlM5oEz14vU6lM3pAuSjY
11+
HZw0zT5P1c0kmkpBjAg/apeCMvGDvlOguF7jaEl5NhJ7a48oAr2twad1zCO57BrK
12+
lpHGDhh2+Frzf+yoXBPo0S0Z9HczH65VI7Uu8ZTHiZxi+oDB+Hb67THmVzCx3wAz
13+
iuoRNqn1qz/m9cqTaIVhukLhisJTCNfW2FN9/O7goNKZofqyRH+MF14uy5LJAsZi
14+
W2V5QGVXGSdrqjT4750CAwEAAaOCBd0wggXZMB8GA1UdIwQYMBaAFJBY/7CcdahR
15+
VHex7fKjQxY4nmzFMB0GA1UdDgQWBBR+rqIGPOwnM/igsNlG1L2NqEkrgzCCA0wG
16+
A1UdEQSCA0MwggM/gg4xLmNtcy5zODFjLmNvbYIRMS5jbXNuZXcuczgxYy5jb22C
17+
ETEuY21zcG9jLnM4MWMuY29tghMxLmNtc3N0YWdlLnM4MWMuY29tghYxLmNtc3N0
18+
YWdlbmV3LnM4MWMuY29tghIxLmNtc3Rlc3QuczgxYy5jb22CDjEuZGFtLnM4MWMu
19+
Y29tghMxLmRhbXN0YWdlLnM4MWMuY29tgg4xLnd3dy5zODFjLmNvbYITMS53d3dz
20+
dGFnZS5zODFjLmNvbYIPYXAuY21zLnM4MWMuY29tghBhcGkud3d3LnM4MWMuY29t
21+
ghljZG4tcHJvZC1lZGl0LmNtcy5pYm0ubmV0ghFkZXZlbG9wZXIuaWJtLmNvbYIP
22+
ZXUuY21zLnM4MWMuY29tggdpYm0uY29tggttcC5zODFjLmNvbYINbXlpYm0uaWJt
23+
LmNvbYIPdXMuY21zLnM4MWMuY29tghF1c21yLmNtcy5zODFjLmNvbYIOd3d3LTAx
24+
LmlibS5jb22CDnd3dy0wMy5pYm0uY29tgg53d3ctMDUuaWJtLmNvbYIOd3d3LTA2
25+
LmlibS5jb22CDnd3dy0wNy5pYm0uY29tgg93d3ctMTEyLmlibS5jb22CEHd3dy0y
26+
MDAwLmlibS5jb22CD3d3dy0zNTYuaWJtLmNvbYIOd3d3LTQwLmlibS5jb22CDnd3
27+
dy01MC5pYm0uY29tgg93d3ctOTM1LmlibS5jb22CD3d3dy05NDYuaWJtLmNvbYIP
28+
d3d3LTk2OS5pYm0uY29tghR3d3ctOTY5c3RhZ2UuaWJtLmNvbYIPd3d3LWFwaS5p
29+
Ym0uY29tgh13d3cuYXRzczAwMXVhdC5hdC5zbWkuaWJtLmNvbYIVd3d3LmRldmVs
30+
b3Blci5pYm0uY29tggt3d3cuaWJtLmNvbYILd3d3Lm5pYy5pYm2CD3d3dy5uaWMu
31+
d2VhdGhlcoIWd3d3Lm5pYy53ZWF0aGVyY2hhbm5lbIISd3d3cG9jLTExMi5pYm0u
32+
Y29tgg53d3dwb2MuaWJtLmNvbYIQd3d3c3RhZ2UuaWJtLmNvbYITd3d3dGVzdC0x
33+
MTIuaWJtLmNvbYIPd3d3dGVzdC5pYm0uY29tMA4GA1UdDwEB/wQEAwIFoDAdBgNV
34+
HSUEFjAUBggrBgEFBQcDAQYIKwYBBQUHAwIwPgYDVR0fBDcwNTAzoDGgL4YtaHR0
35+
cDovL2NkcC5nZW90cnVzdC5jb20vR2VvVHJ1c3RSU0FDQTIwMTguY3JsMEwGA1Ud
36+
IARFMEMwNwYJYIZIAYb9bAEBMCowKAYIKwYBBQUHAgEWHGh0dHBzOi8vd3d3LmRp
37+
Z2ljZXJ0LmNvbS9DUFMwCAYGZ4EMAQICMHUGCCsGAQUFBwEBBGkwZzAmBggrBgEF
38+
BQcwAYYaaHR0cDovL3N0YXR1cy5nZW90cnVzdC5jb20wPQYIKwYBBQUHMAKGMWh0
39+
dHA6Ly9jYWNlcnRzLmdlb3RydXN0LmNvbS9HZW9UcnVzdFJTQUNBMjAxOC5jcnQw
40+
DAYDVR0TAQH/BAIwADCCAQMGCisGAQQB1nkCBAIEgfQEgfEA7wB1APZclC/RdzAi
41+
FFQYCDCUVo7jTRMZM7/fDC8gC8xO8WTjAAABdaQD+kkAAAQDAEYwRAIgDIn7I66Z
42+
02IOs0QqmoFhbtWEmE6N4GQET6ptxeHnw10CICGVrufvv4gEu63rTJcnfh/Dn7Cq
43+
WEFRL9taruYUkeMBAHYAXNxDkv7mq0VEsV6a1FbmEDf71fpH3KFzlLJe5vbHDsoA
44+
AAF1pAP6lAAABAMARzBFAiBUxV1lwhJQsZHawUPvscKjynL6Tf8fJDOr12Rk6zI2
45+
9QIhAIk2RY4zviOTnS4HFcEOtDmIRFLr5yoNg9CDCkRvDzRsMA0GCSqGSIb3DQEB
46+
CwUAA4IBAQBluNf+EPbwLJ6jheqTxzS0xsB10xEdeGSXzTkP8OYoitSZ0B5618vq
47+
0JgS/nwjdM44z3quORwTnNrWNzeDWthLiP0Z7eRtLlm1BrctzY++lBzdVUXZXBUD
48+
B+kj0iTFzVmzArU6JeORR61EnVtGYL6h1KIKAtVyJKQSVGTtOEd+x3l88dJBdJqs
49+
/PjDaPgp8TNeUJjpSj+c18V9uOxJ5ITsYU1V5v8inPolTYEZLC0wxjYIIXrujiHq
50+
LQfZ/QpUSkGQBU4ajtJ5Skb4T3YzTdtvROuGK/gxEMncThYGSAb6S7KdrS/8K+Wt
51+
ALdvvM/SkBUVDpSrhOPEkCRIAJJM495Y
52+
-----END CERTIFICATE-----

‎common/script/configureSwidTag.sh

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -38,24 +38,7 @@ then
3838
echo "DEPLOY_FOR_PRODUCTION not set then ODM production configuration : remove ODM non production Swidtag"
3939
removeAllSwidTag ibm.com_IBM_ODM_Server_for_Non-Production-*.swidtag
4040
fi
41-
echo "ODM configuration : remove all DBAMC Swidtag"
42-
removeAllSwidTag ibm.com_Operational_Decision_Manager_Containers_-_CP4BA*.swidtag
43-
removeAllSwidTag ibm.com_Operational_Decision_Manager_Containers_-_CP4BA_-_Non_Prod*.swidtag
4441
else
45-
if [ -n "$DEPLOY_FOR_PRODUCTION" ]
46-
then
47-
if [[ "$DEPLOY_FOR_PRODUCTION" =~ "TRUE" ]]
48-
then
49-
echo "DEPLOY_FOR_PRODUCTION is true then DBAMC production configuration : remove DBAMC non production Swidtag"
50-
removeAllSwidTag ibm.com_Operational_Decision_Manager_Containers_-_CP4BA_-_Non_Prod-*.swidtag
51-
else
52-
echo "DEPLOY_FOR_PRODUCTION is false then DBAMC non production configuration : remove DBAMC production Swidtag"
53-
removeAllSwidTag ibm.com_Operational_Decision_Manager_Containers_-_CP4BA-*.swidtag
54-
fi
55-
else
56-
echo "DEPLOY_FOR_PRODUCTION not set then DBAMC production configuration : remove DBAMC non production Swidtag"
57-
removeAllSwidTag ibm.com_Operational_Decision_Manager_Containers_-_CP4BA_-_Non_Prod-*.swidtag
58-
fi
5942
echo "DBAMC configuration : remove all ODM Swidtag"
6043
removeAllSwidTag ibm.com_IBM_ODM_Server*.swidtag
6144
removeAllSwidTag ibm.com_IBM_ODM_Server_for_Non-Production*.swidtag

‎common/script/configureTlsSecurity.sh

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -76,17 +76,27 @@ fi
7676
CERTDIR="/config/security/trusted-cert-volume/"
7777
if [ -d $CERTDIR ]; then
7878
cd $CERTDIR
79-
for dir in *; do
80-
echo "Importing trusted certificates $dir"
81-
if [ -d $dir ]; then
82-
if [ -f $dir/tls.crt ]; then
83-
# Don't know if we need to delete the Alias. If don't delete it there is an error
84-
keytool -delete -alias 0trust_$dir -storepass $DEFAULT_TRUSTSTORE_PASSWORD -keystore /config/security/truststore.jks > /dev/null
85-
keytool -import -v -trustcacerts -alias 0trust_$dir -file $dir/tls.crt -keystore /config/security/truststore.jks -storepass $DEFAULT_TRUSTSTORE_PASSWORD -noprompt
86-
else
87-
echo "Couldn't find certificate $dir/tls.crt skipping this certificate "
88-
fi
89-
fi
79+
TRUSTSTORE=/config/security/truststore.jks
80+
i=0
81+
for file in $(find . -name "*.crt")
82+
do
83+
echo "Importing trusted certificates $file"
84+
i=$((i+1))
85+
ALIASNAME="trust_$i_$file"
86+
keytool -delete -alias 0$ALIASNAME -storepass $DEFAULT_TRUSTSTORE_PASSWORD -keystore $TRUSTSTORE > /dev/null
87+
keytool -import -v -trustcacerts -alias 0$ALIASNAME -file $file -keystore $TRUSTSTORE -storepass $DEFAULT_TRUSTSTORE_PASSWORD -noprompt
9088
done
9189
echo "done"
9290
fi
91+
92+
if [ -f "/config/resources/ibm-public.crt" ]
93+
then
94+
echo "Importing IBM Public certificate"
95+
keytool -import -v -trustcacerts -alias IBM-PUBLIC -file /config/resources/ibm-public.crt -keystore /config/security/truststore.jks -storepass $DEFAULT_TRUSTSTORE_PASSWORD -noprompt
96+
fi
97+
98+
if [ -f "/config/resources/ibm-docs.crt" ]
99+
then
100+
echo "Importing IBM Docs certificate"
101+
keytool -import -v -trustcacerts -alias IBM-DOCS -file /config/resources/ibm-docs.crt -keystore /config/security/truststore.jks -storepass $DEFAULT_TRUSTSTORE_PASSWORD -noprompt
102+
fi

‎common/script/initVariables.sh

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,10 @@ then
2020
echo "ODM_CONTEXT_ROOT unset : set blank"
2121
export ODM_CONTEXT_ROOT=""
2222
fi
23+
24+
if [ -s "$SCRIPT/init/container.env" ]
25+
then
26+
set -o allexport
27+
source $SCRIPT/init/container.env
28+
set +o allexport
29+
fi

‎common/script/updateDatasource.sh

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,32 @@ fi
1010
if [ -n "$DB_PORT_NUMBER" ]
1111
then
1212
echo "Set database port number to $DB_PORT_NUMBER"
13-
# Update port in case of PostgreSQL
14-
sed -i 's|5432|'$DB_PORT_NUMBER'|g' /config/datasource.xml
15-
# Update port in case of DB2
16-
sed -i 's|50000|'$DB_PORT_NUMBER'|g' /config/datasource.xml
17-
# Update port in case of Derby
18-
sed -i 's|1527|'$DB_PORT_NUMBER'|g' /config/datasource.xml
19-
# Update port in case of MySQL
20-
sed -i 's|3306|'$DB_PORT_NUMBER'|g' /config/datasource.xml
21-
# Update port in case of SQL server
22-
sed -i 's|1433|'$DB_PORT_NUMBER'|g' /config/datasource.xml
13+
sed -i 's|DB_PORT_NUMBER|'$DB_PORT_NUMBER'|g' /config/datasource.xml
14+
else
15+
if [ -n "$DB_TYPE" ]
16+
then
17+
echo "No provided DB_PORT_NUMBER, set default database port according to $DB_TYPE"
18+
case $DB_TYPE in
19+
*derby* )
20+
sed -i 's|DB_PORT_NUMBER|1527|g' /config/datasource.xml
21+
;;
22+
*mysql* )
23+
sed -i 's|DB_PORT_NUMBER|3306|g' /config/datasource.xml
24+
;;
25+
*db2* )
26+
sed -i 's|DB_PORT_NUMBER|50000|g' /config/datasource.xml
27+
;;
28+
*postgres* )
29+
sed -i 's|DB_PORT_NUMBER|5432|g' /config/datasource.xml
30+
;;
31+
*sqlserver* )
32+
sed -i 's|DB_PORT_NUMBER|1433|g' /config/datasource.xml
33+
;;
34+
esac
35+
else
36+
echo "Set DB_PORT_NUMBER to 5432 as using PostgreSQL by default"
37+
sed -i 's|DB_PORT_NUMBER|5432|g' /config/datasource.xml
38+
fi
2339
fi
2440

2541
if [ -n "$DB_NAME" ]

‎decisioncenter/Dockerfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ COPY --chown=1001:0 $ODMDOCKERDIR/common/config/jvm/jvm.options /config/configDr
6161
COPY --chown=1001:0 $ODMDOCKERDIR/common/security/ltpa.keys /config/resources/security/ltpa.keys
6262
COPY --chown=1001:0 $ODMDOCKERDIR/common/security/keystore.jks /config/security/keystore.jks
6363
COPY --chown=1001:0 $ODMDOCKERDIR/common/security/truststore.jks /config/security/truststore.jks
64+
COPY --chown=1001:0 $ODMDOCKERDIR/common/resources/ibm-public.crt /config/resources/ibm-public.crt
6465

6566
COPY --chown=1001:0 $ODMDOCKERDIR/common/drivers /config/resources
6667
RUN chmod -R 777 /config

‎decisioncenter/config/datasource-db2.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
user="odmusr"
2121
password="odmpwd"
2222
serverName="dbserver"
23-
portNumber="50000"
23+
portNumber="DB_PORT_NUMBER"
2424
sslConnection="false"/>
2525
</dataSource>
2626

‎decisioncenter/config/datasource-derby.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
agedTimeout="30m"/>
1919
<properties.derby.client databaseName="odmdb"
2020
serverName="dbserver"
21-
portNumber="1527"
21+
portNumber="DB_PORT_NUMBER"
2222
createDatabase="create"
2323
user="odmusr"
2424
password="odmpwd" />

‎decisioncenter/config/datasource-mysql.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
user="odmusr"
2626
password="odmpwd"
2727
serverName="dbserver"
28-
portNumber="3306"/>
28+
portNumber="DB_PORT_NUMBER"/>
2929
</dataSource>
3030

3131
</server>

0 commit comments

Comments
 (0)