Skip to content

Commit 0077de2

Browse files
authored
Merge pull request laradock#1345 from jdxia/master
workspace container adds swoole
2 parents d098f1f + c44338e commit 0077de2

5 files changed

Lines changed: 38 additions & 0 deletions

File tree

docker-compose.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@ services:
4242
- INSTALL_TERRAFORM=${WORKSPACE_INSTALL_TERRAFORM}
4343
- INSTALL_DUSK_DEPS=${WORKSPACE_INSTALL_DUSK_DEPS}
4444
- INSTALL_PG_CLIENT=${WORKSPACE_INSTALL_PG_CLIENT}
45+
- INSTALL_SWOOLE=${WORKSPACE_INSTALL_SWOOLE}
4546
- PUID=${WORKSPACE_PUID}
4647
- PGID=${WORKSPACE_PGID}
4748
- CHROME_DRIVER_VERSION=${WORKSPACE_CHROME_DRIVER_VERSION}

env-example

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ WORKSPACE_INSTALL_IMAGEMAGICK=false
8686
WORKSPACE_INSTALL_TERRAFORM=false
8787
WORKSPACE_INSTALL_DUSK_DEPS=false
8888
WORKSPACE_INSTALL_PG_CLIENT=false
89+
WORKSPACE_INSTALL_SWOOLE=false
8990
WORKSPACE_PUID=1000
9091
WORKSPACE_PGID=1000
9192
WORKSPACE_CHROME_DRIVER_VERSION=2.32

workspace/Dockerfile-56

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,18 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
256256
phpenmod redis \
257257
;fi
258258

259+
#####################################
260+
# Swoole EXTENSION FOR PHP 5.6
261+
#####################################
262+
263+
ARG INSTALL_SWOOLE=false
264+
RUN if [ ${INSTALL_SWOOLE} = true ]; then \
265+
# Install Php Swoole Extension
266+
pecl -q install swoole && \
267+
echo "extension=swoole.so" >> /etc/php/5.6/mods-available/swoole.ini && \
268+
ln -s /etc/php/5.6/mods-available/swoole.ini /etc/php/5.6/cli/conf.d/20-swoole.ini \
269+
;fi
270+
259271
#####################################
260272
# Drush:
261273
#####################################

workspace/Dockerfile-70

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -252,6 +252,18 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
252252
phpenmod redis \
253253
;fi
254254

255+
#####################################
256+
# Swoole EXTENSION FOR PHP 7
257+
#####################################
258+
259+
ARG INSTALL_SWOOLE=false
260+
RUN if [ ${INSTALL_SWOOLE} = true ]; then \
261+
# Install Php Swoole Extension
262+
pecl -q install swoole && \
263+
echo "extension=swoole.so" >> /etc/php/7.0/mods-available/swoole.ini && \
264+
ln -s /etc/php/7.0/mods-available/swoole.ini /etc/php/7.0/cli/conf.d/20-swoole.ini \
265+
;fi
266+
255267
#####################################
256268
# Drush:
257269
#####################################

workspace/Dockerfile-71

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,18 @@ RUN if [ ${INSTALL_PHPREDIS} = true ]; then \
248248
phpenmod redis \
249249
;fi
250250

251+
#####################################
252+
# Swoole EXTENSION FOR PHP 7
253+
#####################################
254+
255+
ARG INSTALL_SWOOLE=false
256+
RUN if [ ${INSTALL_SWOOLE} = true ]; then \
257+
# Install Php Swoole Extension
258+
pecl -q install swoole && \
259+
echo "extension=swoole.so" >> /etc/php/7.1/mods-available/swoole.ini && \
260+
ln -s /etc/php/7.1/mods-available/swoole.ini /etc/php/7.1/cli/conf.d/20-swoole.ini \
261+
;fi
262+
251263
#####################################
252264
# Drush:
253265
#####################################

0 commit comments

Comments
 (0)