Skip to content

Commit 64f9fb5

Browse files
cytopiacytopia
authored
Merge pull request #53 from devilbox/release-0.40
Release 0.40
2 parents 7147549 + 34d87fa commit 64f9fb5

File tree

11 files changed

+72
-17
lines changed

11 files changed

+72
-17
lines changed

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ ENV BUILD_DEPS \
6060
libssl-dev \
6161
libpspell-dev \
6262
librecode-dev \
63+
librdkafka-dev \
6364
libmm-dev \
6465
libxml2-dev \
6566
libssl-dev \
@@ -100,6 +101,7 @@ ENV RUN_DEPS \
100101
libpq5 \
101102
libaspell15 \
102103
librecode0 \
104+
librdkafka1 \
103105
snmp \
104106
libnghttp2-5 \
105107
libtidy-0.99-0 \
@@ -202,6 +204,8 @@ RUN set -x \
202204
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
203205
&& pecl install redis \
204206
&& docker-php-ext-enable redis \
207+
&& pecl install rdkafka \
208+
&& docker-php-ext-enable rdkafka \
205209
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
206210
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
207211
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
@@ -357,6 +361,8 @@ RUN set -x \
357361
&& php-fpm -m | grep -oiE '^recode$' \
358362
&& php -m | grep -oiE '^redis$' \
359363
&& php-fpm -m | grep -oiE '^redis$' \
364+
&& php -m | grep -oiE '^rdkafka$' \
365+
&& php-fpm -m | grep -oiE '^rdkafka$' \
360366
&& php -m | grep -oiE '^session$' \
361367
&& php-fpm -m | grep -oiE '^session$' \
362368
&& php -m | grep -oiE '^shmop$' \

‎Dockerfiles/mods/Dockerfile-5.4‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ ENV BUILD_DEPS \
6060
libssl-dev \
6161
libpspell-dev \
6262
librecode-dev \
63+
librdkafka-dev \
6364
libmm-dev \
6465
libxml2-dev \
6566
libssl-dev \
@@ -100,6 +101,7 @@ ENV RUN_DEPS \
100101
libpq5 \
101102
libaspell15 \
102103
librecode0 \
104+
librdkafka1 \
103105
snmp \
104106
libnghttp2-5 \
105107
libtidy-0.99-0 \
@@ -202,6 +204,8 @@ RUN set -x \
202204
&& /usr/local/bin/docker-php-ext-install recode \
203205
&& pecl install redis \
204206
&& docker-php-ext-enable redis \
207+
&& pecl install rdkafka \
208+
&& docker-php-ext-enable rdkafka \
205209
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
206210
&& /usr/local/bin/docker-php-ext-install session \
207211
&& /usr/local/bin/docker-php-ext-install shmop \
@@ -357,6 +361,8 @@ RUN set -x \
357361
&& php-fpm -m | grep -oiE '^recode$' \
358362
&& php -m | grep -oiE '^redis$' \
359363
&& php-fpm -m | grep -oiE '^redis$' \
364+
&& php -m | grep -oiE '^rdkafka$' \
365+
&& php-fpm -m | grep -oiE '^rdkafka$' \
360366
&& php -m | grep -oiE '^session$' \
361367
&& php-fpm -m | grep -oiE '^session$' \
362368
&& php -m | grep -oiE '^shmop$' \

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ ENV BUILD_DEPS \
6262
libedit-dev \
6363
libreadline-dev \
6464
librecode-dev \
65+
librdkafka-dev \
6566
libmm-dev \
6667
libxml2-dev \
6768
libssl-dev \
@@ -102,6 +103,7 @@ ENV RUN_DEPS \
102103
libpq5 \
103104
libaspell15 \
104105
librecode0 \
106+
librdkafka1 \
105107
snmp \
106108
libnghttp2-5 \
107109
libtidy-0.99-0 \
@@ -204,6 +206,8 @@ RUN set -x \
204206
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
205207
&& pecl install redis \
206208
&& docker-php-ext-enable redis \
209+
&& pecl install rdkafka \
210+
&& docker-php-ext-enable rdkafka \
207211
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
208212
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
209213
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
@@ -361,6 +365,8 @@ RUN set -x \
361365
&& php-fpm -m | grep -oiE '^recode$' \
362366
&& php -m | grep -oiE '^redis$' \
363367
&& php-fpm -m | grep -oiE '^redis$' \
368+
&& php -m | grep -oiE '^rdkafka$' \
369+
&& php-fpm -m | grep -oiE '^rdkafka$' \
364370
&& php -m | grep -oiE '^session$' \
365371
&& php-fpm -m | grep -oiE '^session$' \
366372
&& php -m | grep -oiE '^shmop$' \

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ ENV BUILD_DEPS \
6262
libedit-dev \
6363
libreadline-dev \
6464
librecode-dev \
65+
librdkafka-dev \
6566
libmm-dev \
6667
libxml2-dev \
6768
libssl-dev \
@@ -104,6 +105,7 @@ ENV RUN_DEPS \
104105
libpq5 \
105106
libaspell15 \
106107
librecode0 \
108+
librdkafka1 \
107109
snmp \
108110
libnghttp2-14 \
109111
libtidy5 \
@@ -206,6 +208,8 @@ RUN set -x \
206208
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
207209
&& pecl install redis \
208210
&& docker-php-ext-enable redis \
211+
&& pecl install rdkafka \
212+
&& docker-php-ext-enable rdkafka \
209213
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
210214
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
211215
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
@@ -361,6 +365,8 @@ RUN set -x \
361365
&& php-fpm -m | grep -oiE '^recode$' \
362366
&& php -m | grep -oiE '^redis$' \
363367
&& php-fpm -m | grep -oiE '^redis$' \
368+
&& php -m | grep -oiE '^rdkafka$' \
369+
&& php-fpm -m | grep -oiE '^rdkafka$' \
364370
&& php -m | grep -oiE '^session$' \
365371
&& php-fpm -m | grep -oiE '^session$' \
366372
&& php -m | grep -oiE '^shmop$' \

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ ENV BUILD_DEPS \
6161
libedit-dev \
6262
libreadline-dev \
6363
librecode-dev \
64+
librdkafka-dev \
6465
libmm-dev \
6566
libxml2-dev \
6667
libssl-dev \
@@ -101,6 +102,7 @@ ENV RUN_DEPS \
101102
libpq5 \
102103
libaspell15 \
103104
librecode0 \
105+
librdkafka1 \
104106
snmp \
105107
libnghttp2-14 \
106108
libtidy5 \
@@ -205,6 +207,8 @@ RUN set -x \
205207
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
206208
&& pecl install redis \
207209
&& docker-php-ext-enable redis \
210+
&& pecl install rdkafka \
211+
&& docker-php-ext-enable rdkafka \
208212
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
209213
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
210214
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
@@ -358,6 +362,8 @@ RUN set -x \
358362
&& php-fpm -m | grep -oiE '^recode$' \
359363
&& php -m | grep -oiE '^redis$' \
360364
&& php-fpm -m | grep -oiE '^redis$' \
365+
&& php -m | grep -oiE '^rdkafka$' \
366+
&& php-fpm -m | grep -oiE '^rdkafka$' \
361367
&& php -m | grep -oiE '^session$' \
362368
&& php-fpm -m | grep -oiE '^session$' \
363369
&& php -m | grep -oiE '^shmop$' \

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ ENV BUILD_DEPS \
6161
libedit-dev \
6262
libreadline-dev \
6363
librecode-dev \
64+
librdkafka-dev \
6465
libmm-dev \
6566
libxml2-dev \
6667
libssl-dev \
@@ -101,6 +102,7 @@ ENV RUN_DEPS \
101102
libpq5 \
102103
libaspell15 \
103104
librecode0 \
105+
librdkafka1 \
104106
snmp \
105107
libnghttp2-14 \
106108
libtidy5 \
@@ -207,6 +209,8 @@ RUN set -x \
207209
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
208210
&& pecl install redis \
209211
&& docker-php-ext-enable redis \
212+
&& pecl install rdkafka \
213+
&& docker-php-ext-enable rdkafka \
210214
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
211215
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
212216
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
@@ -364,6 +368,8 @@ RUN set -x \
364368
&& php-fpm -m | grep -oiE '^recode$' \
365369
&& php -m | grep -oiE '^redis$' \
366370
&& php-fpm -m | grep -oiE '^redis$' \
371+
&& php -m | grep -oiE '^rdkafka$' \
372+
&& php-fpm -m | grep -oiE '^rdkafka$' \
367373
&& php -m | grep -oiE '^session$' \
368374
&& php-fpm -m | grep -oiE '^session$' \
369375
&& php -m | grep -oiE '^shmop$' \

‎Dockerfiles/mods/Dockerfile-7.2‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ ENV BUILD_DEPS \
6161
libedit-dev \
6262
libreadline-dev \
6363
librecode-dev \
64+
librdkafka-dev \
6465
libmm-dev \
6566
libxml2-dev \
6667
libssl-dev \
@@ -102,6 +103,7 @@ ENV RUN_DEPS \
102103
libpq5 \
103104
libaspell15 \
104105
librecode0 \
106+
librdkafka1 \
105107
snmp \
106108
libnghttp2-14 \
107109
libtidy5 \
@@ -209,6 +211,8 @@ RUN set -x \
209211
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
210212
&& pecl install redis \
211213
&& docker-php-ext-enable redis \
214+
&& pecl install rdkafka \
215+
&& docker-php-ext-enable rdkafka \
212216
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
213217
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
214218
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
@@ -367,6 +371,8 @@ RUN set -x \
367371
&& php-fpm -m | grep -oiE '^recode$' \
368372
&& php -m | grep -oiE '^redis$' \
369373
&& php-fpm -m | grep -oiE '^redis$' \
374+
&& php -m | grep -oiE '^rdkafka$' \
375+
&& php-fpm -m | grep -oiE '^rdkafka$' \
370376
&& php -m | grep -oiE '^session$' \
371377
&& php-fpm -m | grep -oiE '^session$' \
372378
&& php -m | grep -oiE '^shmop$' \

‎Dockerfiles/mods/Dockerfile-7.3‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ ENV BUILD_DEPS \
5959
libedit-dev \
6060
libreadline-dev \
6161
librecode-dev \
62+
librdkafka-dev \
6263
libmm-dev \
6364
libxml2-dev \
6465
libssl-dev \
@@ -101,6 +102,7 @@ ENV RUN_DEPS \
101102
libpq5 \
102103
libaspell15 \
103104
librecode0 \
105+
librdkafka1 \
104106
snmp \
105107
libnghttp2-14 \
106108
libhiredis0.13 \
@@ -184,6 +186,8 @@ RUN set -x \
184186
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) recode \
185187
&& pecl install redis \
186188
&& docker-php-ext-enable redis \
189+
&& pecl install rdkafka \
190+
&& docker-php-ext-enable rdkafka \
187191
&& /usr/local/bin/docker-php-ext-configure session --with-mm \
188192
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) session \
189193
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) shmop \
@@ -366,6 +370,8 @@ RUN set -x \
366370
&& php-fpm -m | grep -oiE '^recode$' \
367371
&& php -m | grep -oiE '^redis$' \
368372
&& php-fpm -m | grep -oiE '^redis$' \
373+
&& php -m | grep -oiE '^rdkafka$' \
374+
&& php-fpm -m | grep -oiE '^rdkafka$' \
369375
&& php -m | grep -oiE '^session$' \
370376
&& php-fpm -m | grep -oiE '^session$' \
371377
&& php -m | grep -oiE '^shmop$' \

‎Makefile‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -319,23 +319,23 @@ rebuild-work-73:
319319
### Pull base FROM images
320320
###
321321
pull-from-52:
322-
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.2 | sed 's/^FROM//g'; done)
322+
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.2 | sed 's/^FROM\s*//g';)
323323
pull-from-53:
324-
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.3 | sed 's/^FROM//g'; done)
324+
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.3 | sed 's/^FROM\s*//g';)
325325
pull-from-54:
326-
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.4 | sed 's/^FROM//g'; done)
326+
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.4 | sed 's/^FROM\s*//g';)
327327
pull-from-55:
328-
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.5 | sed 's/^FROM//g'; done)
328+
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.5 | sed 's/^FROM\s*//g';)
329329
pull-from-56:
330-
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.6 | sed 's/^FROM//g'; done)
330+
docker pull $(shell grep FROM $(location)/base/Dockerfile-5.6 | sed 's/^FROM\s*//g';)
331331
pull-from-70:
332-
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.0 | sed 's/^FROM//g'; done)
332+
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.0 | sed 's/^FROM\s*//g';)
333333
pull-from-71:
334-
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.1 | sed 's/^FROM//g'; done)
334+
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.1 | sed 's/^FROM\s*//g';)
335335
pull-from-72:
336-
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.2 | sed 's/^FROM//g'; done)
336+
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.2 | sed 's/^FROM\s*//g';)
337337
pull-from-73:
338-
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.3 | sed 's/^FROM//g'; done)
338+
docker pull $(shell grep FROM $(location)/base/Dockerfile-7.3 | sed 's/^FROM\s*//g';)
339339

340340

341341
###

0 commit comments

Comments
 (0)