address review feedback

Author: lfrancke

java-devel/Dockerfile

@@ -23,38 +23,40 @@ gpgcheck=1
 gpgkey=https://packages.adoptium.net/artifactory/api/gpg/key/public
 EOF
 
-RUN microdnf update && \
-    microdnf install -y \
-    cmake \
-    cyrus-sasl-devel \
-    # diff is required by maven during the build of hbase \
-    # Cannot run program "diff" (in directory "/stackable/hbase-2.4.12-src/hbase-shaded/hbase-shaded-check-invariants"
-    diffutils \
-    fuse-devel \
-    gcc \
-    gcc-c++ \
-    # The GNU gettext utilities contain the envsubst program which
-    # substitutes the values of environment variables.
-    gettext \
-    # For the apply_patches.sh script
-    git \
-    # Needed by the maven ant run plugin for the "set-hostname-property" step in zookeeper
-    hostname \
-    # Needed for compiling Java projects
-    "temurin-${PRODUCT}-jdk" \
-    krb5-devel \
-    libcurl-devel \
-    make \
-    maven \
-    openssl-devel \
-    # Required to unpack Omid tarball
-    tar \
-    wget \
-    which \
-    xz \
-    zlib-devel \
-    microdnf clean all && \
-    rm -rf /var/cache/yum
+RUN <<EOF
+microdnf update
+microdnf install \
+  cmake \
+  cyrus-sasl-devel \
+  `# diff is required by maven during the build of hbase` \
+  `# Cannot run program "diff" (in directory "/stackable/hbase-2.4.12-src/hbase-shaded/hbase-shaded-check-invariants"` \
+  diffutils \
+  fuse-devel \
+  gcc \
+  gcc-c++ \
+  `# The GNU gettext utilities contain the envsubst program which` \
+  `# substitutes the values of environment variables.` \
+  gettext \
+  `# For the apply_patches.sh script`\
+  git \
+  `# Needed by the maven ant run plugin for the "set-hostname-property" step in zookeeper` \
+  hostname \
+  `# Needed for compiling Java projects` \
+  "temurin-${PRODUCT}-jdk" \
+  krb5-devel \
+  libcurl-devel \
+  make \
+  maven \
+  openssl-devel \
+  `# Required to unpack Omid tarball` \
+  tar \
+  wget \
+  which \
+  xz \
+  zlib-devel
+microdnf clean all
+rm -rf /var/cache/yum
+EOF
 
 ENV JAVA_HOME="/usr/lib/jvm/temurin-${PRODUCT}-jdk"
 

testing-tools/Dockerfile

@@ -32,8 +32,7 @@ ENV DEBIAN_FRONTEND=noninteractive
 COPY testing-tools/python /stackable/python
 COPY testing-tools/licenses /licenses
 
-# krb5-user/libkrb5-dev are needed for Kerberos support.
-# Java 11 seems like the best middle-ground for all tools
+
 RUN <<EOF
 apt-get update
 apt-get install -y --no-install-recommends \
@@ -42,9 +41,10 @@ apt-get install -y --no-install-recommends \
   curl \
   gzip \
   jq \
+  `# krb5-user/libkrb5-dev are needed for Kerberos support. ` \
   krb5-user \
-  kubernetes-client \
   libkrb5-dev \
+  kubernetes-client \
   libssl-dev \
   libxml2-dev \
   libxslt1-dev \
@@ -58,6 +58,7 @@ apt-get install -y --no-install-recommends \
   tar \
   zip \
   unzip \
+  `# Java 11 seems like the best middle-ground for all tools` \
   openjdk-11-jdk-headless
 
 apt-get clean