Merge branch 'upgrade-contrib' into 'development'

Upgrade contrib

See merge request !14

Dockerfile

@@ -5,6 +5,7 @@ ARG BASE_TAG=8.3
 FROM ${BASE_REGISTRY}/${BASE_IMAGE}:${BASE_TAG}
 
 COPY scripts/RPM-GPG-KEY-MariaDB /opt/
+COPY scripts/healthcheck.sh /usr/local/bin/
 COPY *.rpm.tar *.rpm /opt/
 
 RUN cd /opt/ && \
@@ -16,13 +17,19 @@ RUN cd /opt/mariadb-10.5.9-rhel-8-x86_64-rpms && \
     ./setup_repository && \
     dnf -y update && dnf -y upgrade && \
     dnf install -y --nogpgcheck MariaDB-server /opt/*.rpm && \
+    chmod -R u-s /usr/lib64/mysql/ && \
+    rm -f /usr/share/doc/perl-IO-Socket-SSL/example/simulate_proxy.pl && \
+    find /usr/share/doc/perl-IO-Socket-SSL/certs -name "*.enc" -o -name "*.pem" | xargs rm -f && \
+    find /usr/share/doc/perl-Net-SSLeay/examples -name "*.pem" | xargs rm -f && \
     yum clean all
 
 # Copy scripts to  entrypoint
 COPY ./scripts/mysql_secure_installation_automated.sh /usr/local/bin/mysql_secure_installation_automated
 RUN chmod +x /usr/local/bin/mysql_secure_installation_automated
 COPY ./scripts/entrypoint.sh ./entrypoint.sh
-RUN chmod +x ./entrypoint.sh
+RUN chmod +x ./entrypoint.sh && \
+    chmod +x /usr/local/bin/healthcheck.sh && \
+    chmod g-s /usr/lib64/mysql/plugin/auth_pam_tool_dir/auth_pam_tool
 
 #Create usafadmin user
 RUN groupadd -g 1500 usafadmin
@@ -31,4 +38,6 @@ RUN chown -R usafadmin /var/lib/mysql
 USER usafadmin
 RUN cp -R /var/lib/mysql /tmp/
 
+HEALTHCHECK --interval=10s --timeout=30s --start-period=10s --retries=3 CMD /usr/local/bin/healthcheck.sh
+
 ENTRYPOINT   [ "/bin/bash", "entrypoint.sh" ]

scripts/healthcheck.sh

+#!/bin/bash
+set -eo pipefail
+
+host="$(hostname --ip-address || echo '127.0.0.1')"
+
+if cqlsh -u cassandra -p cassandra "$host" < /dev/null; then
+	exit 0
+fi
+
+exit 1