From 67017e494eb8479a2811506240bbafdc248d909d Mon Sep 17 00:00:00 2001 From: cytopia Date: Sun, 3 Nov 2019 18:20:23 +0100 Subject: [PATCH] Make RUN commands more strict --- Dockerfiles/base/Dockerfile-5.2 | 10 +++++----- Dockerfiles/base/Dockerfile-5.3 | 10 +++++----- Dockerfiles/base/Dockerfile-5.4 | 10 +++++----- Dockerfiles/base/Dockerfile-5.5 | 10 +++++----- Dockerfiles/base/Dockerfile-5.6 | 8 ++++---- Dockerfiles/base/Dockerfile-7.0 | 8 ++++---- Dockerfiles/base/Dockerfile-7.1 | 8 ++++---- Dockerfiles/base/Dockerfile-7.2 | 8 ++++---- Dockerfiles/base/Dockerfile-7.3 | 8 ++++---- Dockerfiles/base/Dockerfile-7.4 | 8 ++++---- Dockerfiles/base/Dockerfile-8.0 | 8 ++++---- Dockerfiles/prod/Dockerfile-5.2 | 4 ++-- Dockerfiles/prod/Dockerfile-5.3 | 4 ++-- Dockerfiles/prod/Dockerfile-5.4 | 4 ++-- Dockerfiles/prod/Dockerfile-5.5 | 4 ++-- Dockerfiles/prod/Dockerfile-5.6 | 4 ++-- Dockerfiles/prod/Dockerfile-7.0 | 4 ++-- Dockerfiles/prod/Dockerfile-7.1 | 4 ++-- Dockerfiles/prod/Dockerfile-7.2 | 4 ++-- Dockerfiles/prod/Dockerfile-7.3 | 4 ++-- Dockerfiles/prod/Dockerfile-7.4 | 4 ++-- Dockerfiles/prod/Dockerfile-8.0 | 4 ++-- Dockerfiles/work/Dockerfile-5.2 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-5.3 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-5.4 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-5.5 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-5.6 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-7.0 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-7.1 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-7.2 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-7.3 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-7.4 | 16 ++++++++-------- Dockerfiles/work/Dockerfile-8.0 | 16 ++++++++-------- build/ansible/DOCKERFILES/Dockerfile-base.j2 | 10 +++++----- build/ansible/DOCKERFILES/Dockerfile-prod.j2 | 4 ++-- build/ansible/DOCKERFILES/Dockerfile-work.j2 | 16 ++++++++-------- 36 files changed, 173 insertions(+), 173 deletions(-) diff --git a/Dockerfiles/base/Dockerfile-5.2 b/Dockerfiles/base/Dockerfile-5.2 index 2b84a61..6a98e1e 100644 --- a/Dockerfiles/base/Dockerfile-5.2 +++ b/Dockerfiles/base/Dockerfile-5.2 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,14 +43,14 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && rm -f /etc/apt/sources.list \ && { \ echo "deb http://ftp.debian.org/debian jessie main"; \ echo "#deb http://ftp.debian.org/debian jessie-updates main"; \ echo "deb http://security.debian.org/debian-security jessie/updates main"; \ } | tee /etc/apt/sources.list -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -59,7 +59,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -81,7 +81,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-5.3 b/Dockerfiles/base/Dockerfile-5.3 index f6358ea..4879379 100644 --- a/Dockerfiles/base/Dockerfile-5.3 +++ b/Dockerfiles/base/Dockerfile-5.3 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,14 +43,14 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && rm -f /etc/apt/sources.list \ && { \ echo "deb http://ftp.debian.org/debian jessie main"; \ echo "#deb http://ftp.debian.org/debian jessie-updates main"; \ echo "deb http://security.debian.org/debian-security jessie/updates main"; \ } | tee /etc/apt/sources.list -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -59,7 +59,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -81,7 +81,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-5.4 b/Dockerfiles/base/Dockerfile-5.4 index d9ebc27..ba31901 100644 --- a/Dockerfiles/base/Dockerfile-5.4 +++ b/Dockerfiles/base/Dockerfile-5.4 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,14 +43,14 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && rm -f /etc/apt/sources.list \ && { \ echo "deb http://ftp.debian.org/debian jessie main"; \ echo "#deb http://ftp.debian.org/debian jessie-updates main"; \ echo "deb http://security.debian.org/debian-security jessie/updates main"; \ } | tee /etc/apt/sources.list -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -59,7 +59,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -81,7 +81,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.4' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-5.5 b/Dockerfiles/base/Dockerfile-5.5 index 802a0fe..e27214d 100644 --- a/Dockerfiles/base/Dockerfile-5.5 +++ b/Dockerfiles/base/Dockerfile-5.5 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,14 +43,14 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && rm -f /etc/apt/sources.list \ && { \ echo "deb http://ftp.debian.org/debian jessie main"; \ echo "#deb http://ftp.debian.org/debian jessie-updates main"; \ echo "deb http://security.debian.org/debian-security jessie/updates main"; \ } | tee /etc/apt/sources.list -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -59,7 +59,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -81,7 +81,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.5' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-5.6 b/Dockerfiles/base/Dockerfile-5.6 index 46ee287..1ce652d 100644 --- a/Dockerfiles/base/Dockerfile-5.6 +++ b/Dockerfiles/base/Dockerfile-5.6 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,7 +43,7 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -52,7 +52,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.6' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-7.0 b/Dockerfiles/base/Dockerfile-7.0 index d2c48de..3428159 100644 --- a/Dockerfiles/base/Dockerfile-7.0 +++ b/Dockerfiles/base/Dockerfile-7.0 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,7 +43,7 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -52,7 +52,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.0' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-7.1 b/Dockerfiles/base/Dockerfile-7.1 index 49ccb98..8bb3a79 100644 --- a/Dockerfiles/base/Dockerfile-7.1 +++ b/Dockerfiles/base/Dockerfile-7.1 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,7 +43,7 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -52,7 +52,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.1' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-7.2 b/Dockerfiles/base/Dockerfile-7.2 index efadfc2..abe8209 100644 --- a/Dockerfiles/base/Dockerfile-7.2 +++ b/Dockerfiles/base/Dockerfile-7.2 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,7 +43,7 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -52,7 +52,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.2' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-7.3 b/Dockerfiles/base/Dockerfile-7.3 index 44925ea..df549d3 100644 --- a/Dockerfiles/base/Dockerfile-7.3 +++ b/Dockerfiles/base/Dockerfile-7.3 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,7 +43,7 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -52,7 +52,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.3' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-7.4 b/Dockerfiles/base/Dockerfile-7.4 index 6088a1a..bd82377 100644 --- a/Dockerfiles/base/Dockerfile-7.4 +++ b/Dockerfiles/base/Dockerfile-7.4 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,7 +43,7 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -52,7 +52,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.4' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/base/Dockerfile-8.0 b/Dockerfiles/base/Dockerfile-8.0 index 51c9a31..21256be 100644 --- a/Dockerfiles/base/Dockerfile-8.0 +++ b/Dockerfiles/base/Dockerfile-8.0 @@ -35,7 +35,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -43,7 +43,7 @@ RUN set -x \ ### ### Upgrade (install ps) ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -52,7 +52,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^8.0' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-5.2 b/Dockerfiles/prod/Dockerfile-5.2 index 100c187..ff231bb 100644 --- a/Dockerfiles/prod/Dockerfile-5.2 +++ b/Dockerfiles/prod/Dockerfile-5.2 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.2-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-5.3 b/Dockerfiles/prod/Dockerfile-5.3 index 5183098..0774b65 100644 --- a/Dockerfiles/prod/Dockerfile-5.3 +++ b/Dockerfiles/prod/Dockerfile-5.3 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.3-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-5.4 b/Dockerfiles/prod/Dockerfile-5.4 index d68544c..3c8b5ef 100644 --- a/Dockerfiles/prod/Dockerfile-5.4 +++ b/Dockerfiles/prod/Dockerfile-5.4 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.4-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.4' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-5.5 b/Dockerfiles/prod/Dockerfile-5.5 index 2dd27b9..14e56a5 100644 --- a/Dockerfiles/prod/Dockerfile-5.5 +++ b/Dockerfiles/prod/Dockerfile-5.5 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.5-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.5' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-5.6 b/Dockerfiles/prod/Dockerfile-5.6 index b2fb8b8..e2e0e61 100644 --- a/Dockerfiles/prod/Dockerfile-5.6 +++ b/Dockerfiles/prod/Dockerfile-5.6 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 5.6-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.6' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-7.0 b/Dockerfiles/prod/Dockerfile-7.0 index 3e70801..7f48df2 100644 --- a/Dockerfiles/prod/Dockerfile-7.0 +++ b/Dockerfiles/prod/Dockerfile-7.0 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.0-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.0' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-7.1 b/Dockerfiles/prod/Dockerfile-7.1 index 1374998..b9ec3d5 100644 --- a/Dockerfiles/prod/Dockerfile-7.1 +++ b/Dockerfiles/prod/Dockerfile-7.1 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.1-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.1' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-7.2 b/Dockerfiles/prod/Dockerfile-7.2 index 9f8f284..80aad21 100644 --- a/Dockerfiles/prod/Dockerfile-7.2 +++ b/Dockerfiles/prod/Dockerfile-7.2 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.2-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.2' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-7.3 b/Dockerfiles/prod/Dockerfile-7.3 index b5935c0..edd03d8 100644 --- a/Dockerfiles/prod/Dockerfile-7.3 +++ b/Dockerfiles/prod/Dockerfile-7.3 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.3-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.3' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-7.4 b/Dockerfiles/prod/Dockerfile-7.4 index f284731..ee8e04f 100644 --- a/Dockerfiles/prod/Dockerfile-7.4 +++ b/Dockerfiles/prod/Dockerfile-7.4 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 7.4-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.4' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/prod/Dockerfile-8.0 b/Dockerfiles/prod/Dockerfile-8.0 index 50b3ba9..ebd4745 100644 --- a/Dockerfiles/prod/Dockerfile-8.0 +++ b/Dockerfiles/prod/Dockerfile-8.0 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM 8.0-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -51,7 +51,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^8.0' \ && /usr/local/sbin/php-fpm --test \ diff --git a/Dockerfiles/work/Dockerfile-5.2 b/Dockerfiles/work/Dockerfile-5.2 index 5bf8735..c88c389 100644 --- a/Dockerfiles/work/Dockerfile-5.2 +++ b/Dockerfiles/work/Dockerfile-5.2 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -124,7 +124,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # pip && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -268,7 +268,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ \ && rm -rf /tmp/* \ && (rm -rf /tmp/.* || true) \ @@ -281,7 +281,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -322,7 +322,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -346,7 +346,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -386,7 +386,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \ && /usr/local/sbin/php-fpm --test \ @@ -402,7 +402,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ && scss-lint --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.3 b/Dockerfiles/work/Dockerfile-5.3 index 7596120..de45ed4 100644 --- a/Dockerfiles/work/Dockerfile-5.3 +++ b/Dockerfiles/work/Dockerfile-5.3 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -124,7 +124,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -305,7 +305,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ # codeception && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ @@ -323,7 +323,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -364,7 +364,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -388,7 +388,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -428,7 +428,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \ && /usr/local/sbin/php-fpm --test \ @@ -444,7 +444,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.4 b/Dockerfiles/work/Dockerfile-5.4 index 4ecd146..c236a17 100644 --- a/Dockerfiles/work/Dockerfile-5.4 +++ b/Dockerfiles/work/Dockerfile-5.4 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -124,7 +124,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -334,7 +334,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ # codeception && COMPOSER_HOME="/usr/local/src/composer" composer global require codeception/codeception \ && ln -s /usr/local/src/composer/vendor/codeception/codeception/codecept /usr/local/bin/ \ @@ -352,7 +352,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -393,7 +393,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -417,7 +417,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -457,7 +457,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.4' \ && /usr/local/sbin/php-fpm --test \ @@ -473,7 +473,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.5 b/Dockerfiles/work/Dockerfile-5.5 index 41ec770..15932da 100644 --- a/Dockerfiles/work/Dockerfile-5.5 +++ b/Dockerfiles/work/Dockerfile-5.5 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -124,7 +124,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -337,7 +337,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ @@ -364,7 +364,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -405,7 +405,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -429,7 +429,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -469,7 +469,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.5' \ && /usr/local/sbin/php-fpm --test \ @@ -485,7 +485,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-5.6 b/Dockerfiles/work/Dockerfile-5.6 index adce75a..3dbbe01 100644 --- a/Dockerfiles/work/Dockerfile-5.6 +++ b/Dockerfiles/work/Dockerfile-5.6 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -123,7 +123,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -349,7 +349,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ @@ -376,7 +376,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -417,7 +417,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -441,7 +441,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -481,7 +481,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.6' \ && /usr/local/sbin/php-fpm --test \ @@ -497,7 +497,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.0 b/Dockerfiles/work/Dockerfile-7.0 index 0405bb9..a02eb86 100644 --- a/Dockerfiles/work/Dockerfile-7.0 +++ b/Dockerfiles/work/Dockerfile-7.0 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -123,7 +123,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -349,7 +349,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ @@ -376,7 +376,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -417,7 +417,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -441,7 +441,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -481,7 +481,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.0' \ && /usr/local/sbin/php-fpm --test \ @@ -497,7 +497,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.1 b/Dockerfiles/work/Dockerfile-7.1 index 81acf3f..dad585d 100644 --- a/Dockerfiles/work/Dockerfile-7.1 +++ b/Dockerfiles/work/Dockerfile-7.1 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -123,7 +123,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -349,7 +349,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ @@ -376,7 +376,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -417,7 +417,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -441,7 +441,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -481,7 +481,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.1' \ && /usr/local/sbin/php-fpm --test \ @@ -497,7 +497,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 485a6bb..812bc31 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -123,7 +123,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -349,7 +349,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ @@ -376,7 +376,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -417,7 +417,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -441,7 +441,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -481,7 +481,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.2' \ && /usr/local/sbin/php-fpm --test \ @@ -497,7 +497,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index d40e85b..8b1e1a9 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -123,7 +123,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -338,7 +338,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ @@ -365,7 +365,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -406,7 +406,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -430,7 +430,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -470,7 +470,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.3' \ && /usr/local/sbin/php-fpm --test \ @@ -486,7 +486,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index cac66d6..e5e90cf 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -123,7 +123,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -334,7 +334,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ # asgardcms && COMPOSER_HOME="/usr/local/src/composer" composer global require asgardcms/asgardcms-installer \ && ln -s /usr/local/src/composer/vendor/asgardcms/asgardcms-installer/asgardcms /usr/local/bin/ \ @@ -361,7 +361,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -402,7 +402,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -426,7 +426,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -466,7 +466,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.4' \ && /usr/local/sbin/php-fpm --test \ @@ -482,7 +482,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 39b8458..92af085 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -123,7 +123,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ # composer && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer \ # pip @@ -278,7 +278,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ \ && rm -rf /tmp/* \ && (rm -rf /tmp/.* || true) \ @@ -291,7 +291,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ # angular_cli && su -c '. /opt/nvm/nvm.sh; npm install -g @angular/cli' devilbox \ # eslint @@ -332,7 +332,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ # mixlib_config && gem install mixlib-config -v 2.2.4 \ # rb_inotify @@ -356,7 +356,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ # ansible && pip install --no-cache-dir --force-reinstall ansible \ # yamllint @@ -396,7 +396,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^8.0' \ && /usr/local/sbin/php-fpm --test \ @@ -412,7 +412,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ && composer --version 2>/dev/null | grep -E 'version\s*[.0-9]+' \ && su -c '. /opt/nvm/nvm.sh; nvm --version' devilbox | grep -E '^[.0-9]+' \ && mdl --version | grep -E '[.0-9]+' \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-base.j2 b/build/ansible/DOCKERFILES/Dockerfile-base.j2 index 57db7bd..6980cf1 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-base.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-base.j2 @@ -45,7 +45,7 @@ ENV MY_USER="devilbox" \ ### ### User/Group ### -RUN set -x \ +RUN set -eux \ && groupadd -g ${MY_GID} -r ${MY_GROUP} \ && useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER} @@ -54,7 +54,7 @@ RUN set -x \ ### Upgrade (install ps) ### {% if php_version in [5.2, 5.3, 5.4, 5.5] %} -RUN set -x \ +RUN set -eux \ && rm -f /etc/apt/sources.list \ && { \ echo "deb http://ftp.debian.org/debian jessie main"; \ @@ -62,7 +62,7 @@ RUN set -x \ echo "deb http://security.debian.org/debian-security jessie/updates main"; \ } | tee /etc/apt/sources.list {% endif %} -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \ && rm -rf /var/lib/apt/lists/* @@ -71,7 +71,7 @@ RUN set -x \ ### ### Configure ### -RUN set -x \ +RUN set -eux \ && rm -rf /usr/local/etc/php-fpm.d \ && mkdir -p /usr/local/etc/php-fpm.d \ && mkdir -p /var/lib/php/session \ @@ -94,7 +94,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^{{ php_version }}' \ && /usr/local/sbin/php-fpm --test \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 index 4baac29..b394972 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-prod.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-prod.j2 @@ -25,7 +25,7 @@ LABEL "org.opencontainers.image.description"="PHP-FPM {{ php_version }}-prod" ### ### Install ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -52,7 +52,7 @@ RUN set -x \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^{{ php_version }}' \ && /usr/local/sbin/php-fpm --test \ diff --git a/build/ansible/DOCKERFILES/Dockerfile-work.j2 b/build/ansible/DOCKERFILES/Dockerfile-work.j2 index aed2d54..3c76423 100644 --- a/build/ansible/DOCKERFILES/Dockerfile-work.j2 +++ b/build/ansible/DOCKERFILES/Dockerfile-work.j2 @@ -31,7 +31,7 @@ ENV BASH_PROFILE=".bashrc" ### ### Install Tools ### -RUN set -x \ +RUN set -eux \ && DEBIAN_FRONTEND=noninteractive apt-get update -qq \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests apt-utils \ && DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests \ @@ -144,7 +144,7 @@ RUN set -x \ ### ### Install custom software ### -RUN set -x \ +RUN set -eux \ {% for tool in software_enabled %} {# Not disabled #} {% if ('disabled' not in software_available[tool]) or (php_version not in software_available[tool]['disabled']) %} @@ -192,7 +192,7 @@ RUN set -x \ ### ### Install Composer (PHP) ### -RUN set -x \ +RUN set -eux \ {% for tool in composer_enabled %} {# Not disabled #} {% if ('disabled' not in composer_available[tool]) or (php_version not in composer_available[tool]['disabled']) %} @@ -224,7 +224,7 @@ RUN set -x \ ### ### Install npm (Node) ### -RUN set -x \ +RUN set -eux \ {% for tool in npm_enabled %} {# Not disabled #} {% if ('disabled' not in npm_available[tool]) or (php_version not in npm_available[tool]['disabled']) %} @@ -257,7 +257,7 @@ RUN set -x \ ### ### Install gem (Ruby) ### -RUN set -x \ +RUN set -eux \ {% for tool in gem_enabled %} {# Not disabled #} {% if ('disabled' not in gem_available[tool]) or (php_version not in gem_available[tool]['disabled']) %} @@ -287,7 +287,7 @@ RUN set -x \ ### ### Install pip (Python) packages ### -RUN set -x \ +RUN set -eux \ {% for tool in pip_enabled %} {# Not disabled #} {% if ('disabled' not in pip_available[tool]) or (php_version not in pip_available[tool]['disabled']) %} @@ -338,7 +338,7 @@ RUN \ ### ### Verify ### -RUN set -x \ +RUN set -eux \ && echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \ && php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^{{ php_version }}' \ && /usr/local/sbin/php-fpm --test \ @@ -354,7 +354,7 @@ RUN set -x \ && if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \ && rm -f /usr/local/etc/php/php.ini -RUN set -x \ +RUN set -eux \ {# ---- SOFTWARE ---- #} {% for tool in software_enabled %} {# Not disabled #}