Build WKO images for AMD and ARM (#4070)

* Build images for multiple architectures and manifest

Author: rjeberhard

Dockerfile

@@ -1,18 +1,25 @@
 # Copyright (c) 2017, 2023, Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 #
-# HOW TO BUILD THIS IMAGE
+# HOW TO BUILD AND PUSH THIS IMAGE
 # -----------------------
 # Run:
-#      $ ./buildDockerImage.sh [-t <image-name>]
+#      $ ./buildAndPushImage.sh -t <image-name>
 #
 # -------------------------
 FROM ghcr.io/oracle/oraclelinux:9-slim AS jre-build
 
-ENV JAVA_URL="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-x64_bin.tar.gz"
+ENV JAVA_URL_X64="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-x64_bin.tar.gz"
+ENV JAVA_URL_AARCH64="https://download.java.net/java/GA/jdk19.0.2/fdb695a9d9064ad6b064dc6df578380c/7/GPL/openjdk-19.0.2_linux-aarch64_bin.tar.gz"
 
 RUN set -eux; \
     microdnf -y install gzip tar; \
+    MACHINE_TYPE=`uname -m`; \
+    if [ ${MACHINE_TYPE} == 'x86_64' ]; then \
+      JAVA_URL=$JAVA_URL_X64; \
+    else \
+      JAVA_URL=$JAVA_URL_AARCH64; \
+    fi; \
     curl -fL -o /jdk.tar.gz "$JAVA_URL"; \
     mkdir -p /jdk; \
     tar --extract --file /jdk.tar.gz --directory /jdk --strip-components 1; \

buildDockerImage.sh renamed to buildAndPushImage.sh

@@ -3,19 +3,18 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 usage() {
-cat << EOF
+cat >&2 << EOF
 
-Usage: buildDockerImage.sh [-t tag]
-Builds a container image for the Oracle WebLogic Kubernetes Operator.
+Usage: buildAndPushImage.sh -t tag
+Builds and pushes a container image for the Oracle WebLogic Kubernetes Operator.
 
 Parameters:
    -t: image name and tag in 'name:tag' format
 
-Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 EOF
-exit 0
 }
 
 # WebLogic Kubernetes Operator Image Name
@@ -28,12 +27,15 @@ while getopts "t:" optname; do
       name="$OPTARG"
       ;;
     \? )
-      usage
+      usage; exit 0
       ;;
   esac
 done
 
-IMAGE_NAME=${name:-ghcr.io/oracle/weblogic-kubernetes-operator:4.0.5}
+if [ ! "$name" ]; then
+  echo "-t must be provided"
+  usage; exit 1
+fi
 SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 
 # Proxy settings
@@ -59,14 +61,34 @@ if [ "$PROXY_SETTINGS" != "" ]; then
 fi
 
 # ################## #
-# BUILDING THE IMAGE #
+# BUILDING AND PUSHING THE IMAGE #
 # ################## #
-echo "Building image '$IMAGE_NAME' ..."
+echo "Building image '$name' ..."
 
-# BUILD THE IMAGE (replace all environment variables)
+# BUILD AND PUSH THE IMAGE (replace all environment variables)
 BUILD_START=$(date '+%s')
-${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS -t $IMAGE_NAME -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
-  echo "There was an error building the image."
+${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS --pull --platform linux/amd64 --tag $name-amd64 -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
+  echo "There was an error building the amd64 image."
+  exit 1
+}
+${WLSIMG_BUILDER:-docker} push $PROXY_SETTINGS $name-amd64 || {
+  echo "There was an error pushing the amd64 image."
+  exit 1
+}
+${WLSIMG_BUILDER:-docker} build $PROXY_SETTINGS --pull --platform linux/arm64 --tag $name-aarch64 -f $SCRIPTPATH/Dockerfile $SCRIPTPATH || {
+  echo "There was an error building the aarch64 image."
+  exit 1
+}
+${WLSIMG_BUILDER:-docker} push $PROXY_SETTINGS $name-aarch64 || {
+  echo "There was an error pushing the aarch64 image."
+  exit 1
+}
+${WLSIMG_BUILDER:-docker} manifest create $PROXY_SETTINGS $name --amend $name-amd64 --amend $name-aarch64 || {
+  echo "There was an error building the manifest."
+  exit 1
+}
+${WLSIMG_BUILDER:-docker} manifest push $PROXY_SETTINGS $name || {
+  echo "There was an error pushing the manifest."
   exit 1
 }
 BUILD_END=$(date '+%s')
@@ -78,9 +100,9 @@ if [ $? -eq 0 ]; then
 cat << EOF
   WebLogic Kubernetes Operator Image is ready:
 
-    --> $IMAGE_NAME
+    --> $name
 
-  Build completed in $BUILD_ELAPSED seconds.
+  Build and push completed in $BUILD_ELAPSED seconds.
 
 EOF
 else

documentation/4.0/content/developerguide/building.md

@@ -18,12 +18,12 @@ This will compile the source files, build JAR files containing the compiled clas
 
 Contributions must conform to [coding and formatting standards]({{< relref "/developerguide/coding-standards.md" >}}).
 
-#### Building the operator container image
+#### Building and pushing the operator container image
 
 These commands should be executed in the project root directory:
 
 ```shell
-$ ./buildDockerImage.sh -t weblogic-kubernetes-operator:some-tag
+$ ./buildAndPushImage.sh -t weblogic-kubernetes-operator:some-tag
 ```
 
 Replace `<version>` with the version of the project found in the `pom.xml` file in the project root directory.

integration-tests/src/test/java/oracle/weblogic/kubernetes/TestConstants.java

@@ -50,8 +50,6 @@ public interface TestConstants {
       "../kubernetes/charts/weblogic-operator";
   public static final String IMAGE_NAME_OPERATOR =
       getNonEmptySystemProperty("wko.it.image.name.operator", "oracle/weblogic-kubernetes-operator");
-  public static final String OPERATOR_IMAGE_BUILD_SCRIPT =
-      "../buildDockerImage.sh";
   public static final String OPERATOR_SERVICE_NAME = "internal-weblogic-operator-svc";
   public static final String OPERATOR_GITHUB_CHART_REPO_URL =
       "https://oracle.github.io/weblogic-kubernetes-operator/charts";

integration-tests/src/test/java/oracle/weblogic/kubernetes/actions/impl/Operator.java

@@ -1,4 +1,4 @@
-// Copyright (c) 2020, 2022, Oracle and/or its affiliates.
+// Copyright (c) 2020, 2023, Oracle and/or its affiliates.
 // Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
 
 package oracle.weblogic.kubernetes.actions.impl;
@@ -9,13 +9,13 @@
 import oracle.weblogic.kubernetes.actions.impl.primitive.CommandParams;
 import oracle.weblogic.kubernetes.actions.impl.primitive.Helm;
 import oracle.weblogic.kubernetes.actions.impl.primitive.HelmParams;
+import oracle.weblogic.kubernetes.actions.impl.primitive.Image;
 
 import static oracle.weblogic.kubernetes.TestConstants.BUILD_ID;
 import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_REPO;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_NAME_OPERATOR;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_TAG_OPERATOR;
 import static oracle.weblogic.kubernetes.TestConstants.IMAGE_TAG_OPERATOR_FOR_JENKINS;
-import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_IMAGE_BUILD_SCRIPT;
 import static oracle.weblogic.kubernetes.TestConstants.OPERATOR_RELEASE_NAME;
 import static oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes.getContainerImage;
 import static oracle.weblogic.kubernetes.actions.impl.primitive.Kubernetes.patchDeployment;
@@ -94,11 +94,7 @@ public static String getImageName() {
    * @return true on success
    */
   public static boolean buildImage(String image) {
-    String command = String.format("%s -t %s", OPERATOR_IMAGE_BUILD_SCRIPT, image);
-    return Command
-        .withParams(new CommandParams()
-            .command(command))
-        .execute();
+    return Image.createImage("..", image, "");
   }
 
   /**

validateCLI.docker.dat

@@ -26,8 +26,8 @@ dockerFile
 dockerconfigjson
 /docker/
 /docker-images/
-"../buildDockerImage.sh"
-Usage: buildDockerImage.sh
+"../buildAndPushImage.sh"
+Usage: buildAndPushImage.sh
 docker-container\|ockerContainer\|DockerCluster
 contains."BEGIN DOCKERFILE".
 --docker-email