Skip to content

Commit bc87724

Browse files
xiagwbestlong
authored andcommitted
add php ext "taint" (laradock#2150)
* add php ext "taint", only support php7.
1 parent dba1594 commit bc87724

5 files changed

Lines changed: 50 additions & 0 deletions

File tree

docker-compose.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ services:
9898
- INSTALL_PG_CLIENT=${WORKSPACE_INSTALL_PG_CLIENT}
9999
- INSTALL_PHALCON=${WORKSPACE_INSTALL_PHALCON}
100100
- INSTALL_SWOOLE=${WORKSPACE_INSTALL_SWOOLE}
101+
- INSTALL_TAINT=${WORKSPACE_INSTALL_TAINT}
101102
- INSTALL_LIBPNG=${WORKSPACE_INSTALL_LIBPNG}
102103
- INSTALL_IONCUBE=${WORKSPACE_INSTALL_IONCUBE}
103104
- INSTALL_MYSQL_CLIENT=${WORKSPACE_INSTALL_MYSQL_CLIENT}
@@ -162,6 +163,7 @@ services:
162163
- INSTALL_LDAP=${PHP_FPM_INSTALL_LDAP}
163164
- INSTALL_PHALCON=${PHP_FPM_INSTALL_PHALCON}
164165
- INSTALL_SWOOLE=${PHP_FPM_INSTALL_SWOOLE}
166+
- INSTALL_TAINT=${PHP_FPM_INSTALL_TAINT}
165167
- INSTALL_IMAGE_OPTIMIZERS=${PHP_FPM_INSTALL_IMAGE_OPTIMIZERS}
166168
- INSTALL_IMAGEMAGICK=${PHP_FPM_INSTALL_IMAGEMAGICK}
167169
- INSTALL_CALENDAR=${PHP_FPM_INSTALL_CALENDAR}
@@ -208,6 +210,7 @@ services:
208210
- INSTALL_AMQP=${PHP_WORKER_INSTALL_AMQP}
209211
- INSTALL_GHOSTSCRIPT=${PHP_WORKER_INSTALL_GHOSTSCRIPT}
210212
- INSTALL_SWOOLE=${PHP_WORKER_INSTALL_SWOOLE}
213+
- INSTALL_TAINT=${PHP_WORKER_INSTALL_TAINT}
211214
- INSTALL_FFMPEG=${PHP_WORKER_INSTALL_FFMPEG}
212215
- INSTALL_GMP=${PHP_WORKER_INSTALL_GMP}
213216
- PUID=${PHP_WORKER_PUID}

env-example

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@ WORKSPACE_INSTALL_DUSK_DEPS=false
129129
WORKSPACE_INSTALL_PG_CLIENT=false
130130
WORKSPACE_INSTALL_PHALCON=false
131131
WORKSPACE_INSTALL_SWOOLE=false
132+
WORKSPACE_INSTALL_TAINT=false
132133
WORKSPACE_INSTALL_LIBPNG=false
133134
WORKSPACE_INSTALL_IONCUBE=false
134135
WORKSPACE_INSTALL_MYSQL_CLIENT=false
@@ -170,6 +171,7 @@ PHP_FPM_INSTALL_GHOSTSCRIPT=false
170171
PHP_FPM_INSTALL_LDAP=false
171172
PHP_FPM_INSTALL_PHALCON=false
172173
PHP_FPM_INSTALL_SWOOLE=false
174+
PHP_FPM_INSTALL_TAINT=false
173175
PHP_FPM_INSTALL_PG_CLIENT=false
174176
PHP_FPM_INSTALL_POSTGIS=false
175177
PHP_FPM_INSTALL_PCNTL=false
@@ -196,6 +198,7 @@ PHP_WORKER_INSTALL_MYSQL_CLIENT=false
196198
PHP_WORKER_INSTALL_AMQP=false
197199
PHP_WORKER_INSTALL_GHOSTSCRIPT=false
198200
PHP_WORKER_INSTALL_SWOOLE=false
201+
PHP_WORKER_INSTALL_TAINT=false
199202
PHP_WORKER_INSTALL_FFMPEG=false
200203
PHP_WORKER_INSTALL_GMP=false
201204

php-fpm/Dockerfile

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -223,6 +223,21 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
223223
&& php -m | grep -q 'swoole' \
224224
;fi
225225

226+
###########################################################################
227+
# Taint EXTENSION
228+
###########################################################################
229+
230+
ARG INSTALL_TAINT=false
231+
232+
RUN if [ ${INSTALL_TAINT} = true ]; then \
233+
# Install Php TAINT Extension
234+
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
235+
pecl install taint && \
236+
docker-php-ext-enable taint && \
237+
php -m | grep -q 'taint'; \
238+
fi \
239+
;fi
240+
226241
###########################################################################
227242
# MongoDB:
228243
###########################################################################

php-worker/Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,19 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
135135
&& docker-php-ext-enable swoole \
136136
;fi
137137

138+
###########################################################################
139+
# Taint EXTENSION
140+
###########################################################################
141+
142+
ARG INSTALL_TAINT=false
143+
144+
RUN if [ ${INSTALL_TAINT} = true ]; then \
145+
# Install Php TAINT Extension
146+
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
147+
pecl install taint; \
148+
fi && \
149+
docker-php-ext-enable taint \
150+
;fi
138151

139152
#
140153
#--------------------------------------------------------------------------

workspace/Dockerfile

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -435,6 +435,22 @@ RUN if [ ${INSTALL_SWOOLE} = true ]; then \
435435
&& php -m | grep -q 'swoole' \
436436
;fi
437437

438+
###########################################################################
439+
# Taint EXTENSION
440+
###########################################################################
441+
442+
ARG INSTALL_TAINT=false
443+
444+
RUN if [ "${INSTALL_TAINT}" = true ]; then \
445+
# Install Php TAINT Extension
446+
if [ $(php -r "echo PHP_MAJOR_VERSION;") = "7" ]; then \
447+
pecl install taint && \
448+
echo "extension=taint.so" >> /etc/php/${LARADOCK_PHP_VERSION}/mods-available/taint.ini && \
449+
ln -s /etc/php/${LARADOCK_PHP_VERSION}/mods-available/taint.ini /etc/php/${LARADOCK_PHP_VERSION}/cli/conf.d/20-taint.ini && \
450+
php -m | grep -q 'taint'; \
451+
fi \
452+
;fi
453+
438454
###########################################################################
439455
# Libpng16 EXTENSION
440456
###########################################################################

0 commit comments

Comments
 (0)