Skip to content

Commit 67017e4

Browse files
cytopiacytopia
committed
Make RUN commands more strict
1 parent 31864f8 commit 67017e4

36 files changed

Lines changed: 173 additions & 173 deletions

‎Dockerfiles/base/Dockerfile-5.2‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& rm -f /etc/apt/sources.list \
4848
&& { \
4949
echo "deb http://ftp.debian.org/debian jessie main"; \
5050
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
5151
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
5252
} | tee /etc/apt/sources.list
53-
RUN set -x \
53+
RUN set -eux \
5454
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
5555
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
5656
&& rm -rf /var/lib/apt/lists/*
@@ -59,7 +59,7 @@ RUN set -x \
5959
###
6060
### Configure
6161
###
62-
RUN set -x \
62+
RUN set -eux \
6363
&& rm -rf /usr/local/etc/php-fpm.d \
6464
&& mkdir -p /usr/local/etc/php-fpm.d \
6565
&& mkdir -p /var/lib/php/session \
@@ -81,7 +81,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
8181
###
8282
### Verify
8383
###
84-
RUN set -x \
84+
RUN set -eux \
8585
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
8686
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \
8787
&& /usr/local/sbin/php-fpm --test \

‎Dockerfiles/base/Dockerfile-5.3‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& rm -f /etc/apt/sources.list \
4848
&& { \
4949
echo "deb http://ftp.debian.org/debian jessie main"; \
5050
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
5151
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
5252
} | tee /etc/apt/sources.list
53-
RUN set -x \
53+
RUN set -eux \
5454
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
5555
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
5656
&& rm -rf /var/lib/apt/lists/*
@@ -59,7 +59,7 @@ RUN set -x \
5959
###
6060
### Configure
6161
###
62-
RUN set -x \
62+
RUN set -eux \
6363
&& rm -rf /usr/local/etc/php-fpm.d \
6464
&& mkdir -p /usr/local/etc/php-fpm.d \
6565
&& mkdir -p /var/lib/php/session \
@@ -81,7 +81,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
8181
###
8282
### Verify
8383
###
84-
RUN set -x \
84+
RUN set -eux \
8585
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
8686
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \
8787
&& /usr/local/sbin/php-fpm --test \

‎Dockerfiles/base/Dockerfile-5.4‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& rm -f /etc/apt/sources.list \
4848
&& { \
4949
echo "deb http://ftp.debian.org/debian jessie main"; \
5050
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
5151
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
5252
} | tee /etc/apt/sources.list
53-
RUN set -x \
53+
RUN set -eux \
5454
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
5555
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
5656
&& rm -rf /var/lib/apt/lists/*
@@ -59,7 +59,7 @@ RUN set -x \
5959
###
6060
### Configure
6161
###
62-
RUN set -x \
62+
RUN set -eux \
6363
&& rm -rf /usr/local/etc/php-fpm.d \
6464
&& mkdir -p /usr/local/etc/php-fpm.d \
6565
&& mkdir -p /var/lib/php/session \
@@ -81,7 +81,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
8181
###
8282
### Verify
8383
###
84-
RUN set -x \
84+
RUN set -eux \
8585
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
8686
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.4' \
8787
&& /usr/local/sbin/php-fpm --test \

‎Dockerfiles/base/Dockerfile-5.5‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& rm -f /etc/apt/sources.list \
4848
&& { \
4949
echo "deb http://ftp.debian.org/debian jessie main"; \
5050
echo "#deb http://ftp.debian.org/debian jessie-updates main"; \
5151
echo "deb http://security.debian.org/debian-security jessie/updates main"; \
5252
} | tee /etc/apt/sources.list
53-
RUN set -x \
53+
RUN set -eux \
5454
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
5555
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
5656
&& rm -rf /var/lib/apt/lists/*
@@ -59,7 +59,7 @@ RUN set -x \
5959
###
6060
### Configure
6161
###
62-
RUN set -x \
62+
RUN set -eux \
6363
&& rm -rf /usr/local/etc/php-fpm.d \
6464
&& mkdir -p /usr/local/etc/php-fpm.d \
6565
&& mkdir -p /var/lib/php/session \
@@ -81,7 +81,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
8181
###
8282
### Verify
8383
###
84-
RUN set -x \
84+
RUN set -eux \
8585
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
8686
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.5' \
8787
&& /usr/local/sbin/php-fpm --test \

‎Dockerfiles/base/Dockerfile-5.6‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4848
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4949
&& rm -rf /var/lib/apt/lists/*
@@ -52,7 +52,7 @@ RUN set -x \
5252
###
5353
### Configure
5454
###
55-
RUN set -x \
55+
RUN set -eux \
5656
&& rm -rf /usr/local/etc/php-fpm.d \
5757
&& mkdir -p /usr/local/etc/php-fpm.d \
5858
&& mkdir -p /var/lib/php/session \
@@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
7474
###
7575
### Verify
7676
###
77-
RUN set -x \
77+
RUN set -eux \
7878
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7979
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.6' \
8080
&& /usr/local/sbin/php-fpm --test \

‎Dockerfiles/base/Dockerfile-7.0‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4848
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4949
&& rm -rf /var/lib/apt/lists/*
@@ -52,7 +52,7 @@ RUN set -x \
5252
###
5353
### Configure
5454
###
55-
RUN set -x \
55+
RUN set -eux \
5656
&& rm -rf /usr/local/etc/php-fpm.d \
5757
&& mkdir -p /usr/local/etc/php-fpm.d \
5858
&& mkdir -p /var/lib/php/session \
@@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
7474
###
7575
### Verify
7676
###
77-
RUN set -x \
77+
RUN set -eux \
7878
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7979
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.0' \
8080
&& /usr/local/sbin/php-fpm --test \

‎Dockerfiles/base/Dockerfile-7.1‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4848
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4949
&& rm -rf /var/lib/apt/lists/*
@@ -52,7 +52,7 @@ RUN set -x \
5252
###
5353
### Configure
5454
###
55-
RUN set -x \
55+
RUN set -eux \
5656
&& rm -rf /usr/local/etc/php-fpm.d \
5757
&& mkdir -p /usr/local/etc/php-fpm.d \
5858
&& mkdir -p /var/lib/php/session \
@@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
7474
###
7575
### Verify
7676
###
77-
RUN set -x \
77+
RUN set -eux \
7878
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7979
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.1' \
8080
&& /usr/local/sbin/php-fpm --test \

‎Dockerfiles/base/Dockerfile-7.2‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4848
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4949
&& rm -rf /var/lib/apt/lists/*
@@ -52,7 +52,7 @@ RUN set -x \
5252
###
5353
### Configure
5454
###
55-
RUN set -x \
55+
RUN set -eux \
5656
&& rm -rf /usr/local/etc/php-fpm.d \
5757
&& mkdir -p /usr/local/etc/php-fpm.d \
5858
&& mkdir -p /var/lib/php/session \
@@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
7474
###
7575
### Verify
7676
###
77-
RUN set -x \
77+
RUN set -eux \
7878
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7979
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.2' \
8080
&& /usr/local/sbin/php-fpm --test \

‎Dockerfiles/base/Dockerfile-7.3‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4848
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4949
&& rm -rf /var/lib/apt/lists/*
@@ -52,7 +52,7 @@ RUN set -x \
5252
###
5353
### Configure
5454
###
55-
RUN set -x \
55+
RUN set -eux \
5656
&& rm -rf /usr/local/etc/php-fpm.d \
5757
&& mkdir -p /usr/local/etc/php-fpm.d \
5858
&& mkdir -p /var/lib/php/session \
@@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
7474
###
7575
### Verify
7676
###
77-
RUN set -x \
77+
RUN set -eux \
7878
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7979
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.3' \
8080
&& /usr/local/sbin/php-fpm --test \

‎Dockerfiles/base/Dockerfile-7.4‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ ENV MY_USER="devilbox" \
3535
###
3636
### User/Group
3737
###
38-
RUN set -x \
38+
RUN set -eux \
3939
&& groupadd -g ${MY_GID} -r ${MY_GROUP} \
4040
&& useradd -u ${MY_UID} -m -s /bin/bash -g ${MY_GROUP} ${MY_USER}
4141

4242

4343
###
4444
### Upgrade (install ps)
4545
###
46-
RUN set -x \
46+
RUN set -eux \
4747
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
4848
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4949
&& rm -rf /var/lib/apt/lists/*
@@ -52,7 +52,7 @@ RUN set -x \
5252
###
5353
### Configure
5454
###
55-
RUN set -x \
55+
RUN set -eux \
5656
&& rm -rf /usr/local/etc/php-fpm.d \
5757
&& mkdir -p /usr/local/etc/php-fpm.d \
5858
&& mkdir -p /var/lib/php/session \
@@ -74,7 +74,7 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
7474
###
7575
### Verify
7676
###
77-
RUN set -x \
77+
RUN set -eux \
7878
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7979
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.4' \
8080
&& /usr/local/sbin/php-fpm --test \

0 commit comments

Comments
 (0)