Skip to content

Commit e2b446b

Browse files
committed
Add excimer and opentelemetry extensions
1 parent 8f2e18a commit e2b446b

File tree

3 files changed

+16
-12
lines changed

3 files changed

+16
-12
lines changed

Dockerfile

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
ARG version=8.3
22
ARG major=8
33
ARG suffix=83
4-
ARG newrelic_version=10.15.0.4
4+
ARG newrelic_version=11.2.0.15
55

66
FROM minidocks/base:3.19 AS v8.1
77

8-
FROM minidocks/base:3.19 AS v8.2
8+
FROM minidocks/base:3.20 AS v8.2
99

10-
FROM minidocks/base:3.19 AS v8.3
10+
FROM minidocks/base:3.20 AS v8.3
1111

1212
FROM v$version AS base
1313
LABEL maintainer="Martin Hasoň <martin.hason@gmail.com>"
@@ -20,13 +20,13 @@ ARG suffix
2020
RUN getent group www-data >/dev/null || addgroup -g 82 -S www-data; getent passwd www-date >/dev/null || adduser -u 82 -S -s /bin/sh -G www-data www-data
2121

2222
RUN for module in ctype curl iconv json mbstring openssl pcntl pecl-apcu phar posix tokenizer; do modules="$modules php$suffix-$module"; done \
23-
&& apk add "gnu-libiconv$libiconv_version" "php$suffix" $modules && clean \
24-
&& if [ ! -f /usr/bin/php ]; then ln -s "/usr/bin/php$suffix" /usr/bin/php; fi \
25-
&& if [ ! -f /usr/bin/phar ]; then ln -s "/usr/bin/phar$suffix" /usr/bin/phar; fi \
26-
&& if [ ! -d /etc/php$major ]; then ln -s "/etc/php$suffix" "/etc/php$major"; fi \
27-
&& if [ ! -d /usr/lib/php$major ]; then ln -s "/usr/lib/php$suffix" "/usr/lib/php$major"; fi
23+
&& apk add "gnu-libiconv" "php$suffix" $modules && clean \
24+
&& if [ ! -e /usr/bin/php ]; then ln -s "php$suffix" /usr/bin/php; fi \
25+
&& ln -fs "phar$suffix" /usr/bin/phar \
26+
&& if [ ! -e /etc/php$major ]; then ln -s "php$suffix" "/etc/php$major"; fi \
27+
&& if [ ! -e /usr/lib/php$major ]; then ln -s "php$suffix" "/usr/lib/php$major"; fi
2828

29-
ENV LD_PRELOAD /usr/lib/preloadable_libiconv.so php
29+
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php"
3030

3131
#Psysh
3232
RUN wget https://psysh.org/psysh && chmod +x psysh && mv psysh /usr/bin/psysh
@@ -79,6 +79,7 @@ RUN for module in \
7979
pecl-apcu \
8080
pecl-memcached \
8181
pecl-mongodb \
82+
pecl-opentelemetry \
8283
pecl-pcov \
8384
pecl-uploadprogress \
8485
pecl-redis \
@@ -99,7 +100,8 @@ RUN for module in \
99100
xsl \
100101
zip \
101102
; do modules="$modules php$suffix-$module"; done \
102-
&& if [ "$suffix" != "83" ]; then modules="$modules php$suffix-pecl-protobuf"; fi \
103+
&& if [ "$suffix" != "84" ]; then modules="$modules php$suffix-pecl-protobuf"; fi \
104+
&& if [ "$suffix" != "81" ]; then modules="$modules php$suffix-pecl-excimer@edge"; fi \
103105
&& apk add $modules \
104106
&& if [ ! -f /usr/bin/php-fpm ]; then ln -s "$(ls /usr/sbin/php-fpm* -1| head -1)" /usr/bin/php-fpm; fi \
105107
&& clean

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ Installed applications
3333
Modules
3434
-------
3535

36-
| module | 8.x | 8.3 | tag |
36+
| module | 8.x | 8.4 | tag |
3737
|------------------|:---:|:---:|--------|
3838
| apcu ||| base |
3939
| bcmath ||| latest |
@@ -44,6 +44,7 @@ Modules
4444
| curl ||| base |
4545
| dom ||| latest |
4646
| exif ||| latest |
47+
| excimer ||| latest |
4748
| ffi ||| latest |
4849
| fileinfo ||| latest |
4950
| fpm ||| latest |
@@ -63,6 +64,7 @@ Modules
6364
| mysqlnd ||| latest |
6465
| newrelic (amd64) ||| latest |
6566
| opcache ||| latest |
67+
| opentelemetry ||| latest |
6668
| openssl ||| base |
6769
| pcntl ||| base |
6870
| pcov ||| base |

build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ versions="
1515
8.3-base;8.3;83;base
1616
8.3-nginx;8.3;83;nginx
1717
8.3-intl;8.3;83;intl
18-
latest;8.2;82
18+
latest;8.3;83
1919
"
2020

2121
build() {

0 commit comments

Comments
 (0)