gh-mirrors/docker-php-fpm
1
0
Fork 0
mirror of https://github.com/devilbox/docker-php-fpm.git synced 2025-12-15 21:41:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make RUN commands more strict

Browse Source
This commit is contained in:
cytopia
2019-11-03 18:20:23 +01:00
parent 31864f8335
commit 67017e494e
36 changed files with 173 additions and 173 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
build/ansible/DOCKERFILES/Dockerfile-base.j2
View File

@@ -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 \

4
build/ansible/DOCKERFILES/Dockerfile-prod.j2
View File

@@ -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 \

16
build/ansible/DOCKERFILES/Dockerfile-work.j2
View File

@@ -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 #}