Merge branch 'main' into develop-v2

# Conflicts:
#	imagetool/pom.xml
#	installer/pom.xml
#	pom.xml
#	tests/pom.xml

Author: ddsharpe

.github/workflows/create-release.yml

@@ -0,0 +1,28 @@
+# Copyright (c) 2023, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
+name: Create Release
+run-name: Creating draft release for ${{ github.ref_name }}
+
+on:
+  push:
+    tags:
+      - 'release-*'
+
+jobs:
+  release_job:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+      - run: |
+          mvn -B clean package
+      - id: version
+        run: echo "::set-output name=number::`echo "${{ github.ref_name }}" | sed 's/release-//'`"
+      - env:
+          GH_TOKEN: ${{ github.token }}
+        run: |
+          gh release create ${{ github.ref_name }} \
+          --draft \
+          --generate-notes \
+          --title 'WebLogic Image Tool ${{ steps.version.outputs.number }}' \
+          installer/target/imagetool.zip

.github/workflows/publish-github-pages.yml

@@ -1,4 +1,4 @@
-# Copyright (c) 2021, Oracle and/or its affiliates.
+# Copyright (c) 2021, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
 # Description
@@ -8,7 +8,10 @@ name: "PublishGitHubPages"
 
 on:
   push:
-    branches: [ main ]
+    branches:
+      - 'main'
+    paths:
+      - 'documentation/**'
   schedule:
     - cron: '15 3 * * 1'
 
@@ -23,32 +26,19 @@ jobs:
 
     steps:
       - name: Checkout main
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           ref: main
-          fetch-depth: 32
           path: main
 
       - name: Checkout gh-pages
-        uses: actions/checkout@v2.3.4
+        uses: actions/checkout@v3
         with:
           ref: gh-pages
           path: gh-pages
           token: ${{ secrets.PUBLISH_SECRET }}
 
-      - name: Verify changes to documentation present
-        id: change-check
-        run: |
-          cd $GITHUB_WORKSPACE/main
-          X=`git diff HEAD~1 --name-only | { grep "^documentation" || test $? = 1; } | wc -l`
-          if [ $X == "0" ]; then
-            echo 'No changes to the documenation'
-          else
-            echo '::set-output name=DOCUMENTATION_CHANGED::true'
-          fi
-
       - name: Build and publish site
-        if: ${{ steps.change-check.outputs.DOCUMENTATION_CHANGED == 'true' }}
         run: |
           curl -fL -o hugo.tar.gz "https://github.com/gohugoio/hugo/releases/download/v0.82.0/hugo_0.82.0_Linux-64bit.tar.gz"
           tar -xf hugo.tar.gz

.github/workflows/sonar-branch.yml

@@ -0,0 +1,34 @@
+# Copyright (c) 2023, Oracle and/or its affiliates.
+# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
+#
+name: Sonar Scan
+
+on:
+  push:
+    branches:
+      - 'main'
+      - 'develop*'
+
+jobs:
+  sonar_scan:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: 0
+      - name: Setup JDK 11
+        uses: actions/setup-java@v3
+        with:
+          distribution: 'adopt'
+          java-version: 11
+      - name: Build and Test
+        run: |
+          mvn -B clean package
+      - name: Sonar Scan
+        run: |
+          mvn -B sonar:sonar \
+          -Dsonar.branch.name=main \
+          -Dsonar.projectKey=oracle_weblogic-image-tool
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}

Jenkinsfile

@@ -162,40 +162,14 @@ pipeline {
         stage ('Sync') {
             when {
                 branch 'main'
-                anyOf {
-                    not { triggeredBy 'TimerTrigger' }
-                    tag 'release-*'
-                }
+                not { triggeredBy 'TimerTrigger' }
             }
             steps {
                 build job: "wkt-sync",
                         parameters: [ string(name: 'REPOSITORY', value: 'weblogic-image-tool') ],
                         wait: true
             }
         }
-        stage ('Create Draft Release') {
-            when {
-                tag 'release-*'
-            }
-            steps {
-                script {
-                    env.TAG_VERSION_NUMBER = env.TAG_NAME.replaceAll('release-','').trim()
-                }
-                withCredentials([string(credentialsId: 'wkt-github-token', variable: 'GITHUB_API_TOKEN')]) {
-                    sh """
-                    mkdir gh-cli
-                    curl -sL https://github.com/cli/cli/releases/download/v2.28.0/gh_2.28.0_linux_amd64.tar.gz | tar xvzf - --strip-components=1 -C ./gh-cli
-                    echo '${GITHUB_API_TOKEN}' | ./gh-cli/bin/gh auth login --with-token
-                    ./gh-cli/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
-                    """
-                }
-            }
-        }
     }
 }
 

imagetool/src/main/java/com/oracle/weblogic/imagetool/builder/BuildCommand.java

@@ -15,6 +15,7 @@
 import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -98,6 +99,21 @@ public BuildCommand buildArg(String key, String value, boolean conceal) {
         return this;
     }
 
+    /**
+     * Add multiple --build-arg key value pairs to the Docker build command.
+     * @param keyValuePairs A map of key-value pairs to be used directly with the container image builder
+     */
+    public BuildCommand buildArg(Map<String,String> keyValuePairs) {
+        if (keyValuePairs == null || keyValuePairs.isEmpty()) {
+            return this;
+        }
+
+        for (Map.Entry<String,String> entry : keyValuePairs.entrySet()) {
+            buildArg(entry.getKey(), entry.getValue());
+        }
+        return this;
+    }
+
     /**
      * Add a --network to the Docker build command.
      * @param value the Docker network to use

imagetool/src/main/java/com/oracle/weblogic/imagetool/cli/menu/CommonOptions.java

@@ -11,6 +11,7 @@
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 import java.util.UUID;
 import java.util.regex.Matcher;
@@ -123,6 +124,7 @@ BuildCommand getInitialBuildCmd(String contextFolder) {
             .tag(imageTag)
             .network(buildNetwork)
             .pull(buildPull)
+            .buildArg(buildArgs)
             .buildArg("http_proxy", httpProxyUrl, httpProxyUrl != null && httpProxyUrl.contains("@"))
             .buildArg("https_proxy", httpsProxyUrl, httpsProxyUrl != null && httpsProxyUrl.contains("@"))
             .buildArg("no_proxy", nonProxyHosts);
@@ -175,6 +177,12 @@ void initializeOptions() throws InvalidCredentialException, IOException, Invalid
         handleChown();
         handleAdditionalBuildCommands();
 
+        if (buildArgs != null) {
+            for (String arg : buildArgs.keySet()) {
+                dockerfileOptions.buildArgs(arg);
+            }
+        }
+
         if (kubernetesTarget == KubernetesTarget.OPENSHIFT) {
             dockerfileOptions.setDomainGroupAsUser(true);
             // if the user did not set the OS user:group, make the default oracle:root, instead of oracle:oracle
@@ -408,6 +416,12 @@ public String buildId() {
     )
     KubernetesTarget kubernetesTarget = KubernetesTarget.DEFAULT;
 
+    @Option(
+        names = {"--build-arg"},
+        description = "Additional argument passed directly to the build engine."
+    )
+    Map<String,String> buildArgs;
+
     @SuppressWarnings("unused")
     @Unmatched
     List<String> unmatchedOptions;

imagetool/src/main/java/com/oracle/weblogic/imagetool/util/DockerfileOptions.java

@@ -66,6 +66,7 @@ public class DockerfileOptions {
     private MiddlewareInstall mwInstallers;
     private boolean domainGroupAsUser;
     private boolean usingBusybox;
+    private List<String> buildArgs;
 
     // WDT values
     private String wdtHome;
@@ -97,6 +98,7 @@ public DockerfileOptions(String buildId) {
         skipMiddlewareInstall = false;
         domainGroupAsUser = false;
         usingBusybox = false;
+        buildArgs = new ArrayList<>();
 
         javaHome = DEFAULT_JAVA_HOME;
         oracleHome = DEFAULT_ORACLE_HOME;
@@ -1119,4 +1121,23 @@ public DockerfileOptions usingBusybox(boolean value) {
         usingBusybox = value;
         return this;
     }
+
+    /**
+     * Used by mustache template to retrieve variable names for ARG in Dockerfile.
+     * @return list of variable names
+     */
+    @SuppressWarnings("unused")
+    public List<String> buildArgs() {
+        return buildArgs;
+    }
+
+    /**
+     * Add ARG statements to the Dockerfile.
+     * @param variableName an ARG name.
+     * @return this
+     */
+    public DockerfileOptions buildArgs(String variableName) {
+        buildArgs.add(variableName);
+        return this;
+    }
 }

imagetool/src/main/resources/docker-files/Create_Image.mustache

@@ -3,6 +3,8 @@
 #
 
 FROM {{baseImage}} as os_update
+{{#buildArgs}}ARG {{{.}}}
+{{/buildArgs}}
 LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
 USER root
 {{#initialBuildCommands}}
@@ -29,7 +31,8 @@ USER root
 {{/isWdtEnabled}}
 
 FROM os_update as final_build
-
+{{#buildArgs}}ARG {{{.}}}
+{{/buildArgs}}
 ENV ORACLE_HOME={{{oracle_home}}} \
     LD_LIBRARY_PATH={{{oracle_home}}}/oracle_common/adr:$LD_LIBRARY_PATH \
 {{#installJava}}

imagetool/src/main/resources/docker-files/Rebase_Image.mustache

@@ -5,6 +5,8 @@
 {{#isRebaseToTarget}}
 FROM {{sourceImage}} as source_image
 FROM {{targetImage}} as final_build
+{{#buildArgs}}ARG {{{.}}}
+{{/buildArgs}}
 
 ENV DOMAIN_HOME={{{domain_home}}}
 LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
@@ -38,7 +40,8 @@ LABEL com.oracle.weblogic.imagetool.buildid="{{buildId}}"
     {{/installMiddleware}}
 
     FROM os_update as final_build
-
+    {{#buildArgs}}ARG {{{.}}}
+    {{/buildArgs}}
     ENV ORACLE_HOME={{{oracle_home}}} \
         LD_LIBRARY_PATH={{{oracle_home}}}/oracle_common/adr:$LD_LIBRARY_PATH \
     {{#installJava}}

imagetool/src/main/resources/docker-files/Update_Image.mustache

@@ -7,6 +7,8 @@
 {{/isWdtEnabled}}
 
 FROM {{baseImage}} as final_build
+{{#buildArgs}}ARG {{{.}}}
+{{/buildArgs}}
 USER root
 
 ENV OPATCH_NO_FUSER=true