Skip to content

Commit d564729

Browse files
lanphanbestlong
authored andcommitted
add MYSQL_CLIENT and AMQP for php-worker (laradock#1949)
1 parent b1e3463 commit d564729

3 files changed

Lines changed: 22 additions & 2 deletions

File tree

docker-compose.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,8 @@ services:
191191
- INSTALL_PHALCON=${PHP_WORKER_INSTALL_PHALCON}
192192
- INSTALL_SOAP=${PHP_WORKER_INSTALL_SOAP}
193193
- INSTALL_ZIP_ARCHIVE=${PHP_WORKER_INSTALL_ZIP_ARCHIVE}
194+
- INSTALL_MYSQL_CLIENT=${PHP_WORKER_INSTALL_MYSQL_CLIENT}
195+
- INSTALL_AMQP=${PHP_WORKER_INSTALL_AMQP}
194196
- PUID=${PHP_WORKER_PUID}
195197
- PGID=${PHP_WORKER_PGID}
196198
volumes:

env-example

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,8 @@ PHP_WORKER_INSTALL_BCMATH=false
173173
PHP_WORKER_INSTALL_PHALCON=false
174174
PHP_WORKER_INSTALL_SOAP=false
175175
PHP_WORKER_INSTALL_ZIP_ARCHIVE=false
176+
PHP_WORKER_INSTALL_MYSQL_CLIENT=false
177+
PHP_WORKER_INSTALL_AMQP=false
176178
PHP_WORKER_PUID=1000
177179
PHP_WORKER_PGID=1000
178180

php-worker/Dockerfile

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,8 +63,21 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
6363
docker-php-ext-install zip \
6464
;fi
6565

66-
RUN rm /var/cache/apk/* \
67-
&& mkdir -p /var/www
66+
# Install MySQL Client:
67+
ARG INSTALL_MYSQL_CLIENT=false
68+
RUN if [ ${INSTALL_MYSQL_CLIENT} = true ]; then \
69+
apk --update add mysql-client \
70+
;fi
71+
72+
# Install AMQP:
73+
ARG INSTALL_AMQP=false
74+
75+
RUN if [ ${INSTALL_AMQP} = true ]; then \
76+
apk --update add rabbitmq-c rabbitmq-c-dev && \
77+
pecl install amqp && \
78+
docker-php-ext-enable amqp && \
79+
docker-php-ext-install sockets \
80+
;fi
6881

6982
# Install Phalcon ext
7083
ARG INSTALL_PHALCON=false
@@ -80,6 +93,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
8093
&& rm -rf /tmp/cphalcon* \
8194
;fi
8295

96+
RUN rm /var/cache/apk/* \
97+
&& mkdir -p /var/www
98+
8399
#
84100
#--------------------------------------------------------------------------
85101
# Optional Supervisord Configuration

0 commit comments

Comments
 (0)