Make RUN commands more strict

devilbox · Nov 3, 2019 · 67017e4 · 67017e4
1 parent 31864f8
commit 67017e4
Show file tree

Hide file tree

Showing 36 changed files with 173 additions and 173 deletions.
diff --git a/Dockerfiles/base/Dockerfile-5.2 b/Dockerfiles/base/Dockerfile-5.2
@@ -35,22 +35,22 @@ 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}
 
 
 ###
 ### 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
@@ -35,22 +35,22 @@ 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}
 
 
 ###
 ### 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
@@ -35,22 +35,22 @@ 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}
 
 
 ###
 ### 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
@@ -35,22 +35,22 @@ 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}
 
 
 ###
 ### 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
@@ -35,15 +35,15 @@ 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}
 
 
 ###
 ### 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
@@ -35,15 +35,15 @@ 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}
 
 
 ###
 ### 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
@@ -35,15 +35,15 @@ 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}
 
 
 ###
 ### 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
@@ -35,15 +35,15 @@ 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}
 
 
 ###
 ### 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
@@ -35,15 +35,15 @@ 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}
 
 
 ###
 ### 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
@@ -35,15 +35,15 @@ 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}
 
 
 ###
 ### 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 \