Merge branch 'development' into 'master'

Development

See merge request dsop/confluent/confluentinc/confluent-operator-2.6.x!19

Dockerfile

@@ -21,7 +21,6 @@ COPY hardening_manifest.yaml /etc/confluent/ironbank/
 ## copy from dockerhub image
 COPY --from=base /licenses /licenses
 COPY --from=base /opt/manager /opt/manager
-
 COPY scripts/entrypoint.sh /entrypoint.sh
 
 RUN echo "===> Dependency update" \
@@ -32,7 +31,7 @@ RUN echo "===> Dependency update" \
         && yum clean all \
         && rm -rf /tmp/* /var/cache/dnf
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/opt/manager"]
 
 # Polling period  : 5 seconds
 # Timeout period  : 2 seconds (if the polling does not return within this time, treat as a failed poll)
@@ -41,4 +40,4 @@ ENTRYPOINT ["/entrypoint.sh"]
 HEALTHCHECK --interval=5s --timeout=2s --retries=5 \
     CMD curl --fail --silent --output /dev/null http://localhost:8080/readyz || exit 1
 
-USER 1001
\ No newline at end of file
+USER 1001