Skip to content

Commit f8b7404

Browse files
authored
php ext bz2 (laradock#2500)
* php ext bz2 * fix typo * fix php-fpm bz2 ext * fix horizon bz2 ext
1 parent b2ae5f6 commit f8b7404

6 files changed

Lines changed: 41 additions & 0 deletions

File tree

docker-compose.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ services:
6464
- LARADOCK_PHP_VERSION=${PHP_VERSION}
6565
- LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
6666
- INSTALL_SUBVERSION=${WORKSPACE_INSTALL_SUBVERSION}
67+
- INSTALL_BZ2=${WORKSPACE_INSTALL_BZ2}
6768
- INSTALL_XDEBUG=${WORKSPACE_INSTALL_XDEBUG}
6869
- INSTALL_PCOV=${WORKSPACE_INSTALL_PCOV}
6970
- INSTALL_PHPDBG=${WORKSPACE_INSTALL_PHPDBG}
@@ -167,6 +168,7 @@ services:
167168
- CHANGE_SOURCE=${CHANGE_SOURCE}
168169
- LARADOCK_PHP_VERSION=${PHP_VERSION}
169170
- LARADOCK_PHALCON_VERSION=${PHALCON_VERSION}
171+
- INSTALL_BZ2=${PHP_FPM_INSTALL_BZ2}
170172
- INSTALL_XDEBUG=${PHP_FPM_INSTALL_XDEBUG}
171173
- INSTALL_PCOV=${PHP_FPM_INSTALL_PCOV}
172174
- INSTALL_PHPDBG=${PHP_FPM_INSTALL_PHPDBG}
@@ -250,6 +252,7 @@ services:
250252
- CHANGE_SOURCE=${CHANGE_SOURCE}
251253
- LARADOCK_PHP_VERSION=${PHP_VERSION}
252254
- PHALCON_VERSION=${PHALCON_VERSION}
255+
- INSTALL_BZ2=${PHP_WORKER_INSTALL_BZ2}
253256
- INSTALL_PGSQL=${PHP_WORKER_INSTALL_PGSQL}
254257
- INSTALL_BCMATH=${PHP_WORKER_INSTALL_BCMATH}
255258
- INSTALL_PHALCON=${PHP_WORKER_INSTALL_PHALCON}
@@ -283,6 +286,7 @@ services:
283286
args:
284287
- CHANGE_SOURCE=${CHANGE_SOURCE}
285288
- LARADOCK_PHP_VERSION=${PHP_VERSION}
289+
- INSTALL_BZ2=${LARAVEL_HORIZON_INSTALL_BZ2}
286290
- INSTALL_PGSQL=${PHP_FPM_INSTALL_PGSQL}
287291
- INSTALL_BCMATH=${PHP_FPM_INSTALL_BCMATH}
288292
- INSTALL_MEMCACHED=${PHP_FPM_INSTALL_MEMCACHED}

env-example

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,7 @@ WORKSPACE_INSTALL_NPM_ANGULAR_CLI=false
100100
WORKSPACE_INSTALL_PHPREDIS=true
101101
WORKSPACE_INSTALL_WORKSPACE_SSH=false
102102
WORKSPACE_INSTALL_SUBVERSION=false
103+
WORKSPACE_INSTALL_BZ2=false
103104
WORKSPACE_INSTALL_XDEBUG=false
104105
WORKSPACE_INSTALL_PCOV=false
105106
WORKSPACE_INSTALL_PHPDBG=false
@@ -169,6 +170,7 @@ PHP_FPM_INSTALL_OPCACHE=true
169170
PHP_FPM_INSTALL_IMAGE_OPTIMIZERS=true
170171
PHP_FPM_INSTALL_PHPREDIS=true
171172
PHP_FPM_INSTALL_MEMCACHED=false
173+
PHP_FPM_INSTALL_BZ2=false
172174
PHP_FPM_INSTALL_XDEBUG=false
173175
PHP_FPM_INSTALL_PCOV=false
174176
PHP_FPM_INSTALL_XHPROF=false
@@ -219,6 +221,7 @@ PHP_FPM_PGID=1000
219221

220222
### PHP_WORKER ############################################
221223

224+
PHP_WORKER_INSTALL_BZ2=false
222225
PHP_WORKER_INSTALL_PGSQL=false
223226
PHP_WORKER_INSTALL_BCMATH=false
224227
PHP_WORKER_INSTALL_PHALCON=false
@@ -250,6 +253,7 @@ NGINX_SSL_PATH=./nginx/ssl/
250253

251254
### LARAVEL_HORIZON ################################################
252255

256+
LARAVEL_HORIZON_INSTALL_BZ2=false
253257
LARAVEL_HORIZON_INSTALL_SOCKETS=false
254258
LARAVEL_HORIZON_INSTALL_YAML=false
255259
LARAVEL_HORIZON_INSTALL_PHPREDIS=true

laravel-horizon/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ ENV PGID ${PGID}
4646
RUN addgroup -g ${PGID} laradock && \
4747
adduser -D -G laradock -u ${PUID} laradock
4848

49+
#Install BZ2:
50+
ARG INSTALL_BZ2=false
51+
RUN if [ ${INSTALL_BZ2} = true ]; then \
52+
apk --update add bzip2-dev; \
53+
docker-php-ext-install bz2 \
54+
;fi
55+
4956
#Install BCMath package:
5057
ARG INSTALL_BCMATH=false
5158
RUN if [ ${INSTALL_BCMATH} = true ]; then \

php-fpm/Dockerfile

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,16 @@ RUN set -xe; \
7070
# - INSTALL_SOAP=true
7171
#
7272

73+
###########################################################################
74+
# BZ2:
75+
###########################################################################
76+
77+
ARG INSTALL_BZ2=false
78+
RUN if [ ${INSTALL_BZ2} = true ]; then \
79+
apt-get -y install libbz2-dev; \
80+
docker-php-ext-install bz2 \
81+
;fi
82+
7383
###########################################################################
7484
# SSH2:
7585
###########################################################################

php-worker/Dockerfile

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@ ENV PGID ${PGID}
4646
RUN addgroup -g ${PGID} laradock && \
4747
adduser -D -G laradock -u ${PUID} laradock
4848

49+
#Install BZ2:
50+
ARG INSTALL_BZ2=false
51+
RUN if [ ${INSTALL_BZ2} = true ]; then \
52+
apk --update add bzip2-dev; \
53+
docker-php-ext-install bz2; \
54+
fi
55+
4956
#Install SOAP package:
5057
ARG INSTALL_SOAP=false
5158
RUN if [ ${INSTALL_SOAP} = true ]; then \

workspace/Dockerfile

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,15 @@ RUN if [ ${INSTALL_WP_CLI} = true ]; then \
232232
chmod +x /usr/local/bin/wp \
233233
;fi
234234

235+
###########################################################################
236+
# BZ2:
237+
###########################################################################
238+
239+
ARG INSTALL_BZ2=false
240+
RUN if [ ${INSTALL_BZ2} = true ]; then \
241+
apt-get -y install php${LARADOCK_PHP_VERSION}-bz2 \
242+
;fi
243+
235244
###########################################################################
236245
# SSH2:
237246
###########################################################################

0 commit comments

Comments
 (0)