Merge remote-tracking branch 'origin/release/2.6.0' into tmp-releasing-260

Author: rjeberhard

Dockerfile

@@ -4,37 +4,60 @@
 # HOW TO BUILD THIS IMAGE
 # -----------------------
 # Run:
-#      $ docker build -t weblogic-kubernetes-operator:latest .
+#      $ ./buildDockerImage.sh [-t <image-name>]
 #
-# Pull base image
-# From the Docker store
 # -------------------------
-FROM openjdk:11-oracle
-RUN yum -y install openssl && yum clean all
+FROM oraclelinux:7-slim
 
 # Maintainer
 # ----------
 MAINTAINER Ryan Eberhard <[email protected]>
 
-# make the operator run with a non-root user id (1000 is the `oracle` user)
-RUN groupadd -g 1000 oracle && \
-    useradd -d /operator -M -s /bin/bash -g 1000 -u 1000 oracle && \
-    mkdir /operator && \
-    mkdir /operator/lib && \
-    mkdir /logs && \
+RUN set -eux; \
+    yum -y install gzip tar openssl; \
+    rm -rf /var/cache/yum
+
+# Default to UTF-8 file.encoding
+ENV LANG en_US.UTF-8
+
+ENV JAVA_HOME /usr/local/graalvm-ce-java11
+ENV PATH /operator:$JAVA_HOME/bin:$PATH
+
+ENV JAVA_VERSION 11.0.7
+ENV JAVA_URL https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-19.3.2/graalvm-ce-java11-linux-amd64-19.3.2.tar.gz
+
+# Install Java and make the operator run with a non-root user id (1000 is the `oracle` user)
+RUN set -eux; \
+    curl -fL -o /graalvm-ce-java11.tar.gz "$JAVA_URL"; \
+    mkdir -p "$JAVA_HOME"; \
+    tar --extract --file /graalvm-ce-java11.tar.gz --directory "$JAVA_HOME" --strip-components 1; \
+    rm /graalvm-ce-java11.tar.gz; \
+    mkdir /usr/java; \
+    ln -sfT "$JAVA_HOME" /usr/java/default; \
+    ln -sfT "$JAVA_HOME" /usr/java/latest; \
+    rm -Rf "$JAVA_HOME/include" "$JAVA_HOME/jmods" "$JAVA_HOME/languages" "$JAVA_HOME/tools" "$JAVA_HOME/lib/svm" "$JAVA_HOME/lib/installer" "$JAVA_HOME/lib/visualvm" "$JAVA_HOME/lib/truffle" "$JAVA_HOME/lib/polyglot"; \
+    rm -f "$JAVA_HOME/lib/src.zip" "$JAVA_HOME/lib/libjvmcicompiler.so" "$JAVA_HOME/bin/polyglot"; \
+    for bin in "$JAVA_HOME/bin/"*; do \
+        base="$(basename "$bin")"; \
+        [ ! -e "/usr/bin/$base" ]; \
+        alternatives --install "/usr/bin/$base" "$base" "$bin" 20000; \
+    done; \
+    java -Xshare:dump; \
+    groupadd -g 1000 oracle; \
+    useradd -d /operator -M -s /bin/bash -g 1000 -u 1000 oracle; \
+    mkdir -p /operator/lib; \
+    mkdir /logs; \
     chown -R 1000:1000 /operator /logs
-USER 1000
 
-ENV PATH=$PATH:/operator
+USER 1000
 
-ARG VERSION
 COPY src/scripts/* /operator/
-COPY operator/target/weblogic-kubernetes-operator-$VERSION.jar /operator/weblogic-kubernetes-operator.jar
+COPY operator/target/weblogic-kubernetes-operator.jar /operator/weblogic-kubernetes-operator.jar
 COPY operator/target/lib/*.jar /operator/lib/
 
 HEALTHCHECK --interval=1m --timeout=10s \
   CMD /operator/livenessProbe.sh
 
 WORKDIR /operator/
 
-CMD ["/operator/operator.sh"]
+CMD ["/operator/operator.sh"]

build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/checkstyle-noframes-sorted.xsl renamed to build-tools/checkstyle/checkstyle-noframes-sorted.xsl

@@ -41,7 +41,7 @@
     </module>
 
     <module name="RegexpHeader">
-        <property name="headerFile" value="build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/java.header"/>
+        <property name="header" value="^// Copyright \(c\) (\d\d\d\d, )+Oracle Corporation and\/or its affiliates\.$\n^// Licensed under the Universal Permissive License v 1\.0 as shown at https://oss\.oracle\.com/licenses/upl\.$"/>
         <property name="fileExtensions" value="java"/>
     </module>
 

build-tools/src/main/resources/weblogic-kubernetes-operator/checkstyle/customized_google_checks.xml renamed to build-tools/checkstyle/customized_google_checks.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE suppressions PUBLIC
+    "-//Puppy Crawl//DTD Suppressions 1.1//EN"
+    "http://www.puppycrawl.com/dtds/suppressions_1_1.dtd">
+
+<suppressions>
+    <!-- There's nothing wrong with these - ignore them b/c they generate noise -->
+    <suppress checks="AbbreviationAsWordInName" files=".*"/>
+
+    <suppress checks="VariableDeclarationUsageDistanceCheck" files=".*"/>
+</suppressions>