Merge branch 'main' into develop-v2

# Conflicts:
#	imagetool/pom.xml
#	imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/InspectOutput.java
#	imagetool/src/main/java/com/oracle/weblogic/imagetool/inspect/OperatingSystemProperties.java
#	installer/pom.xml
#	pom.xml
#	tests/pom.xml

Author: ddsharpe

.github/release.yml

@@ -0,0 +1,18 @@
+# .github/release.yml
+
+changelog:
+  exclude:
+    labels:
+      - ignore-for-release
+    authors:
+      - dependabot
+  categories:
+    - title: Major Changes
+      labels:
+        - breaking-change
+    - title: Additional Features
+      labels:
+        - enhancement
+    - title: Bug Fixes
+      labels:
+        - "*"

Jenkinsfile

@@ -17,6 +17,8 @@ pipeline {
         // variables for SystemTest stages (integration tests)
         STAGING_DIR = "/scratch/artifacts/imagetool"
         DB_IMAGE = "phx.ocir.io/weblogick8s/database/enterprise:12.2.0.1-slim"
+        GITHUB_API_TOKEN = credentials('encj_github_token')
+        GH_TOOL = tool name: 'github-cli', type: 'com.cloudbees.jenkins.plugins.customtools.CustomTool'
     }
 
     stages {
@@ -92,7 +94,6 @@ pipeline {
             when {
                 anyOf {
                     triggeredBy 'TimerTrigger'
-                    tag 'release-*'
                     changelog '\\[full-mats\\].*'
                 }
             }
@@ -118,7 +119,7 @@ pipeline {
                 }
             }
         }
-        stage ('Save Nightly Installer'){
+        stage ('Save Nightly Installer') {
             when {
                 allOf {
                     triggeredBy 'TimerTrigger'
@@ -131,6 +132,23 @@ pipeline {
                 '''
             }
         }
+        stage ('Create Draft Release') {
+            when {
+                tag 'release-*'
+            }
+            steps {
+                sh """
+                    echo '${env.GITHUB_API_TOKEN}' | ${GH_TOOL}/bin/gh auth login --with-token
+                    TAG_VERSION_NUMBER=sh("echo ${TAG_NAME} | sed 's/release-//'"), returnStdout: true).trim(), 
+                    ${GH_TOOL}/bin/gh release create ${TAG_NAME} \
+                        --draft \
+                        --generate-notes \
+                        --title 'WebLogic Image Tool ${TAG_VERSION_NUMBER}' \
+                        --repo https://github.com/oracle/weblogic-image-tool \
+                        installer/target/imagetool.zip
+                """
+            }
+        }
      }
 }
 

build_spec.yaml

@@ -0,0 +1,16 @@
+# Copyright (c) 2023, Oracle and/or its affiliates.
+
+version: 0.1
+component: build
+timeoutInSeconds: 1000
+shell: bash
+
+steps:
+  - type: Command
+    name: "compress the repo"
+    command: |
+      tar -cvzf ${OCI_WORKSPACE_DIR}/repo.tgz ./
+outputArtifacts:
+  - name: artifact
+    type: BINARY
+    location: ${OCI_WORKSPACE_DIR}/repo.tgz

documentation/1.11/content/developer/contribute.md

@@ -17,7 +17,7 @@ an issue too.
 ### Contributing to the WebLogic Image Tool repository
 
 Pull requests can be made under
-[The Oracle Contributor Agreement](https://www.oracle.com/technetwork/community/oca-486395.html) (OCA).
+[The Oracle Contributor Agreement](https://oca.opensource.oracle.com/) (OCA).
 
 For pull requests to be accepted, the bottom of your commit message must have
 the following line using your name and e-mail address as it appears in the

documentation/1.11/content/samples/create-image-wdt.md

@@ -39,4 +39,4 @@ The parameter mappings between the Image Tool and the WebLogic Deploy Tool are:
 
 **Note**: If you are creating a JRF domain and want WebLogic Deploy Tool to create the RCU schemas for you, you can
 specify the connection information in the model. See [Specifying RCU
-information in the model](https://github.com/oracle/weblogic-deploy-tooling/blob/master/site/rcuinfo.md).
+information in the model](https://oracle.github.io/weblogic-deploy-tooling/rcuinfo/).

documentation/1.11/content/userguide/tools/create-aux-image.md

@@ -9,7 +9,7 @@ description: "The createAuxImage command creates a new container image with WDT
 
 The `createAuxImage` command helps build a container image from a given base OS image.
 Auxiliary images are very small images providing the WDT install files with WDT models, archives, and variables
-for [WebLogic Kubernetes Operator - Auxiliary Images](https://oracle.github.io/weblogic-kubernetes-operator/userguide/managing-domains/model-in-image/auxiliary-images/).
+for [WebLogic Kubernetes Operator - Auxiliary Images](https://oracle.github.io/weblogic-kubernetes-operator/managing-domains/model-in-image/auxiliary-images/).
 These images are an alternative approach for including Model-in-Image model files, application archive files, WebLogic Deploying Tooling installation files, or other types of files,
 in your WebLogic Server Kubernetes Operator environment.
 
@@ -24,7 +24,7 @@ Usage: imagetool createAuxImage [OPTIONS]
 | `--tag` | (Required) Tag for the final build image. Example: `store/oracle/mydomain:1`  |   |
 | `--additionalBuildCommands` | Path to a file with additional build commands. For more details, see [Additional information](#--additionalbuildcommands). |
 | `--additionalBuildFiles` | Additional files that are required by your `additionalBuildCommands`.  A comma separated list of files that should be copied to the build context. See [Additional information](#--additionalbuildfiles). |
-| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | `docker`  |
+| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | Defaults to `docker`, or, when set, to the value in environment variable `WLSIMG_BUILDER`. |
 | `--buildNetwork` | Networking mode for the RUN instructions during the image build.  See `--network` for Docker `build`.  |   |
 | `--chown` | `userid:groupid` for JDK/Middleware installs and patches.  | `oracle:oracle` |
 | `--dryRun` | Skip Docker build execution and print the Dockerfile to stdout.  |  |
@@ -52,6 +52,7 @@ Valid sections for `createAuxImage` are:
 
 | Section | Available Variables | Build Stage | Timing |
 | --- | --- | --- | --- |
+| `initial-build-commands` | None | All | As root, and before any Image Tool actions. |
 | `package-manager-packages` | None | All | A list of OS packages, such as `ftp gzip`, separated by line or space. |
 | `final-build-commands` | `AUXILIARY_IMAGE_PATH` `WDT_HOME` `WDT_MODEL_HOME`| Final image | After all Image Tool actions are complete, and just before the container image is finalized. |
 

documentation/1.11/content/userguide/tools/create-image.md

@@ -21,7 +21,7 @@ Usage: imagetool create [OPTIONS]
 | `--tag` | (Required) Tag for the final build image. Example: `store/oracle/weblogic:12.2.1.3.0`  |   |
 | `--additionalBuildCommands` | Path to a file with additional build commands. For more details, see [Additional information](#--additionalbuildcommands). |
 | `--additionalBuildFiles` | Additional files that are required by your `additionalBuildCommands`.  A comma separated list of files that should be copied to the build context. See [Additional information](#--additionalbuildfiles). |
-| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | `docker`  |
+| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | Defaults to `docker`, or, when set, to the value in environment variable `WLSIMG_BUILDER`. |
 | `--buildNetwork` | Networking mode for the RUN instructions during the image build.  See `--network` for Docker `build`.  |   |
 | `--chown` | `userid:groupid` for JDK/Middleware installs and patches.  | `oracle:oracle` |
 | `--docker` | (DEPRECATED) Path to the Docker executable. Use `--builder` instead.  |  `docker` |
@@ -75,6 +75,7 @@ Valid sections for create are:
 
 | Section | Available Variables | Build Stage | Timing |
 | --- | --- | --- | --- |
+| `initial-build-commands` | None | All | As root, and before any Image Tool actions. |
 | `package-manager-packages` | None | All | A list of OS packages, such as `ftp gzip`, separated by line or space. |
 | `before-jdk-install` | `JAVA_HOME` | Intermediate (JDK_BUILD) | Before the JDK is installed. |
 | `after-jdk-install` | `JAVA_HOME` | Intermediate (JDK_BUILD) | After the JDK is installed. |

documentation/1.11/content/userguide/tools/inspect-image.md

@@ -16,7 +16,7 @@ Usage: imagetool inspect [OPTIONS]
 | Parameter | Definition | Default |
 | --- | --- | --- |
 | `--image`, `-i` | (Required) The image ID or image name to be inspected.  |   |
-| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | `docker`  |
+| `--builder`, `-b` | Executable to inspect Docker images. Use the full path of the executable if not on your path. | Defaults to `docker`, or, when set, to the value in environment variable `WLSIMG_BUILDER`. |
 | `--format` | The output format. Supported values: `JSON` | `JSON`  |
 | `--patches` | Include OPatch information in the output, including a list of WebLogic patches that are applied.  |   |
 

documentation/1.11/content/userguide/tools/rebase-image.md

@@ -21,7 +21,7 @@ Usage: imagetool rebase [OPTIONS]
 | `--tag` | (Required) Tag for the final build image. Example: `store/oracle/weblogic:12.2.1.3.0`  |   |
 | `--additionalBuildCommands` | Path to a file with additional build commands. For more details, see [Additional information](#--additionalbuildcommands). |
 | `--additionalBuildFiles` | Additional files that are required by your `additionalBuildCommands`.  A comma separated list of files that should be copied to the build context. See [Additional information](#--additionalbuildfiles). |
-| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | `docker`  |
+| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | Defaults to `docker`, or, when set, to the value in environment variable `WLSIMG_BUILDER`. |
 | `--buildNetwork` | Networking mode for the RUN instructions during the image build.  See `--network` for Docker `build`.  |   |
 | `--chown` | `userid:groupid` for JDK/Middleware installs and patches.  | `oracle:oracle` |
 | `--dryRun` | Skip Docker build execution and print the Dockerfile to stdout.  |  |
@@ -58,6 +58,7 @@ The input for this parameter is a simple text file that contains one or more of
 
 | Section | Available Variables | Build Stage | Timing |
 | --- | --- | --- | --- |
+| `initial-build-commands` | None | All | As root, and before any Image Tool actions. |
 | `before-jdk-install` | `JAVA_HOME` `DOMAIN_HOME`| Intermediate (JDK_BUILD) | Before the JDK is installed. |
 | `after-jdk-install` | `JAVA_HOME` `DOMAIN_HOME` | Intermediate (JDK_BUILD) | After the JDK is installed. |
 | `before-fmw-install` | `JAVA_HOME` `ORACLE_HOME` `DOMAIN_HOME` | Intermediate (WLS_BUILD) | Before the Oracle Home is created. |

documentation/1.11/content/userguide/tools/update-image.md

@@ -29,7 +29,7 @@ Update WebLogic Docker image with selected patches
 | `--tag` | (Required) Tag for the final build image. Example: `store/oracle/weblogic:12.2.1.3.0` |  |
 | `--additionalBuildCommands` | Path to a file with additional build commands. For more details, see [Additional information](#--additionalbuildcommands). | |
 | `--additionalBuildFiles` | Additional files that are required by your `additionalBuildCommands`.  A comma separated list of files that should be copied to the build context. See [Additional information](#--additionalbuildfiles). |  |
-| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | `docker` |
+| `--builder`, `-b` | Executable to process the Dockerfile. Use the full path of the executable if not on your path. | Defaults to `docker`, or, when set, to the value in environment variable `WLSIMG_BUILDER`. |
 | `--buildNetwork` | Networking mode for the RUN instructions during the image build.  See `--network` for Docker `build`. | |
 | `--chown` | `userid:groupid` for middleware patches and other operations. | Owner:Group of the Oracle Home |
 | `--dryRun` | Skip Docker build execution and print the Dockerfile to stdout. | |