Skip to content

Commit cb29e8d

Browse files
cytopiacytopia
authored
Merge pull request #56 from devilbox/release-0.43
Fix build pipeline
2 parents d1d0bb1 + 61224df commit cb29e8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+4316
-1291
lines changed

‎Dockerfiles/base/Dockerfile-5.2‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ RUN set -x \
3636
### Upgrade (install ps)
3737
###
3838
RUN set -x \
39-
&& apt-get update \
40-
&& apt-get upgrade -y \
41-
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
39+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
40+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4241
&& rm -rf /var/lib/apt/lists/*
4342

4443

@@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
6867
### Verify
6968
###
7069
RUN set -x \
70+
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7171
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.2' \
7272
&& /usr/local/sbin/php-fpm --test \
73+
\
7374
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
74-
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
75+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
76+
&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
77+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
78+
\
79+
&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
80+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
81+
&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
82+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
83+
&& rm -f /usr/local/etc/php/php.ini
7584

7685

7786
###

‎Dockerfiles/base/Dockerfile-5.3‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ RUN set -x \
3636
### Upgrade (install ps)
3737
###
3838
RUN set -x \
39-
&& apt-get update \
40-
&& apt-get upgrade -y \
41-
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
39+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
40+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4241
&& rm -rf /var/lib/apt/lists/*
4342

4443

@@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
6867
### Verify
6968
###
7069
RUN set -x \
70+
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7171
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.3' \
7272
&& /usr/local/sbin/php-fpm --test \
73+
\
7374
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
74-
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
75+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
76+
&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
77+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
78+
\
79+
&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
80+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
81+
&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
82+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
83+
&& rm -f /usr/local/etc/php/php.ini
7584

7685

7786
###

‎Dockerfiles/base/Dockerfile-5.4‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ RUN set -x \
3636
### Upgrade (install ps)
3737
###
3838
RUN set -x \
39-
&& apt-get update \
40-
&& apt-get upgrade -y \
41-
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
39+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
40+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4241
&& rm -rf /var/lib/apt/lists/*
4342

4443

@@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
6867
### Verify
6968
###
7069
RUN set -x \
70+
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7171
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.4' \
7272
&& /usr/local/sbin/php-fpm --test \
73+
\
7374
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
74-
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
75+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
76+
&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
77+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
78+
\
79+
&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
80+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
81+
&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
82+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
83+
&& rm -f /usr/local/etc/php/php.ini
7584

7685

7786
###

‎Dockerfiles/base/Dockerfile-5.5‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ RUN set -x \
3636
### Upgrade (install ps)
3737
###
3838
RUN set -x \
39-
&& apt-get update \
40-
&& apt-get upgrade -y \
41-
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
39+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
40+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4241
&& rm -rf /var/lib/apt/lists/*
4342

4443

@@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
6867
### Verify
6968
###
7069
RUN set -x \
70+
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7171
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.5' \
7272
&& /usr/local/sbin/php-fpm --test \
73+
\
7374
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
74-
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
75+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
76+
&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
77+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
78+
\
79+
&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
80+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
81+
&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
82+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
83+
&& rm -f /usr/local/etc/php/php.ini
7584

7685

7786
###

‎Dockerfiles/base/Dockerfile-5.6‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ RUN set -x \
3636
### Upgrade (install ps)
3737
###
3838
RUN set -x \
39-
&& apt-get update \
40-
&& apt-get upgrade -y \
41-
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
39+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
40+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4241
&& rm -rf /var/lib/apt/lists/*
4342

4443

@@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
6867
### Verify
6968
###
7069
RUN set -x \
70+
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7171
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^5.6' \
7272
&& /usr/local/sbin/php-fpm --test \
73+
\
7374
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
74-
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
75+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
76+
&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
77+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
78+
\
79+
&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
80+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
81+
&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
82+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
83+
&& rm -f /usr/local/etc/php/php.ini
7584

7685

7786
###

‎Dockerfiles/base/Dockerfile-7.0‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ RUN set -x \
3636
### Upgrade (install ps)
3737
###
3838
RUN set -x \
39-
&& apt-get update \
40-
&& apt-get upgrade -y \
41-
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
39+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
40+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4241
&& rm -rf /var/lib/apt/lists/*
4342

4443

@@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
6867
### Verify
6968
###
7069
RUN set -x \
70+
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7171
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.0' \
7272
&& /usr/local/sbin/php-fpm --test \
73+
\
7374
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
74-
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
75+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
76+
&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
77+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
78+
\
79+
&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
80+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
81+
&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
82+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
83+
&& rm -f /usr/local/etc/php/php.ini
7584

7685

7786
###

‎Dockerfiles/base/Dockerfile-7.1‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ RUN set -x \
3636
### Upgrade (install ps)
3737
###
3838
RUN set -x \
39-
&& apt-get update \
40-
&& apt-get upgrade -y \
41-
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
39+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
40+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4241
&& rm -rf /var/lib/apt/lists/*
4342

4443

@@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
6867
### Verify
6968
###
7069
RUN set -x \
70+
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7171
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.1' \
7272
&& /usr/local/sbin/php-fpm --test \
73+
\
7374
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
74-
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
75+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
76+
&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
77+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
78+
\
79+
&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
80+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
81+
&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
82+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
83+
&& rm -f /usr/local/etc/php/php.ini
7584

7685

7786
###

‎Dockerfiles/base/Dockerfile-7.2‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ RUN set -x \
3636
### Upgrade (install ps)
3737
###
3838
RUN set -x \
39-
&& apt-get update \
40-
&& apt-get upgrade -y \
41-
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
39+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
40+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4241
&& rm -rf /var/lib/apt/lists/*
4342

4443

@@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
6867
### Verify
6968
###
7069
RUN set -x \
70+
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7171
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.2' \
7272
&& /usr/local/sbin/php-fpm --test \
73+
\
7374
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
74-
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
75+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
76+
&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
77+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
78+
\
79+
&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
80+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
81+
&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
82+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
83+
&& rm -f /usr/local/etc/php/php.ini
7584

7685

7786
###

‎Dockerfiles/base/Dockerfile-7.3‎

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,8 @@ RUN set -x \
3636
### Upgrade (install ps)
3737
###
3838
RUN set -x \
39-
&& apt-get update \
40-
&& apt-get upgrade -y \
41-
&& apt-get install --no-install-recommends --no-install-suggests -y procps \
39+
&& DEBIAN_FRONTEND=noninteractive apt-get update -qq \
40+
&& DEBIAN_FRONTEND=noninteractive apt-get install -qq -y --no-install-recommends --no-install-suggests procps \
4241
&& rm -rf /var/lib/apt/lists/*
4342

4443

@@ -68,10 +67,20 @@ COPY ./data/docker-entrypoint.d /docker-entrypoint.d
6867
### Verify
6968
###
7069
RUN set -x \
70+
&& echo "date.timezone=UTC" > /usr/local/etc/php/php.ini \
7171
&& php -v | grep -oE 'PHP\s[.0-9]+' | grep -oE '[.0-9]+' | grep '^7.3' \
7272
&& /usr/local/sbin/php-fpm --test \
73+
\
7374
&& PHP_ERROR="$( php -v 2>&1 1>/dev/null )" \
74-
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi
75+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
76+
&& PHP_ERROR="$( php -i 2>&1 1>/dev/null )" \
77+
&& if [ -n "${PHP_ERROR}" ]; then echo "${PHP_ERROR}"; false; fi \
78+
\
79+
&& PHP_FPM_ERROR="$( php-fpm -v 2>&1 1>/dev/null )" \
80+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
81+
&& PHP_FPM_ERROR="$( php-fpm -i 2>&1 1>/dev/null )" \
82+
&& if [ -n "${PHP_FPM_ERROR}" ]; then echo "${PHP_FPM_ERROR}"; false; fi \
83+
&& rm -f /usr/local/etc/php/php.ini
7584

7685

7786
###

0 commit comments

Comments
 (0)