Skip to content

Commit d309c38

Browse files
cytopiacytopia
authored
Merge pull request #86 from devilbox/release-0.66
Release 0.66
2 parents 5b72766 + 9fedd00 commit d309c38

23 files changed

Lines changed: 135 additions & 81 deletions

‎Dockerfiles/mods/Dockerfile-5.3‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ LABEL \
1818
### Envs
1919
###
2020
ENV BUILD_DEPS \
21-
alien \
2221
firebird-dev \
2322
freetds-dev \
24-
libaio-dev \
2523
libbz2-dev \
2624
libc-client-dev \
2725
libcurl4-openssl-dev \
@@ -58,7 +56,6 @@ ENV BUILD_DEPS \
5856
git
5957

6058
ENV RUN_DEPS \
61-
libaio1 \
6259
libaspell15 \
6360
libc-client2007e \
6461
libenchant1c2a \
@@ -110,7 +107,7 @@ RUN set -x \
110107
&& (rm -rf /usr/local/lib/php/doc/ioncube || true) \
111108
\
112109
# ---- Installing PHP Extension: amqp ----
113-
&& echo "/usr" | pecl install amqp \
110+
&& pecl install amqp-1.9.3 \
114111
&& docker-php-ext-enable amqp \
115112
&& (rm -rf /usr/local/lib/php/test/amqp || true) \
116113
&& (rm -rf /usr/local/lib/php/doc/amqp || true) \
@@ -256,23 +253,6 @@ RUN set -x \
256253
&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
257254
&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
258255
\
259-
# ---- Installing PHP Extension: oci8 ----
260-
&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
261-
&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
262-
https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
263-
&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
264-
https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
265-
&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
266-
&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
267-
&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
268-
&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
269-
&& ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true \
270-
\
271-
&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
272-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
273-
&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
274-
&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
275-
\
276256
# ---- Installing PHP Extension: opcache ----
277257
&& pecl install zendopcache \
278258
&& docker-php-ext-enable opcache \
@@ -529,8 +509,6 @@ RUN set -x \
529509
&& php-fpm -m | grep -oiE '^mysqli$' \
530510
&& php -m | grep -oiE '^mysqlnd$' \
531511
&& php-fpm -m | grep -oiE '^mysqlnd$' \
532-
&& php -m | grep -oiE '^oci8$' \
533-
&& php-fpm -m | grep -oiE '^oci8$' \
534512
&& php -m | grep -oiE '^Zend Opcache$' \
535513
&& php-fpm -m | grep -oiE '^Zend Opcache$' \
536514
&& php -m | grep -oiE '^openssl$' \

‎Dockerfiles/mods/Dockerfile-5.4‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ LABEL \
1818
### Envs
1919
###
2020
ENV BUILD_DEPS \
21-
alien \
2221
firebird-dev \
2322
freetds-dev \
24-
libaio-dev \
2523
libbz2-dev \
2624
libc-client-dev \
2725
libcurl4-openssl-dev \
@@ -58,7 +56,6 @@ ENV BUILD_DEPS \
5856
git
5957

6058
ENV RUN_DEPS \
61-
libaio1 \
6259
libaspell15 \
6360
libc-client2007e \
6461
libenchant1c2a \
@@ -110,7 +107,7 @@ RUN set -x \
110107
&& (rm -rf /usr/local/lib/php/doc/ioncube || true) \
111108
\
112109
# ---- Installing PHP Extension: amqp ----
113-
&& echo "/usr" | pecl install amqp \
110+
&& pecl install amqp-1.9.3 \
114111
&& docker-php-ext-enable amqp \
115112
&& (rm -rf /usr/local/lib/php/test/amqp || true) \
116113
&& (rm -rf /usr/local/lib/php/doc/amqp || true) \
@@ -261,23 +258,6 @@ RUN set -x \
261258
&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
262259
&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
263260
\
264-
# ---- Installing PHP Extension: oci8 ----
265-
&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
266-
&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
267-
https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
268-
&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
269-
https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
270-
&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
271-
&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
272-
&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
273-
&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
274-
&& ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true \
275-
\
276-
&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
277-
&& /usr/local/bin/docker-php-ext-install oci8 \
278-
&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
279-
&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
280-
\
281261
# ---- Installing PHP Extension: opcache ----
282262
&& pecl install zendopcache \
283263
&& docker-php-ext-enable opcache \
@@ -534,8 +514,6 @@ RUN set -x \
534514
&& php-fpm -m | grep -oiE '^mysqli$' \
535515
&& php -m | grep -oiE '^mysqlnd$' \
536516
&& php-fpm -m | grep -oiE '^mysqlnd$' \
537-
&& php -m | grep -oiE '^oci8$' \
538-
&& php-fpm -m | grep -oiE '^oci8$' \
539517
&& php -m | grep -oiE '^Zend Opcache$' \
540518
&& php-fpm -m | grep -oiE '^Zend Opcache$' \
541519
&& php -m | grep -oiE '^openssl$' \

‎Dockerfiles/mods/Dockerfile-5.5‎

Lines changed: 1 addition & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ LABEL \
1818
### Envs
1919
###
2020
ENV BUILD_DEPS \
21-
alien \
2221
firebird-dev \
2322
freetds-dev \
24-
libaio-dev \
2523
libbz2-dev \
2624
libc-client-dev \
2725
libcurl4-openssl-dev \
@@ -59,7 +57,6 @@ ENV BUILD_DEPS \
5957
git
6058

6159
ENV RUN_DEPS \
62-
libaio1 \
6360
libaspell15 \
6461
libc-client2007e \
6562
libenchant1c2a \
@@ -111,7 +108,7 @@ RUN set -x \
111108
&& (rm -rf /usr/local/lib/php/doc/ioncube || true) \
112109
\
113110
# ---- Installing PHP Extension: amqp ----
114-
&& echo "/usr" | pecl install amqp \
111+
&& pecl install amqp-1.9.3 \
115112
&& docker-php-ext-enable amqp \
116113
&& (rm -rf /usr/local/lib/php/test/amqp || true) \
117114
&& (rm -rf /usr/local/lib/php/doc/amqp || true) \
@@ -251,23 +248,6 @@ RUN set -x \
251248
&& (rm -rf /usr/local/lib/php/test/mysqli || true) \
252249
&& (rm -rf /usr/local/lib/php/doc/mysqli || true) \
253250
\
254-
# ---- Installing PHP Extension: oci8 ----
255-
&& rpm --import http://yum.oracle.com/RPM-GPG-KEY-oracle-ol7 \
256-
&& curl -o /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
257-
https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
258-
&& curl -o /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
259-
https://yum.oracle.com/repo/OracleLinux/OL7/oracle/instantclient/x86_64/getPackage/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
260-
&& alien -i /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
261-
&& alien -i /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
262-
&& rm -f /tmp/oracle-instantclient18.3-basiclite-18.3.0.0.0-2.x86_64.rpm \
263-
&& rm -f /tmp/oracle-instantclient18.3-devel-18.3.0.0.0-2.x86_64.rpm \
264-
&& ln -s /usr/lib/oracle/18.3/client64/lib/*.so* /usr/lib/ || true \
265-
\
266-
&& /usr/local/bin/docker-php-ext-configure oci8 --with-oci8=instantclient,/usr/lib/oracle/18.3/client64/lib/,18.3 \
267-
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) oci8 \
268-
&& (rm -rf /usr/local/lib/php/test/oci8 || true) \
269-
&& (rm -rf /usr/local/lib/php/doc/oci8 || true) \
270-
\
271251
# ---- Installing PHP Extension: opcache ----
272252
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) opcache \
273253
&& (rm -rf /usr/local/lib/php/test/opcache || true) \
@@ -528,8 +508,6 @@ RUN set -x \
528508
&& php-fpm -m | grep -oiE '^mysqli$' \
529509
&& php -m | grep -oiE '^mysqlnd$' \
530510
&& php-fpm -m | grep -oiE '^mysqlnd$' \
531-
&& php -m | grep -oiE '^oci8$' \
532-
&& php-fpm -m | grep -oiE '^oci8$' \
533511
&& php -m | grep -oiE '^Zend Opcache$' \
534512
&& php-fpm -m | grep -oiE '^Zend Opcache$' \
535513
&& php -m | grep -oiE '^openssl$' \

‎Dockerfiles/mods/Dockerfile-5.6‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,17 @@ RUN set -x \
131131
&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
132132
&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
133133
\
134+
# ---- Installing PHP Extension: blackfire ----
135+
&& version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
136+
&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
137+
&& mkdir -p /tmp/blackfire \
138+
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
139+
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
140+
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
141+
\
142+
&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
143+
&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
144+
\
134145
# ---- Installing PHP Extension: bz2 ----
135146
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
136147
&& (rm -rf /usr/local/lib/php/test/bz2 || true) \

‎Dockerfiles/mods/Dockerfile-7.0‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,17 @@ RUN set -x \
132132
&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
133133
&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
134134
\
135+
# ---- Installing PHP Extension: blackfire ----
136+
&& version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
137+
&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
138+
&& mkdir -p /tmp/blackfire \
139+
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
140+
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
141+
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
142+
\
143+
&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
144+
&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
145+
\
135146
# ---- Installing PHP Extension: bz2 ----
136147
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
137148
&& (rm -rf /usr/local/lib/php/test/bz2 || true) \

‎Dockerfiles/mods/Dockerfile-7.1‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,17 @@ RUN set -x \
132132
&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
133133
&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
134134
\
135+
# ---- Installing PHP Extension: blackfire ----
136+
&& version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
137+
&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
138+
&& mkdir -p /tmp/blackfire \
139+
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
140+
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
141+
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
142+
\
143+
&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
144+
&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
145+
\
135146
# ---- Installing PHP Extension: bz2 ----
136147
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
137148
&& (rm -rf /usr/local/lib/php/test/bz2 || true) \

‎Dockerfiles/mods/Dockerfile-7.2‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,17 @@ RUN set -x \
132132
&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
133133
&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
134134
\
135+
# ---- Installing PHP Extension: blackfire ----
136+
&& version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
137+
&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
138+
&& mkdir -p /tmp/blackfire \
139+
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
140+
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
141+
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
142+
\
143+
&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
144+
&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
145+
\
135146
# ---- Installing PHP Extension: bz2 ----
136147
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
137148
&& (rm -rf /usr/local/lib/php/test/bz2 || true) \

‎Dockerfiles/mods/Dockerfile-7.3‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -111,6 +111,17 @@ RUN set -x \
111111
&& (rm -rf /usr/local/lib/php/test/bcmath || true) \
112112
&& (rm -rf /usr/local/lib/php/doc/bcmath || true) \
113113
\
114+
# ---- Installing PHP Extension: blackfire ----
115+
&& version=$(php -r "echo PHP_MAJOR_VERSION.PHP_MINOR_VERSION;") \
116+
&& curl -A "Docker" -o /tmp/blackfire-probe.tar.gz -D - -L -s https://blackfire.io/api/v1/releases/probe/php/linux/amd64/$version \
117+
&& mkdir -p /tmp/blackfire \
118+
&& tar zxpf /tmp/blackfire-probe.tar.gz -C /tmp/blackfire \
119+
&& mv /tmp/blackfire/blackfire-*.so $(php -r "echo ini_get('extension_dir');")/blackfire.so \
120+
&& rm -rf /tmp/blackfire /tmp/blackfire-probe.tar.gz \
121+
\
122+
&& (rm -rf /usr/local/lib/php/test/blackfire || true) \
123+
&& (rm -rf /usr/local/lib/php/doc/blackfire || true) \
124+
\
114125
# ---- Installing PHP Extension: bz2 ----
115126
&& /usr/local/bin/docker-php-ext-install -j$(getconf _NPROCESSORS_ONLN) bz2 \
116127
&& (rm -rf /usr/local/lib/php/test/bz2 || true) \

‎Dockerfiles/work/Dockerfile-5.2‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ RUN set -x \
3131
dirmngr \
3232
gnupg \
3333
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
34+
&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
35+
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
3436
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
3537
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
3638
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
4951
automake \
5052
bash-completion \
5153
binutils \
54+
blackfire-agent \
5255
build-essential \
5356
bzip2 \
5457
coreutils \

‎Dockerfiles/work/Dockerfile-5.3‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,8 @@ RUN set -x \
3131
dirmngr \
3232
gnupg \
3333
&& echo "deb http://ftp.debian.org/debian jessie-backports main" > /etc/apt/sources.list.d/backports.list \
34+
&& curl -sS "https://packages.blackfire.io/gpg.key" 2>/dev/null | APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key add - \
35+
&& echo "deb http://packages.blackfire.io/debian any main" > /etc/apt/sources.list.d/blackfire.list \
3436
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv A1715D88E1DF1F24 \
3537
&& echo "deb http://ppa.launchpad.net/git-core/ppa/ubuntu wily main" > /etc/apt/sources.list.d/git.list \
3638
&& APT_KEY_DONT_WARN_ON_DANGEROUS_USAGE=1 apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv 2930ADAE8CAF5059EE73BB4B58712A2291FA4AD5 \
@@ -49,6 +51,7 @@ RUN set -x \
4951
automake \
5052
bash-completion \
5153
binutils \
54+
blackfire-agent \
5255
build-essential \
5356
bzip2 \
5457
coreutils \

0 commit comments

Comments
 (0)