Merge pull request #8 from NHSLeadership/develop

adjust entrypoint and scripting

Author: Tawmu

Dockerfile-alpine8.2

@@ -51,11 +51,12 @@ RUN mkdir /etc/atatus && \
     pgsql && \
     addgroup -g ${GID} -S ${USER} && \
     adduser -u ${UID} -S -G ${USER} -h /home/nhsla -s /bin/bash nhsla && \
-    apk add ssmtp --no-cache && \
+    apk add bash ssmtp --no-cache && \
   ln -s /nhsla/rw/atatus.ini /usr/local/etc/php/conf.d/a-atatus.ini && \
   ln -s /nhsla/rw/phpsess.ini /usr/local/etc/php/conf.d/b-phpsess.ini && \
   ln -s /nhsla/rw/ssmtp.conf /etc/ssmtp.conf && \
   chown -R ${USER}:${USER} /etc/atatus /nhsla && \
+  chmod +x /entrypoint.sh && \
   date > /image_base_build_date
 
 USER ${UID}

Dockerfile-alpine8.3

@@ -56,6 +56,7 @@ RUN mkdir /etc/atatus && \
   ln -s /nhsla/rw/phpsess.ini /usr/local/etc/php/conf.d/b-phpsess.ini && \
   ln -s /nhsla/rw/ssmtp.conf /etc/ssmtp.conf && \
   chown -R ${USER}:${USER} /etc/atatus /nhsla && \
+  chmod +x /entrypoint.sh && \
   date > /image_base_build_date
 
 USER ${UID}

Dockerfile-alpine8.4

@@ -51,11 +51,12 @@ RUN mkdir /etc/atatus && \
     pgsql && \
     addgroup -g ${GID} -S ${USER} && \
     adduser -u ${UID} -S -G ${USER} -h /home/nhsla -s /bin/bash nhsla && \
-    apk add ssmtp --no-cache && \
+    apk add bash ssmtp --no-cache && \
   ln -s /nhsla/rw/atatus.ini /usr/local/etc/php/conf.d/a-atatus.ini && \
   ln -s /nhsla/rw/phpsess.ini /usr/local/etc/php/conf.d/b-phpsess.ini && \
   ln -s /nhsla/rw/ssmtp.conf /etc/ssmtp.conf && \
   chown -R ${USER}:${USER} /etc/atatus /nhsla && \
+  chmod +x /entrypoint.sh && \
   date > /image_base_build_date
 
 USER ${UID}

rootfs/entrypoint.sh

@@ -3,8 +3,8 @@ set -e
 
 # Startup logging
 echo "=== Container Startup ==="
-echo "App name: ${ATATUS_APP_NAME:app}"
-echo "App version: ${APP_VERSION:none}"
+echo "App name: ${ATATUS_APP_NAME:-app}"
+echo "App version: ${APP_VERSION:-none}"
 echo "Container mode: ${CONTAINER_MODE:-web}"
 echo "Environment: ${APP_ENV:-production}"
 echo "Atatus: ${ATATUS_ENABLED:-false}"
@@ -77,7 +77,7 @@ case "${CONTAINER_MODE:-web}" in
         ;;
     "worker")
         echo "Starting worker container..."
-        exec php /app/artisan queue:work --sleep=3 --tries=3
+        exec php /app/artisan queue:work --sleep=3 --tries=3 --timeout=1800 --queue="${QUEUE_NAMES:-default}"
         ;;
     "web"|*)
         echo "Starting web server..."