Add hostname and set Locale, fixes #311 (#312)

* Add initial dependabot config

* Update config.yml

* Add hostname and set Locale, fixes #311

* Remove dependabot

Author: pabrahamsson

_test/rabbitmq.sh

@@ -49,6 +49,26 @@ test() {
   echo "Waiting for for all pods to start..."
   try_until 60 15 true "oc get sts/rabbitmq -n $NAMESPACE --template '{{ if .status.readyReplicas }}{{ eq .spec.replicas .status.readyReplicas }}{{ else }}false{{ end }}'" || kill -s TERM $TOP_PID
 
+  # Tests for issue #311
+  echo "Ensure 'hostname' package is installed"
+  hostname_rpm=$(oc -n $NAMESPACE rsh rabbitmq-0 rpm -q hostname)
+  if [ $? -eq 0 ]; then
+    echo "OK: RPM package 'hostname' installed"
+  else
+    echo "NOK: RPM package 'hostname' not installed"
+    exit 1
+  fi
+
+  echo "Ensure locale is set to UTF-8"
+  lang_var=$(oc -n $NAMESPACE rsh rabbitmq-0 printenv LANG)
+  if [[ "$lang_var" =~ "en_US.UTF-8" ]]; then
+    echo "OK: Locale is set to 'en_US.UTF-8'"
+  else
+    echo "LANG: ===$lang_var==="
+    echo "NOK: Locale is set to ${lang_var}, should be 'en_US.UTF-8'"
+    exit 1
+  fi
+
   echo "Check RabbitMQ cluster status..."
   sts_json=$(oc get sts/rabbitmq -n $NAMESPACE -o json)
   replicas=$(jq '.spec.replicas' <<< $(echo $sts_json))

rabbitmq/.openshift/templates/imagestreams/images.yml

@@ -13,9 +13,9 @@ items:
     - annotations: null
       from:
         kind: DockerImage
-        name: registry.access.redhat.com/ubi7/ubi:7.7
+        name: registry.access.redhat.com/ubi7/ubi:7.8
       importPolicy: {}
-      name: "7.7"
+      name: "7.8"
       referencePolicy:
         type: Source
     - annotations: null

rabbitmq/Dockerfile

@@ -1,4 +1,4 @@
-FROM registry.access.redhat.com/ubi7/ubi:7.7
+FROM registry.access.redhat.com/ubi7/ubi:7.8
 
 ARG ERLANG_VERSION=22.1.4
 ARG RABBITMQ_AUTOCLUSTER_VERSION=0.10.0
@@ -13,7 +13,10 @@ ENV GPG_KEY="0A9AF2115F4687BD29803A206B73A36E6026DFCA" \
     HOME=/var/lib/rabbitmq \
     RABBITMQ_HOME=/opt/rabbitmq \
     RABBITMQ_LOGS=- \
-    RABBITMQ_SASL_LOGS=-
+    RABBITMQ_SASL_LOGS=- \
+    LANG=en_US.UTF-8 \
+    LANGUAGE=en_US.:en \
+    LC_ALL=en_US.UTF-8
 
 RUN set -xe && \
     curl -LO https://github.com/rabbitmq/erlang-rpm/releases/download/v${ERLANG_VERSION}/erlang-${ERLANG_VERSION}-1.el7.x86_64.rpm && \
@@ -43,7 +46,10 @@ RUN set -xe && \
     chown -R 1001:0 /var/lib/rabbitmq /etc/rabbitmq ${RABBITMQ_HOME}/plugins && \
     chmod -R g=u /var/lib/rabbitmq /etc/rabbitmq && \
     rm -rf /var/lib/rabbitmq/.erlang.cookie && \
-    ln -sf "$RABBITMQ_HOME/plugins" /plugins
+    ln -sf "$RABBITMQ_HOME/plugins" /plugins && \
+    INSTALL_PKGS="hostname" && \
+    yum install -y $INSTALL_PKGS && \
+    rm -rf /var/cache/yum
 
 COPY docker-entrypoint.sh /usr/local/bin/
 USER 1001