idm_22.2.1_release (#2348)

Author: manjunathdhegde-2910

OracleAccessManagement/imagetool/12.2.1.4.0/additionalBuildCmds.txt

@@ -1,3 +1,6 @@
+[package-manager-packages]
+hostname
+
 [final-build-commands]
 
 ENV FMW_IDM_JAR=fmw_12.2.1.4.0_idm_generic.jar \
@@ -23,24 +26,27 @@ ENV FMW_IDM_JAR=fmw_12.2.1.4.0_idm_generic.jar \
     DB_SCHEMA_PASSWORD=${DB_SCHEMA_PASSWORD:-} \
     USER_MEM_ARGS=${USER_MEM_ARGS:-"-Djava.security.egd=file:/dev/./urandom"} \
     JAVA_OPTIONS="${JAVA_OPTIONS} -Dcom.sun.jndi.ldap.object.disableEndpointIdentification=true" \
-    PATH=$PATH:/usr/java/default/bin:$ORACLE_HOME/oracle_common/common/bin:/u01/oracle/wlserver/common/bin:/u01/oracle/dockertools
+    PATH=$PATH:/usr/java/default/bin:$ORACLE_HOME/oracle_common/common/bin:/u01/oracle/wlserver/common/bin:/u01/oracle/dockertools \
+    HEALTH_SCRIPT_FILE=/u01/oracle/dockertools/get_healthcheck_url.sh 
 
 USER root
 
 RUN mkdir -p ${USER_PROJECTS_DIR} && \
-    chown -R oracle:oracle ${USER_PROJECTS_DIR} && chmod -R 775 ${USER_PROJECTS_DIR} && \
+    chown -R oracle:root ${USER_PROJECTS_DIR} && chmod -R 775 ${USER_PROJECTS_DIR} && \
+    chown -R oracle:root ${BASE_DIR} && \
     mkdir -p ${CONTAINER_DIR} && \
-    chown -R oracle:oracle ${CONTAINER_DIR} && chmod -R 775 ${CONTAINER_DIR} && \
-    mkdir -p ${SCRIPT_DIR} && chown oracle:oracle ${SCRIPT_DIR} && \
-    mkdir -p ${PROPS_DIR} && chown oracle:oracle ${PROPS_DIR} && \ 
-    yum install -y hostname && \
-    rm -rf /var/cache/yum
+    chown -R oracle:root ${CONTAINER_DIR} && chmod -R 775 ${CONTAINER_DIR} && \
+    mkdir -p ${SCRIPT_DIR} && chown oracle:root ${SCRIPT_DIR} && \
+    mkdir -p ${PROPS_DIR} && chown oracle:root ${PROPS_DIR} 
 
 
-COPY --chown=oracle:oracle files/container-scripts/ ${SCRIPT_DIR}/
+COPY --chown=oracle:root files/container-scripts/ ${SCRIPT_DIR}/
 RUN chmod a+xr ${SCRIPT_DIR}/* && \
-     chown -R oracle:oracle ${SCRIPT_DIR}
+     chown -R oracle:root ${SCRIPT_DIR} && \
+     sed -i '/@@audit\/createCASBAudit.sql/s/@@audit\/createCASBAudit.sql/--@@audit\/createCASBAudit.sql/g' /u01/oracle/idm/common/sql/oam/sql/oam.sql && \
+    sed -i '/@@diagnostic\/createIdmDiagnosticLogRecord.sql/s/@@diagnostic\/createIdmDiagnosticLogRecord.sql/--@@diagnostic\/createIdmDiagnosticLogRecord.sql/g' /u01/oracle/idm/common/sql/oam/sql/oam.sql 
 
 USER oracle
+HEALTHCHECK --start-period=5m --interval=1m CMD curl -k -s --fail `$HEALTH_SCRIPT_FILE` || exit 1
 WORKDIR $ORACLE_HOME
 CMD ["sh", "-c", "${SCRIPT_DIR}/createDomainAndStart.sh"]

OracleAccessManagement/imagetool/12.2.1.4.0/buildArgs

@@ -4,6 +4,7 @@ create
 --version=12.2.1.4.0
 --tag=%BUILDTAG%
 --pull
+--chown oracle:root
 --installerResponseFile %DOCKER_REPO%/OracleFMWInfrastructure/dockerfiles/12.2.1.4.0/install.file,%DOCKER_REPO%/OracleAccessManagement/dockerfiles/12.2.1.4.0/install/iam.response
 --additionalBuildCommands %DOCKER_REPO%/OracleAccessManagement/imagetool/12.2.1.4.0/additionalBuildCmds.txt
 --additionalBuildFiles %DOCKER_REPO%/OracleAccessManagement/dockerfiles/12.2.1.4.0/container-scripts

OracleInternetDirectory/imagetool/12.2.1.4.0/README.md

@@ -1,208 +1,15 @@
 # Building an Oracle Internet Directory image with WebLogic Image Tool
 
-## Contents
+## Documentation 
 
-1. [Introduction](#1-introduction)
-2. [Prerequisites](#2-prerequisites)
-3. [Setup WebLogic Image Tool](#3-setup-weblogic-image-tool)
-4. [Download the required packages and installers](#4-download-the-required-packagesinstallers-and-patches)
-5. [Required build files](#5-required-build-files)
-6. [Additional build commands](#6-additional-build-commands)
-7. [Steps to Create Oracle Internet Directory image](#7-steps-to-create-oracle-internet-directory-image)
-8. [Generate Sample dockerfile with imagetool](#8-generate-sample-dockerfile-with-imagetool)
+Detailed instructions on how to [create or update an Oracle Internet Directory container image](https://oracle.github.io/fmw-kubernetes/oid/create-or-update-image#create-or-update-an-oracle-internet-directory-services-manager-image-using-the-weblogic-image-tool) using the WebLogic Image Tool can be found in the [Oracle Fusion Middleware on Kubernetes](https://oracle.github.io/fmw-kubernetes/) documentation.
 
-## 1. Introduction
 
-This README describes the steps involved in building an Oracle Internet Directory image with the WebLogic Image Tool.
-
-## 2. Prerequisites
-
-The following prerequisites are necessary before building Oracle Internet Directory container images with WebLogic Image Tool:
-
-* A working installation of Docker 18.03.1 or later
-* Bash version 4.0 or later (commands should be run in a `bash` shell)
-* `JAVA_HOME` environment variable set to the location of your JDK e.g:  `/scratch/export/oracle/product/jdk`
-* git and unzip
-* Set `WORK_DIR` variable to a desired location of your choice e.g: `/scratch/` 
-
-## 3. Setup WebLogic Image Tool
-
-* Download the latest version of [WebLogic Image Tool](https://github.com/oracle/weblogic-image-tool/releases).
-* Extract the release archive (zip, tar.gz) content into `WORK_DIR`.
-
-```bash
-$ unzip imagetool.zip
-Archive:  imagetool.zip
-   creating: imagetool/
-   creating: imagetool/lib/
-  inflating: imagetool/lib/fluent-hc-4.5.12.jar
-  inflating: imagetool/lib/httpclient-4.5.12.jar
-  inflating: imagetool/lib/httpcore-4.4.13.jar
-  inflating: imagetool/lib/commons-logging-1.2.jar
-  inflating: imagetool/lib/commons-codec-1.11.jar
-  inflating: imagetool/lib/httpmime-4.5.12.jar
-  inflating: imagetool/lib/picocli-4.3.2.jar
-  inflating: imagetool/lib/json-20200518.jar
-  inflating: imagetool/lib/compiler-0.9.10.jar
-   creating: imagetool/bin/
-  inflating: imagetool/bin/setup.sh
-  inflating: imagetool/bin/logging.properties
-  inflating: imagetool/bin/imagetool.cmd
-  inflating: imagetool/bin/imagetool.sh
-  inflating: imagetool/LICENSE.txt
-  inflating: imagetool/lib/imagetool_completion.sh
-  inflating: imagetool/lib/imagetool.jar
-  inflating: imagetool/VERSION.txt
-$ 
-```
-
-* Run the following commands to setup imagetool
-
-```bash
-$ cd $WORK_DIR/imagetool/bin
-$ source setup.sh
-```
-
-* Execute the following to validate the WebLogic Image Tool:
-
-```bash
-$ imagetool --version
-imagetool:1.9.16
-$ 
-```
-
-The WebLogic Image Tool creates a temporary Docker context directory, prefixed by wlsimgbuilder_temp, every time the tool runs.  
-Under normal circumstances, this context directory will be deleted.  
-However, if the process is aborted or the tool is unable to remove the directory, it is safe for you to delete it manually.  
-By default, the WebLogic Image  Tool creates the Docker context directory under the user's home directory.  
-If you prefer to use a different directory for the temporary context, set the environment variable `WLSIMG_BLDDIR`.  
-
-```bash
-$ export WLSIMG_BLDDIR="/path/to/dir"
-```
-
-The WebLogic Image Tool maintains a local file cache store.  
-This store is used to look up where the Java, WebLogic Server installers, and WebLogic Server patches reside in the local file system.  
-By default, the cache store is located in the user's `$HOME/cache` directory. Under this directory, the lookup information is stored in the metadata file.  
-All automatically downloaded patches also reside in this directory. You can change the default cache store location by setting the environment variable `WLSIMG_CACHEDIR`.  
-
-```bash
-$ export WLSIMG_CACHEDIR="/path/to/cachedir"
-```
-
-## 4. Download the required packages,installers and patches
-
-Download the required installers from the [Oracle Software Delivery Cloud](https://edelivery.oracle.com/) and save them in a directory of your choice e.g: `$WORK_DIR/stage`:
-
-Create a stage directory under `$WORK_DIR` for downloading the below installers by using the following command:
-
-```bash
-$ mkdir -p $WORK_DIR/stage
-```
-
-* Oracle Internet Directory 12.2.1.4.0
-* Oracle JDK
-* Oracle Fusion Middleware Infrastructure 12.2.1.4.0
-
-**Note**: If the image is required to have patches included, download patches from [My Oracle Support](https://support.oracle.com) and copy to `WORK_DIR/stage`.
-
-## 5. Required build files
-
-The Oracle Internet Directory image requires additional files for creating and starting the Oracle Internet Directory instance in the container. Clone the Oracle docker-images repository [repository](https://github.com/oracle/docker-images). For example:
-
-```bash
-$ cd $WORK_DIR
-$ git clone https://github.com/oracle/docker-images
-```
-
-This will create the required directories and files under `$WORK_DIR/docker-images`.
-
-The files required for creation of the Oracle Internet Directory image can be located in the `$WORK_DIR/docker-images/OracleInternetDirectory/dockerfiles/12.2.1.4.0/container-scripts directory`.
-
-## 6. Additional build commands
-
-Oracle Internet Directory image requires additional build commands to set the required environment variables, install os packages and copy the additional build files to the image being built.
-
-A sample additional build commands input file can be found at `$WORK_DIR/docker-images/OracleInternetDirectory/imagetool/12.2.1.4.0/additionalBuildCmds.txt`.
-
-
-## 7. Steps to Create Oracle Internet Directory image
-
-Add the required installers, packages and patches to the imagetool cache by running the following commands.
-
-### i) Add JDK package to Imagetool cache
-
-```bash
-$ imagetool cache addInstaller --type jdk --version 8u301 --path $WORK_DIR/stage/jdk-8u301-linux-x64.tar.gz
-```
-
-### ii) Add installers to Imagetool cache
-
-```bash
-$ imagetool cache addInstaller --type oid --version 12.2.1.4.0 --path $WORK_DIR/stage/fmw_12.2.1.4.0_oid_linux64.bin
-$ imagetool cache addInstaller --type fmw --version 12.2.1.4.0 --path $WORK_DIR/stage/fmw_12.2.1.4.0_infrastructure.jar
-```
-
-### iii) Add Patches to Imagetool cache
-In case patches are required to be included in image, they should be added to Imagetool cache:
-
-```bash
-$ imagetool cache addEntry --key 28186730_13.9.4.2.2 --value $WORK_DIR/stage/p28186730_139422_Generic.zip
-$ imagetool cache addEntry --key 31400392_12.2.1.4.0 --value $WORK_DIR/stage/p31400392_122140_Generic.zip
-```
-
-### iv) Create the Oracle Internet Directory image
-
-Execute the `imagetool create` command to create the Oracle Internet Directory image.
-
-The following parameters are provided as input to the create command,
-
-* `jdkVersion` - JDK version to be used in the image.
-* `type` - type of image to be built.
-* `version` - version of the image.
-* `tag` - tag name for the image.
-* `additionalBuildCommands` - additional build commands provided as a text file.
-* `addtionalBuildFiles` - path of additional build files as comma separated list.
-
-
-Below is a sample command used to build an Oracle Internet Directory image.
-
-```bash
-$ imagetool create --jdkVersion=8u301 --type oid --version=12.2.1.4.0 \
-    --tag=oracle/oid:12.2.1.4.0 \
-    --chown=oracle:root \
-    --additionalBuildCommands $WORK_DIR/docker-images/OracleInternetDirectory/imagetool/12.2.1.4.0/additionalBuildCmds.txt \
-    --additionalBuildFiles $WORK_DIR/docker-images/OracleInternetDirectory/dockerfiles/12.2.1.4.0/container-scripts \
-    --patches <patch_a>,<patch_b>,...
-```
-> --`patches` option is required only when image is required to be generated with patches
-
-### v) View the Docker image
-
-Run the `docker images` command to ensure the new Oracle Internet Directory image is loaded into the repository:
-
-```bash
-$ docker images
-REPOSITORY                                                                   TAG                       IMAGE ID            CREATED             SIZE
-oracle/oid                                                                   12.2.1.4.0                09294d0fd357        About an hour ago   5.09GB
-...
-```
-
-## 8. Generate sample `Dockerfile` with imagetool
-
-If you want to review a sample `Dockerfile` created with the imagetool issue the `imagetool` command with the `--dryRun` option:
-
-
-```bash
-imagetool @$WORK_DIR/docker-images/OracleInternetDirectory/imagetool/12.2.1.4.0/buildArgs --dryRun
-```
-
-
-### License
+## License
 To download and run Oracle Fusion Middleware products, regardless whether inside or outside a container, you must download the binaries from the Oracle website and accept the license indicated at that page.
 
 All scripts and files hosted in this project and GitHub [docker-images/OracleInternetDirectory](./) repository required to build the images are, unless otherwise noted, released under [UPL 1.0](https://oss.oracle.com/licenses/upl/) license.
 
-### Copyright
-Copyright (c) 2021, Oracle and/or its affiliates.
+## Copyright
+Copyright (c) 2021, 2022, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl

OracleUnifiedDirectory/dockerfiles/12.2.1.4.0/Dockerfile

@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2020 Oracle and/or its affiliates.
+# Copyright (c) 2020, 2022, Oracle and/or its affiliates.
 #
 # Licensed under the Universal Permissive License v 1.0 as shown at 
 # https://oss.oracle.com/licenses/upl.
@@ -50,12 +50,12 @@ USER root
 RUN mkdir -p ${BASE_DIR} && \
     mkdir -p ${PATCHES_BASE_DIR}/opatch_patch && \
     mkdir -p ${PATCHES_BASE_DIR}/patches && \
-    useradd -b ${BASE_DIR} -d ${ORACLE_HOME} -m -s /bin/bash oracle && \
-	chmod -R a+xr ${PATCHES_BASE_DIR} && chown -R oracle:oracle ${PATCHES_BASE_DIR} && \
-    chmod -R a+xr ${BASE_DIR} && chown -R oracle:oracle ${BASE_DIR} && \
+   useradd -b ${BASE_DIR} -d ${ORACLE_HOME} -g root -m -s /bin/bash oracle && \
+	chmod -R a+xr ${PATCHES_BASE_DIR} && chown -R oracle:root ${PATCHES_BASE_DIR} && \
+    chmod -R a+xr ${BASE_DIR} && chown -R oracle:root ${BASE_DIR} && \
     mkdir -p ${USER_PROJECTS_DIR} && \
-    chown -R oracle:oracle ${USER_PROJECTS_DIR} && chmod -R 770 ${USER_PROJECTS_DIR} && \
-    mkdir -p ${SCRIPT_DIR} && chown oracle:oracle ${SCRIPT_DIR} && \
+    chown -R oracle:root ${USER_PROJECTS_DIR} && chmod -R 770 ${USER_PROJECTS_DIR} && \
+    mkdir -p ${SCRIPT_DIR} && chown oracle:root ${SCRIPT_DIR} && \
     yum install -y libaio hostname vi && \
     rm -rf /var/cache/yum
 
@@ -68,17 +68,17 @@ FROM base as builder
 COPY container-scripts/* ${SCRIPT_DIR}/
 COPY install/* ${BASE_DIR}/
 ADD  $FMW_OUD_JAR ${BASE_DIR}/
-COPY --chown=oracle:oracle Dockerfile opatch_patch/* ${PATCHES_BASE_DIR}/opatch_patch/
-COPY --chown=oracle:oracle Dockerfile patches/* ${PATCHES_BASE_DIR}/patches/
+COPY --chown=oracle:root Dockerfile opatch_patch/* ${PATCHES_BASE_DIR}/opatch_patch/
+COPY --chown=oracle:root Dockerfile patches/* ${PATCHES_BASE_DIR}/patches/
 
 #
 # Update Permissions for packages and scripts
 # --------------------------------------------
 RUN cd ${BASE_DIR} && chmod 755 *.jar && \
      chmod a+xr ${SCRIPT_DIR}/* && \
-     chown -R oracle:oracle ${SCRIPT_DIR} && \
-     chown -R oracle:oracle ${BASE_DIR} && \
-     chown -R oracle:oracle ${PATCHES_BASE_DIR}
+     chown -R oracle:root ${SCRIPT_DIR} && \
+     chown -R oracle:root ${BASE_DIR} && \
+     chown -R oracle:root ${PATCHES_BASE_DIR}
 
 # 
 # Installation of OUD Binaries
@@ -150,8 +150,8 @@ RUN export OPATCH_NO_FUSER=TRUE && patchzips=`ls ${PATCHES_BASE_DIR}/patches/p*.
 # -------------
 FROM base
 
-COPY --chown=oracle:oracle --from=builder $BASE_DIR $BASE_DIR
-COPY --chown=oracle:oracle --from=builder $JAVA_HOME $JAVA_HOME
+COPY --chown=oracle:root --from=builder $BASE_DIR $BASE_DIR
+COPY --chown=oracle:root --from=builder $JAVA_HOME $JAVA_HOME
 
 USER oracle
 WORKDIR ${ORACLE_HOME}