Merge branch '5.5.4' into 'development'

5.5.4 to development

See merge request !11

.gitignore

@@ -9,3 +9,8 @@ archive.key
 build-container.sh
 python-libs_filelist.txt
 .env
+build-image.sh
+*.whl
+*.tar.gz
+*.rpm
+build-image.sh

Dockerfile

 ARG BASE_REGISTRY=registry1.dsop.io
 ARG BASE_IMAGE=confluentinc/cp-server-connect
-ARG BASE_TAG=5.5.3
+ARG BASE_TAG=5.5.4
 
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 USER root
@@ -18,11 +18,11 @@ WORKDIR /opt
 
 ## Copy dependencies
 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-server-connect-operator-5.5.3_caas.tar.gz /opt/caas/
+COPY cp-server-connect-operator-5.5.4.0_1_usrShareJava.tar.gz /usr/share/java/
+COPY cp-server-connect-operator-5.5.4.0_opt.tar.gz /opt/
 
-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-server-connect-operator-5.5.3_caas.tar.gz && rm cp-server-connect-operator-5.5.3_caas.tar.gz \
+RUN cd /usr/share/java && tar -xvf cp-server-connect-operator-*_usrShareJava.tar.gz && rm cp-server-connect-operator-*_usrShareJava.tar.gz \
+    && cd /opt && tar -xvf cp-server-connect-operator-*_opt.tar.gz && rm cp-server-connect-operator-*_opt.tar.gz \
     && yum install -y openssl findutils diffutils && yum clean all && mkdir -p "${CONNECT_LOG4J_DIR}" "${CONNECT_SECRETS_DIR}" "${CONNECT_CONFIG_DIR}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}" "${COMPONENT_SCRIPT_DIR}/${COMPONENT}/jars" \
     && chmod -R ag+w "${CONNECT_LOG4J_DIR}" "${CONNECT_SECRETS_DIR}" "${CONNECT_CONFIG_DIR}" "/opt"
 

hardening_manifest.yaml

@@ -8,39 +8,39 @@ name: "confluent/confluent-component-operator/cp-server-connect-operator-5.5.x"
 # The most specific version should be the first tag and will be shown
 # on ironbank.dsop.io
 tags:
-- "5.5.3"
+- "5.5.4"
 - "5.5.x"
 - "5.5"
   
 # Build args passed to Dockerfile ARGs
 args:
   BASE_IMAGE: "confluent/kafka-connect/cp-server-connect-5.5.x"
-  BASE_TAG: "5.5.3"
+  BASE_TAG: "5.5.4"
 
 # Docker image labels
 labels:
   org.opencontainers.image.title: "cp-server-connect-operator-5.5.x"
   org.opencontainers.image.description: "Confluent Operator image for cp-server-connect."
   org.opencontainers.image.licenses: "CONFLUENT ENTERPRISE LICENSE"
-  org.opencontainers.image.url: "https://docs.confluent.io/5.5.3/installation/operator/index.html"
+  org.opencontainers.image.url: "https://docs.confluent.io/5.5.4/installation/operator/index.html"
   org.opencontainers.image.vendor: "Confluent"
-  org.opencontainers.image.version: "5.5.3"
+  org.opencontainers.image.version: "5.5.4"
   mil.dso.ironbank.image.keywords: "confluent,kafka,zookeeper,operator"
   mil.dso.ironbank.image.type: "commercial"
   mil.dso.ironbank.product.name: "Confluent Platform"
 
 # List of resources to make available to the offline build context
 resources:
-- filename: operator-5.5.3-plugins.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/operator-5.5.3-plugins.tar.gz
+- filename: cp-server-connect-operator-5.5.4.0_1_usrShareJava.tar.gz
+  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_1_usrShareJava.tar.gz
   validation:
     type: sha256
-    value: 28023c40fa06e695f97a5942b74663a6ce397edb78c5376dae14addb01355a80
-- filename: cp-server-connect-operator-5.5.3_caas.tar.gz
-  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.3_caas.tar.gz
+    value: bb63d7dcc8565cc62028b068fb326843925a328a4fadc9c24b8615df5984174a
+- filename: cp-server-connect-operator-5.5.4.0_opt.tar.gz
+  url: https://ironbank-files.s3.amazonaws.com/cp-server-connect-operator-5.5.4.0_opt.tar.gz
   validation: 
     type: sha256
-    value: b6557abd57ad4b05d4b9f6f1c964250be80a6f9db11420ade8d739d340e77c59
+    value: 2aeae33e88798c7b0e7dfc74d8281bfd0760a2499d37addc06d17eb2bcd43aef
   
 # List of project maintainers
 maintainers: