Skip to content

Commit bab4890

Browse files
manjunathdhegde-2910manjunathdhegde-2910
authored
Main idm 23.2.1 release (#2616)
1 parent a8b61f3 commit bab4890

File tree

14 files changed

+71
-72
lines changed

14 files changed

+71
-72
lines changed

‎CODEOWNERS

+2-2
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
/.github/workflows @Djelibeybi @AmedeeBulle
77
/GraalVM/ @mzachh
88
/NoSQL/ @dario-vega @mikebrey
9-
/OracleAccessManagement/ @pratdash-orcl
9+
/OracleAccessManagement/ @manjunathdhegde-2910
1010
/OracleBI/ @sjvp
1111
/OracleCoherence/ @thegridman
1212
/OracleDatabase/ @gvenzl
@@ -16,7 +16,7 @@
1616
/OracleHTTPServer/ @Prabhat-Kishore
1717
/OracleIdentityGovernance/ @rishiagarwal-oracle
1818
/OracleInstantClient/ @cjbj
19-
/OracleInternetDirectory/ @pratdash-orcl @kuldeepbshah
19+
/OracleInternetDirectory/ @manjunathdhegde-2910 @kuldeepbshah
2020
/OracleJava/ @aureliogrb
2121
/OracleLinuxDevelopers/ @Djelibeybi @AmedeeBulle
2222
/OracleRestDataServices/ @gvenzl

‎OracleAccessManagement/dockerfiles/12.2.1.4.0/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# # Copyright (c) 2020, 2021 Oracle and/or its affiliates. All rights reserved.
1+
# # Copyright (c) 2020, 2023, Oracle and/or its affiliates. All rights reserved.
22
# #
33
# # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
# #
@@ -154,7 +154,7 @@ RUN patchzips=`ls ${PATCH_DIR}/p*.zip 2>/dev/null`; \
154154

155155
FROM base as FINAL_BUILD
156156

157-
RUN yum install -y libaio hostname && \
157+
RUN yum install -y libaio hostname perl && \
158158
rm -rf /var/cache/yum
159159
COPY --from=builder --chown=oracle:root $BASE_DIR $BASE_DIR
160160
RUN sed -i '/@@audit\/createCASBAudit.sql/s/@@audit\/createCASBAudit.sql/--@@audit\/createCASBAudit.sql/g' /u01/oracle/idm/common/sql/oam/sql/oam.sql && \

‎OracleAccessManagement/imagetool/12.2.1.4.0/additionalBuildCmds.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package-manager-packages]
2-
hostname
2+
libaio hostname perl
33

44
[final-build-commands]
55

‎OracleIdentityGovernance/dockerfiles/12.2.1.4.0/Dockerfile

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2020 Oracle and/or its affiliates.
1+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
22
#
33
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
44
#
@@ -47,7 +47,9 @@ RUN mkdir -p /u01 && \
4747
mkdir ${OPATCH_PATCH_DIR} && \
4848
chown -R oracle:root /u01 && \
4949
chown -R oracle:root ${PATCH_DIR} && \
50-
chown -R oracle:root ${OPATCH_PATCH_DIR}
50+
chown -R oracle:root ${OPATCH_PATCH_DIR}
51+
RUN yum install -y hostname perl openldap openldap-clients && \
52+
rm -rf /var/cache/yum
5153

5254
#
5355
# Copy files and packages for install

‎OracleIdentityGovernance/dockerfiles/12.2.1.4.0/container-scripts/createDomainAndStart.sh

+4-11
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
2-
# Copyright (c) 2020 Oracle and/or its affiliates.
2+
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
33
#
44
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
55
#
66
# Author: OIG Development
77
#
8-
8+
# shellcheck disable=SC2155,SC2060,SC2164
99
export DOMAIN_HOME=$DOMAIN_ROOT/$DOMAIN_NAME
1010

1111
########### SIGINT handler ############
@@ -24,12 +24,7 @@ function _term() {
2424
exit;
2525
}
2626

27-
########### SIGKILL handler ############
28-
function _kill() {
29-
echo "INFO: SIGKILL received, shutting down Admin Server!"
30-
/u01/oracle/user_projects/domains/base_domain/bin/stopWebLogic.sh
31-
exit;
32-
}
27+
3328

3429
#######Random Password Generation########
3530
function rand_pwd(){
@@ -63,12 +58,10 @@ trap _int SIGINT
6358
# Set SIGTERM handler
6459
trap _term SIGTERM
6560

66-
# Set SIGKILL handler
67-
trap _kill SIGKILL
61+
6862

6963
echo "INFO: CONNECTION_STRING = ${CONNECTION_STRING:?"Please set CONNECTION_STRING"}"
7064
echo "INFO: RCUPREFIX = ${RCUPREFIX:?"Please set RCUPREFIX"}"
71-
echo "INFO: DB_PASSWORD = ${DB_PASSWORD:?"Please set DB_PASSWORD"}"
7265

7366
if [ -z ${ADMIN_PASSWORD} ]
7467
then

‎OracleIdentityGovernance/imagetool/12.2.1.4.0/additionalBuildCmds.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package-manager-packages]
2-
hostname
2+
hostname perl openldap openldap-clients
33

44
[final-build-commands]
55

@@ -31,9 +31,9 @@ RUN cp -rf /u01/oracle/idm/server/ConnectorDefaultDirectory /u01/oracle/idm/serv
3131
COPY --chown=oracle:root files/container-scripts/ /u01/oracle/dockertools/
3232

3333
RUN chmod a+xr /u01/oracle/dockertools/* && \
34-
chown -R oracle:root /u01/oracle/dockertools && \
3534
chown -R oracle:root /u01/oracle/idm/server/ConnectorDefaultDirectory_orig && \
36-
chown -h oracle:root /u01/oracle/idm/server/ConnectorDefaultDirectory
35+
chown -h oracle:root /u01/oracle/idm/server/ConnectorDefaultDirectory && \
36+
chown -R oracle:root /u01/oracle/dockertools
3737

3838
USER oracle
3939
RUN if $ORACLE_HOME/OPatch/opatch lsinventory -oh $ORACLE_HOME -jre $JAVA_HOME | egrep -q '23855729|24204843|24325050'; then \

‎OracleUnifiedDirectory/dockerfiles/12.2.1.4.0/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
2+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
33
#
44
# Licensed under the Universal Permissive License v 1.0 as shown at
55
# https://oss.oracle.com/licenses/upl.
@@ -56,7 +56,7 @@ RUN mkdir -p ${BASE_DIR} && \
5656
mkdir -p ${USER_PROJECTS_DIR} && \
5757
chown -R oracle:root ${USER_PROJECTS_DIR} && chmod -R 770 ${USER_PROJECTS_DIR} && \
5858
mkdir -p ${SCRIPT_DIR} && chown oracle:root ${SCRIPT_DIR} && \
59-
yum install -y libaio hostname vi && \
59+
yum install -y libaio hostname vi perl && \
6060
rm -rf /var/cache/yum
6161

6262
# Builder Image for Installation of Binaries

‎OracleUnifiedDirectory/dockerfiles/12.2.1.4.0/container-scripts/common_functions.sh

+24-1
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,37 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2020 Oracle and/or its affiliates.
3+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
44
#
55
# Licensed under the Universal Permissive License v 1.0 as shown at
66
# https://oss.oracle.com/licenses/upl.
77
#
88
# Script for common functions which can be used while OUD instance setup/configuration.
99
# It's assumed that setEnvVars.sh is already sourced before sourcing this script file.
1010

11+
## Function to set Java properties
12+
#shellcheck disable=SC2154,SC2166
13+
14+
updateJavaProps() {
15+
echo "" >> ${OUD_INST_HOME}/config/java.properties
16+
# Disabling Enpoint Identification for selected CLIs to allow connecting to OUD Instance with any hostname
17+
echo "dsconfig.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
18+
echo "dsreplication.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
19+
echo "uninstall.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
20+
echo "status.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
21+
echo "import-ldif.online.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
22+
echo "manage-suffix.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
23+
echo "ldapmodify.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
24+
echo "ldapsearch.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
25+
if [[ $serverTuning == "jvm-default" ]];then
26+
echo "start-ds.java-args=-server -Xms256m -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
27+
else
28+
echo "start-ds.java-args=$serverTuning" >> ${OUD_INST_HOME}/config/java.properties
29+
fi
30+
${OUD_INST_HOME}/bin/dsjavaproperties
31+
}
32+
1133
## Function to restart OUD Instance
34+
1235
restartOUD() {
1336
echo "[$(date)] - restartOUD - Stopping..." 2>&1 | tee -a ${oudInstanceConfigStatus}
1437
${OUD_INST_HOME}/bin/stop-ds 2>&1 | tee -a ${stopDsCmdLogs}

‎OracleUnifiedDirectory/dockerfiles/12.2.1.4.0/container-scripts/createAndStartOUDInstance.sh

+3-30
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
3+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
44
#
55
# Licensed under the Universal Permissive License v 1.0 as shown at
66
# https://oss.oracle.com/licenses/upl.
@@ -9,6 +9,8 @@
99
#
1010

1111
# Variables for this script to work
12+
13+
# shellcheck disable=SC2154,SC2166,SC2046
1214
source ${SCRIPT_DIR}/setEnvVars.sh
1315
source ${SCRIPT_DIR}/common_functions.sh
1416

@@ -19,33 +21,10 @@ function _term() {
1921
$OUD_INST_HOME/bin/stop-ds
2022
}
2123

22-
########### SIGKILL handler ############
23-
function _kill() {
24-
echo "[$(date)] - SIGKILL received, shutting down the server!"
25-
kill -9 $childPID
26-
}
2724

2825
# Set SIGTERM handler
2926
trap _term SIGTERM
3027

31-
# Set SIGKILL handler
32-
trap _kill SIGKILL
33-
34-
#
35-
updateJavaProps() {
36-
echo "" >> ${OUD_INST_HOME}/config/java.properties
37-
# Disabling Enpoint Identification for selected CLIs to allow connecting to OUD Instance with any hostname
38-
echo "dsconfig.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
39-
echo "dsreplication.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
40-
echo "uninstall.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
41-
echo "status.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
42-
echo "import-ldif.online.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
43-
echo "manage-suffix.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
44-
echo "ldapmodify.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
45-
echo "ldapsearch.java-args=-client -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
46-
echo "start-ds.java-args=-server -Xms256m -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" >> ${OUD_INST_HOME}/config/java.properties
47-
${OUD_INST_HOME}/bin/dsjavaproperties
48-
}
4928

5029
printEnvVars() {
5130
echo "[$(date)] - Environment Variables which would influence OUD Instance setup and configuration"
@@ -549,17 +528,11 @@ else
549528

550529
if [ "$ordinal" == "0" ]; then
551530
echo "[$(date)] - Calling createOUD_Directory"
552-
if [[ -f "/u01/oracle/config-input/config-baseOUD.props" ]]; then
553-
source "/u01/oracle/config-input/config-baseOUD.props"
554-
fi
555531
createOUD_Directory
556532
fi
557533

558534
if [[ "$ordinal" != "0" && ! -z "$ordinal" ]]; then
559535
echo "[$(date)] - Calling createOUD_DS2RS"
560-
if [[ -f "/u01/oracle/config-input/config-replOUD.props" ]]; then
561-
source "/u01/oracle/config-input/config-replOUD.props"
562-
fi
563536
createOUD_DS2RS
564537
fi
565538
;;

‎OracleUnifiedDirectory/dockerfiles/12.2.1.4.0/container-scripts/setEnvVars.sh

+17-1
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,28 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2020 Oracle and/or its affiliates.
3+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
44
#
55
# Licensed under the Universal Permissive License v 1.0 as shown at
66
# https://oss.oracle.com/licenses/upl.
77
#
88
# Script to create OUD instance based on the passed parameters.
99
#
10+
hostname=`hostname -f`
11+
host_name=`expr "$hostname" : '\([^.][^.]*\)\..*'`
12+
ordinal=`expr "$host_name" : '.*-\(.*\)'`
13+
if [ "$ordinal" == "0" ]; then
14+
echo " Sourcing base properties"
15+
if [[ -f "/u01/oracle/config-input/config-baseOUD.props" ]]; then
16+
source "/u01/oracle/config-input/config-baseOUD.props"
17+
fi
18+
fi
19+
20+
if [[ "$ordinal" != "0" && ! -z "$ordinal" ]]; then
21+
echo " Sourcing replication properties"
22+
if [[ -f "/u01/oracle/config-input/config-replOUD.props" ]]; then
23+
source "/u01/oracle/config-input/config-replOUD.props"
24+
fi
25+
fi
1026

1127
export BASE_DIR=${BASE_DIR:-/u01}
1228
export ORACLE_HOME=${ORACLE_HOME:-/u01/oracle}

‎OracleUnifiedDirectory/dockerfiles/12.2.1.4.0/container-scripts/startOUDInstance.sh

+5-13
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2020 Oracle and/or its affiliates.
3+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
44
#
55
# Licensed under the Universal Permissive License v 1.0 as shown at
66
# https://oss.oracle.com/licenses/upl.
77
#
88
# Script to start OUD Instance
99
#
1010

11+
# shellcheck disable=SC2154
1112
# Variables for this script to work
1213
source ${SCRIPT_DIR}/setEnvVars.sh
1314
source ${SCRIPT_DIR}/common_functions.sh
@@ -32,24 +33,15 @@ function term_oud() {
3233
${OUD_INST_HOME}/bin/stop-ds >/dev/null 2>&1
3334
}
3435

35-
# ---------------------------------------------------------------------------
36-
# SIGKILL handler
37-
# ---------------------------------------------------------------------------
38-
function kill_oud() {
39-
echo "---------------------------------------------------------------"
40-
echo "[$(date)] - SIGKILL received, shutting down OUD instance!"
41-
echo "---------------------------------------------------------------"
42-
kill -9 $childPID
43-
}
36+
4437

4538
# Set SIGINT handler
4639
trap int_oud SIGINT
4740

4841
# Set SIGTERM handler
4942
trap term_oud SIGTERM
5043

51-
# Set SIGKILL handler
52-
trap kill_oud SIGKILL
44+
5345

5446
# Log OUD Instance Version related details
5547
if [ -f ${oudInstanceDetailsFile} ]
@@ -87,7 +79,7 @@ fi
8779

8880
#####function call for Schema config OUD-12343
8981
#schema_config
90-
82+
updateJavaProps
9183
# Start OUD instance
9284
echo "---------------------------------------------------------------"
9385
echo "[$(date)] - Start OUD instance (${OUD_INST_HOME}):"

‎OracleUnifiedDirectory/imagetool/12.2.1.4.0/additionalBuildCmds.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package-manager-packages]
2-
libaio hostname vi
2+
libaio hostname vi perl
33

44
[before-jdk-install]
55
# Instructions/Commands to be executed Before JDK install

‎OracleUnifiedDirectorySM/dockerfiles/12.2.1.4.0/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#
2-
# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
2+
# Copyright (c) 2020, 2023, Oracle and/or its affiliates.
33
#
44
# Licensed under the Universal Permissive License v 1.0 as shown at
55
# https://oss.oracle.com/licenses/upl.
@@ -63,7 +63,7 @@ chmod a+xr ${BASE_DIR} && chown oracle:root ${BASE_DIR} && \
6363
chown -R oracle:root ${VOLUME_DIR} && chmod -R 770 ${VOLUME_DIR} && \
6464
mkdir -p ${SCRIPT_DIR} && chown oracle:root ${SCRIPT_DIR} && \
6565
mkdir -p ${PROPS_DIR} && chown oracle:root ${PROPS_DIR} && \
66-
yum install -y libaio hostname && \
66+
yum install -y libaio hostname perl && \
6767
rm -rf /var/cache/yum
6868

6969
# Builder Image for Installation of Binaries

‎OracleUnifiedDirectorySM/imagetool/12.2.1.4.0/additionalBuildCmds.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[package-manager-packages]
2-
hostname
2+
libaio hostname perl
33

44
[before-jdk-install]
55
# Instructions/Commands to be executed Before JDK install

0 commit comments

Comments
 (0)