Merge branch 'readability'

docker-compose.yml

@@ -159,24 +159,17 @@ services:
       # SSH Server key to provide constant ssh host key
       - "${MINIO_SFTP_HOSTKEY}:/certs/id_ed25519:ro"
     user: "${UID}:${GID}"
-    command:
-      - server
-      - --console-address
-      - :9001
-      - --ftp
-      - address=:21
-      - --ftp
-      - passive-port-range=30000-30010
-      - --sftp
-      - address=:22
-      - --sftp
-      - ssh-private-key=/certs/id_ed25519
-      - --ftp
-      - tls-private-key=/certs/minio-ftp.key
-      - --ftp
-      - tls-public-cert=/certs/minio-ftp.crt
-      - --json
-      - /vol0
+    command: >
+      server
+      --console-address :9001
+      --ftp address=:21
+      --ftp passive-port-range=30000-30010
+      --sftp address=:22
+      --sftp ssh-private-key=/certs/id_ed25519
+      --ftp tls-private-key=/certs/minio-ftp.key
+      --ftp tls-public-cert=/certs/minio-ftp.crt
+      --json 
+      /vol0
     healthcheck:
       test: timeout 5s bash -c ':> /dev/tcp/127.0.0.1/9000' || exit 1
       interval: "${MINIO_HEALTHCHECK_INTERVAL}"
@@ -200,10 +193,9 @@ services:
     depends_on:
       database:
         condition: service_healthy
-    command:
-      - /usr/sbin/mosquitto
-      - -c
-      - /var/lib/mosquitto/mosquitto.conf
+    command: >
+      /usr/sbin/mosquitto 
+      -c /var/lib/mosquitto/mosquitto.conf
     entrypoint:
       - /docker-entrypoint.sh
     user: "${UID}:${GID}"
@@ -235,12 +227,13 @@ services:
     tmpfs:
       - /var/lib/mosquitto/:uid=${UID}
     healthcheck:
-      test: ["CMD-SHELL", "mosquitto_sub \
-        -t '$$SYS/broker/version' \
-        -C 1 \
-        -u $${MQTT_USER} \
-        -P $${MQTT_PASSWORD} \
-        --id docker-compose-healthcheck"]
+      test: >
+        mosquitto_sub 
+        -C 1 
+        -t '$$SYS/broker/version'
+        -u "${MQTT_USER}"
+        -P "${MQTT_PASSWORD}"
+        --id docker-compose-healthcheck
       interval: "${MQTT_BROKER_HEALTHCHECK_INTERVAL}"
       start_period: 20s
       timeout: 10s
@@ -438,6 +431,7 @@ services:
       MQTT_BROKER_HOST: "${FRONTEND_MQTT_HOST}"
       MQTT_USER: "${FRONTEND_MQTT_USER}"
       MQTT_PASSWORD: "${FRONTEND_MQTT_PASS}"
+      MQTT_CLIENT_ID: frontend
       DJANGO_SUPERUSER_USERNAME: "${DJANGO_SUPERUSER_USERNAME}"
       DJANGO_SUPERUSER_PASSWORD: "${DJANGO_SUPERUSER_PASSWORD}"
       DJANGO_SUPERUSER_EMAIL: "${DJANGO_SUPERUSER_EMAIL}"
@@ -886,7 +880,7 @@ services:
       init:
         condition: service_completed_successfully
     healthcheck:
-      test: [ "CMD-SHELL", "/supercronic-health.sh || exit 1" ]
+      test: /supercronic-health.sh || exit 1
       interval: 5s
       timeout: 3s
       retries: 5
@@ -905,18 +899,13 @@ services:
       options:
         max-size: "${MQTT_CAT_LOG_SIZE}"
         max-file: "${MQTT_CAT_FILE_COUNT}"
-    command:
-      - mosquitto_sub
-      - -h
-      - mqtt-broker
-      - --pretty
-      - -u
-      - "${MQTT_USER}"
-      - -P
-      - "${MQTT_PASSWORD}"
-      - -t
-      - "#"
-      - -v
+    command: >
+      mosquitto_sub --pretty -v 
+      -h mqtt-broker  
+      -t "#" 
+      -u "${MQTT_USER}" 
+      -P "${MQTT_PASSWORD}"
+      --id "mqtt-cat"
 
   monitoring:
     image: "gcr.io/cadvisor/cadvisor:${MONITORING_IMAGE_TAG}"