Skip to content

Commit

Permalink
Merge pull request #53 from devilbox/release-0.40
Browse files Browse the repository at this point in the history 
Release 0.40
  • Loading branch information
@cytopia
cytopia authored Sep 27, 2018
2 parents 7147549 + 34d87fa commit 64f9fb5
Show file tree
Hide file tree
Showing 11 changed files with 72 additions and 17 deletions.
6 changes: 6 additions & 0 deletions Dockerfiles/mods/Dockerfile-5.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ ENV BUILD_DEPS \
libssl-dev \
libpspell-dev \
librecode-dev \
librdkafka-dev \
libmm-dev \
libxml2-dev \
libssl-dev \
Expand Down Expand Up @@ -100,6 +101,7 @@ ENV RUN_DEPS \
libpq5 \
libaspell15 \
librecode0 \
librdkafka1 \
snmp \
libnghttp2-5 \
libtidy-0.99-0 \
Expand Down Expand Up @@ -202,6 +204,8 @@ RUN set -x \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install rdkafka \
&& docker-php-ext-enable rdkafka \
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
Expand Down Expand Up @@ -357,6 +361,8 @@ RUN set -x \
&& php-fpm -m | grep -oiE '^recode$' \
&& php -m | grep -oiE '^redis$' \
&& php-fpm -m | grep -oiE '^redis$' \
&& php -m | grep -oiE '^rdkafka$' \
&& php-fpm -m | grep -oiE '^rdkafka$' \
&& php -m | grep -oiE '^session$' \
&& php-fpm -m | grep -oiE '^session$' \
&& php -m | grep -oiE '^shmop$' \
Expand Down
6 changes: 6 additions & 0 deletions Dockerfiles/mods/Dockerfile-5.4
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ ENV BUILD_DEPS \
libssl-dev \
libpspell-dev \
librecode-dev \
librdkafka-dev \
libmm-dev \
libxml2-dev \
libssl-dev \
Expand Down Expand Up @@ -100,6 +101,7 @@ ENV RUN_DEPS \
libpq5 \
libaspell15 \
librecode0 \
librdkafka1 \
snmp \
libnghttp2-5 \
libtidy-0.99-0 \
Expand Down Expand Up @@ -202,6 +204,8 @@ RUN set -x \
&& /usr/local/bin/docker-php-ext-install recode \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install rdkafka \
&& docker-php-ext-enable rdkafka \
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
&& /usr/local/bin/docker-php-ext-install session \
&& /usr/local/bin/docker-php-ext-install shmop \
Expand Down Expand Up @@ -357,6 +361,8 @@ RUN set -x \
&& php-fpm -m | grep -oiE '^recode$' \
&& php -m | grep -oiE '^redis$' \
&& php-fpm -m | grep -oiE '^redis$' \
&& php -m | grep -oiE '^rdkafka$' \
&& php-fpm -m | grep -oiE '^rdkafka$' \
&& php -m | grep -oiE '^session$' \
&& php-fpm -m | grep -oiE '^session$' \
&& php -m | grep -oiE '^shmop$' \
Expand Down
6 changes: 6 additions & 0 deletions Dockerfiles/mods/Dockerfile-5.5
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ ENV BUILD_DEPS \
libedit-dev \
libreadline-dev \
librecode-dev \
librdkafka-dev \
libmm-dev \
libxml2-dev \
libssl-dev \
Expand Down Expand Up @@ -102,6 +103,7 @@ ENV RUN_DEPS \
libpq5 \
libaspell15 \
librecode0 \
librdkafka1 \
snmp \
libnghttp2-5 \
libtidy-0.99-0 \
Expand Down Expand Up @@ -204,6 +206,8 @@ RUN set -x \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install rdkafka \
&& docker-php-ext-enable rdkafka \
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
Expand Down Expand Up @@ -361,6 +365,8 @@ RUN set -x \
&& php-fpm -m | grep -oiE '^recode$' \
&& php -m | grep -oiE '^redis$' \
&& php-fpm -m | grep -oiE '^redis$' \
&& php -m | grep -oiE '^rdkafka$' \
&& php-fpm -m | grep -oiE '^rdkafka$' \
&& php -m | grep -oiE '^session$' \
&& php-fpm -m | grep -oiE '^session$' \
&& php -m | grep -oiE '^shmop$' \
Expand Down
6 changes: 6 additions & 0 deletions Dockerfiles/mods/Dockerfile-5.6
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ ENV BUILD_DEPS \
libedit-dev \
libreadline-dev \
librecode-dev \
librdkafka-dev \
libmm-dev \
libxml2-dev \
libssl-dev \
Expand Down Expand Up @@ -104,6 +105,7 @@ ENV RUN_DEPS \
libpq5 \
libaspell15 \
librecode0 \
librdkafka1 \
snmp \
libnghttp2-14 \
libtidy5 \
Expand Down Expand Up @@ -206,6 +208,8 @@ RUN set -x \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install rdkafka \
&& docker-php-ext-enable rdkafka \
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
Expand Down Expand Up @@ -361,6 +365,8 @@ RUN set -x \
&& php-fpm -m | grep -oiE '^recode$' \
&& php -m | grep -oiE '^redis$' \
&& php-fpm -m | grep -oiE '^redis$' \
&& php -m | grep -oiE '^rdkafka$' \
&& php-fpm -m | grep -oiE '^rdkafka$' \
&& php -m | grep -oiE '^session$' \
&& php-fpm -m | grep -oiE '^session$' \
&& php -m | grep -oiE '^shmop$' \
Expand Down
6 changes: 6 additions & 0 deletions Dockerfiles/mods/Dockerfile-7.0
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ ENV BUILD_DEPS \
libedit-dev \
libreadline-dev \
librecode-dev \
librdkafka-dev \
libmm-dev \
libxml2-dev \
libssl-dev \
Expand Down Expand Up @@ -101,6 +102,7 @@ ENV RUN_DEPS \
libpq5 \
libaspell15 \
librecode0 \
librdkafka1 \
snmp \
libnghttp2-14 \
libtidy5 \
Expand Down Expand Up @@ -205,6 +207,8 @@ RUN set -x \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install rdkafka \
&& docker-php-ext-enable rdkafka \
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
Expand Down Expand Up @@ -358,6 +362,8 @@ RUN set -x \
&& php-fpm -m | grep -oiE '^recode$' \
&& php -m | grep -oiE '^redis$' \
&& php-fpm -m | grep -oiE '^redis$' \
&& php -m | grep -oiE '^rdkafka$' \
&& php-fpm -m | grep -oiE '^rdkafka$' \
&& php -m | grep -oiE '^session$' \
&& php-fpm -m | grep -oiE '^session$' \
&& php -m | grep -oiE '^shmop$' \
Expand Down
6 changes: 6 additions & 0 deletions Dockerfiles/mods/Dockerfile-7.1
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ ENV BUILD_DEPS \
libedit-dev \
libreadline-dev \
librecode-dev \
librdkafka-dev \
libmm-dev \
libxml2-dev \
libssl-dev \
Expand Down Expand Up @@ -101,6 +102,7 @@ ENV RUN_DEPS \
libpq5 \
libaspell15 \
librecode0 \
librdkafka1 \
snmp \
libnghttp2-14 \
libtidy5 \
Expand Down Expand Up @@ -207,6 +209,8 @@ RUN set -x \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install rdkafka \
&& docker-php-ext-enable rdkafka \
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
Expand Down Expand Up @@ -364,6 +368,8 @@ RUN set -x \
&& php-fpm -m | grep -oiE '^recode$' \
&& php -m | grep -oiE '^redis$' \
&& php-fpm -m | grep -oiE '^redis$' \
&& php -m | grep -oiE '^rdkafka$' \
&& php-fpm -m | grep -oiE '^rdkafka$' \
&& php -m | grep -oiE '^session$' \
&& php-fpm -m | grep -oiE '^session$' \
&& php -m | grep -oiE '^shmop$' \
Expand Down
6 changes: 6 additions & 0 deletions Dockerfiles/mods/Dockerfile-7.2
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ ENV BUILD_DEPS \
libedit-dev \
libreadline-dev \
librecode-dev \
librdkafka-dev \
libmm-dev \
libxml2-dev \
libssl-dev \
Expand Down Expand Up @@ -102,6 +103,7 @@ ENV RUN_DEPS \
libpq5 \
libaspell15 \
librecode0 \
librdkafka1 \
snmp \
libnghttp2-14 \
libtidy5 \
Expand Down Expand Up @@ -209,6 +211,8 @@ RUN set -x \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install rdkafka \
&& docker-php-ext-enable rdkafka \
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
Expand Down Expand Up @@ -367,6 +371,8 @@ RUN set -x \
&& php-fpm -m | grep -oiE '^recode$' \
&& php -m | grep -oiE '^redis$' \
&& php-fpm -m | grep -oiE '^redis$' \
&& php -m | grep -oiE '^rdkafka$' \
&& php-fpm -m | grep -oiE '^rdkafka$' \
&& php -m | grep -oiE '^session$' \
&& php-fpm -m | grep -oiE '^session$' \
&& php -m | grep -oiE '^shmop$' \
Expand Down
6 changes: 6 additions & 0 deletions Dockerfiles/mods/Dockerfile-7.3
View file
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ ENV BUILD_DEPS \
libedit-dev \
libreadline-dev \
librecode-dev \
librdkafka-dev \
libmm-dev \
libxml2-dev \
libssl-dev \
Expand Down Expand Up @@ -101,6 +102,7 @@ ENV RUN_DEPS \
libpq5 \
libaspell15 \
librecode0 \
librdkafka1 \
snmp \
libnghttp2-14 \
libhiredis0.13 \
Expand Down Expand Up @@ -184,6 +186,8 @@ RUN set -x \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
&& pecl install redis \
&& docker-php-ext-enable redis \
&& pecl install rdkafka \
&& docker-php-ext-enable rdkafka \
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
Expand Down Expand Up @@ -366,6 +370,8 @@ RUN set -x \
&& php-fpm -m | grep -oiE '^recode$' \
&& php -m | grep -oiE '^redis$' \
&& php-fpm -m | grep -oiE '^redis$' \
&& php -m | grep -oiE '^rdkafka$' \
&& php-fpm -m | grep -oiE '^rdkafka$' \
&& php -m | grep -oiE '^session$' \
&& php-fpm -m | grep -oiE '^session$' \
&& php -m | grep -oiE '^shmop$' \
Expand Down
18 changes: 9 additions & 9 deletions Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -319,23 +319,23 @@ rebuild-work-73:
### Pull base FROM images
###
pull-from-52:
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.2 | sed 's/^FROM//g'; done)
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.2 | sed 's/^FROM\s*//g';)
pull-from-53:
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.3 | sed 's/^FROM//g'; done)
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.3 | sed 's/^FROM\s*//g';)
pull-from-54:
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.4 | sed 's/^FROM//g'; done)
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.4 | sed 's/^FROM\s*//g';)
pull-from-55:
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.5 | sed 's/^FROM//g'; done)
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.5 | sed 's/^FROM\s*//g';)
pull-from-56:
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.6 | sed 's/^FROM//g'; done)
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.6 | sed 's/^FROM\s*//g';)
pull-from-70:
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.0 | sed 's/^FROM//g'; done)
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.0 | sed 's/^FROM\s*//g';)
pull-from-71:
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.1 | sed 's/^FROM//g'; done)
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.1 | sed 's/^FROM\s*//g';)
pull-from-72:
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.2 | sed 's/^FROM//g'; done)
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.2 | sed 's/^FROM\s*//g';)
pull-from-73:
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.3 | sed 's/^FROM//g'; done)
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.3 | sed 's/^FROM\s*//g';)


###
Expand Down
Loading

0 comments on commit 64f9fb5

Please sign in to comment.