Merge branch '5.5.3' into 'development'

5.5.3

See merge request !6

Dockerfile

-ARG BASE_REGISTRY=registry1.dsop.io
-ARG BASE_IMAGE=confluentinc/cp-enterprise-control-center
-ARG BASE_TAG=5.5.2
+ARG BASE_REGISTRY=registry1.dso.mil
+ARG BASE_IMAGE=confluentinc/cp-enterprise-control-center-5.5.x
+ARG BASE_TAG=5.5.3
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
@@ -14,11 +14,13 @@ ENV COMPONENT_SCRIPT_DIR=/opt/confluent/etc
 
 WORKDIR /opt
 
-ADD operator-5.5.2-caas_lib.tar.gz /opt/caas/lib/
-ADD operator-5.5.2-plugins.tar.gz /usr/share/java/cc-base/
-ADD cp-enterprise-control-center-operator-5.5.2_caas.tar.gz /opt/caas/
+RUN mkdir -p /usr/share/java/cc-base /opt/caas
+COPY operator-5.5.3-plugins.tar.gz /usr/share/java/cc-base/
+COPY cp-enterprise-control-center-operator-5.5.3_caas.tar.gz /opt/caas/
 
-RUN yum install -y openssl findutils && yum clean all && mkdir -p "${CONTROL_CENTER_DATA_DIR}" "${CONTROL_CENTER_CONFIG_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" \
+RUN cd /usr/share/java/cc-base && tar -xvf operator-5.5.3-plugins.tar.gz && rm operator-5.5.3-plugins.tar.gz \
+    && cd /opt/caas && tar -xvf cp-enterprise-control-center-operator-5.5.3_caas.tar.gz && rm cp-enterprise-control-center-operator-5.5.3_caas.tar.gz \
+    && yum install -y openssl findutils && yum clean all && mkdir -p "${CONTROL_CENTER_DATA_DIR}" "${CONTROL_CENTER_CONFIG_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" \
    	&& chmod -R ag+w "${CONTROL_CENTER_DATA_DIR}" "${CONTROL_CENTER_CONFIG_DIR}" "/opt"	   
 
 CMD ["/opt/caas/bin/run"]

hardening_manifest.yaml

@@ -31,22 +31,17 @@ labels:
 
 # List of resources to make available to the offline build context
 resources:
-- filename: operator-5.5.2-plugins.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/operator-5.5.2-plugins.tar.gz
+- filename: operator-5.5.3-plugins.tar.gz
+  url: https://ironbank-files.s3.amazonaws.com/operator-5.5.3-plugins.tar.gz
   validation:
     type: sha256
-    value: 37adbede99aeaf765a9cc16ecdf0b0616f564ddd2cd7364540b186f222edc54d
-- filename: operator-5.5.2-caas_lib.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/operator-5.5.2-caas_lib.tar.gz
+    value: 28023c40fa06e695f97a5942b74663a6ce397edb78c5376dae14addb01355a80
+- filename: cp-enterprise-control-center-operator-5.5.3_caas.tar.gz
+  url: https://ironbank-files.s3.amazonaws.com/cp-enterprise-control-center-operator-5.5.3_caas.tar.gz
   validation:
     type: sha256
-    value: 11112ceb5f4ad55956b4cd631be598acaec7fe754baec52d454ab4bd6222769e  
-- filename: cp-enterprise-control-center-operator-5.5.2_caas.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/cp-enterprise-control-center-operator-5.5.2_caas.tar.gz
-  validation:
-    type: sha256
-    value: 0153d080fd48c851aef386f625530313666d3ee4e599950d67a4043ee187448c    
-    
+    value: 5e37d2b4bb44e01818a0d7f239c22f332dd6e54f52a801830c55bb1163861ac7    
+  
 # List of project maintainers
 maintainers:
 - name: "Scott Stroud"