Merge branch '5.5.2' into 'development'

Changed the BASE_IMAGE to the JDK container and then some cleanup

See merge request !4

Dockerfile

@@ -14,8 +14,8 @@
 # limitations under the License.
 
 ARG BASE_REGISTRY=registry1.dsop.io
-ARG BASE_IMAGE=redhat/ubi/ubi8
-ARG BASE_TAG=8.2
+ARG BASE_IMAGE=redhat/openjdk/openjdk11
+ARG BASE_TAG=1.11
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -36,15 +36,10 @@ RUN dnf update -y && \
 ## Python Installed
 ########################################
 
-########################################
-## Install Java
-RUN dnf update -y && \
-    dnf install -y java-1.8.0-openjdk.x86_64 && \
-    dnf clean all && \
-    rm -rf /var/cache/dnf
 
-## Java Installed
 ########################################
+## Add the Confluent Docker Utility Belt which helps with starting the proper applications
+## https://github.com/confluentinc/common-docker/tree/master/utility-belt
 
 COPY wheel-0.35.1-py2.py3-none-any.whl /tmp/wheel-0.35.1-py2.py3-none-any.whl
 COPY python_dateutil-2.8.0-py2.py3-none-any.whl /tmp/python_dateutil-2.8.0-py2.py3-none-any.whl
@@ -60,19 +55,23 @@ RUN pip3 install --no-index --only-binary --install-option="--prefix=/usr/local"
 RUN pip3 install --no-index --only-binary --install-option="--prefix=/usr/local" --upgrade --find-links /tmp/python-dependencies/ /tmp/python_dateutil-2.8.0-py2.py3-none-any.whl
 RUN pip3 install --no-index --only-binary --install-option="--prefix=/usr/local" --upgrade --find-links /tmp/python-dependencies/ /tmp/setuptools-50.0.0-py3-none-any.whl
 RUN pip3 install --no-index --only-binary --install-option="--prefix=/usr/local" --upgrade --find-links /tmp/python-dependencies/ /tmp/confluent_docker_utils-0.0.40-py3-none-any.whl
+## dub installed
+########################################
 
 RUN mkdir -p /etc/confluent/docker /usr/logs \
     && useradd --no-log-init --create-home --shell /bin/bash appuser \
     && chown appuser:appuser -R /etc/confluent/ /usr/logs
 
-ADD --chown=appuser:appuser target/cp-base-new-5.5.2-package/share/doc/* /usr/share/doc/cp-base-new/
-ADD --chown=appuser:appuser target/cp-base-new-5.5.2-package/share/java/cp-base-new/* /usr/share/java/cp-base-new/
+COPY --chown=appuser:appuser target/cp-base-new-5.5.2-package/share/doc/* /usr/share/doc/cp-base-new/
+COPY --chown=appuser:appuser target/cp-base-new-5.5.2-package/share/java/cp-base-new/* /usr/share/java/cp-base-new/
 
 COPY --chown=appuser:appuser include/etc/confluent/docker /etc/confluent/docker
 
 RUN mkdir /licenses
 COPY license.txt /licenses
 
+# Correct SUID bit being set
+RUN chmod 0755 /usr/bin/ksu
 
 ############ ^^^^^ Base Container Details ^^^^^ ############
 ############################################################