Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
laradock
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kerwin
laradock
Commits
d5647295
Commit
d5647295
authored
Feb 09, 2019
by
Lan Phan
Committed by
Shao Yu-Lung (Allen)
Feb 09, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
add MYSQL_CLIENT and AMQP for php-worker (#1949)
parent
b1e34638
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
22 additions
and
2 deletions
+22
-2
docker-compose.yml
docker-compose.yml
+2
-0
env-example
env-example
+2
-0
Dockerfile
php-worker/Dockerfile
+18
-2
No files found.
docker-compose.yml
View file @
d5647295
...
...
@@ -191,6 +191,8 @@ services:
-
INSTALL_PHALCON=${PHP_WORKER_INSTALL_PHALCON}
-
INSTALL_SOAP=${PHP_WORKER_INSTALL_SOAP}
-
INSTALL_ZIP_ARCHIVE=${PHP_WORKER_INSTALL_ZIP_ARCHIVE}
-
INSTALL_MYSQL_CLIENT=${PHP_WORKER_INSTALL_MYSQL_CLIENT}
-
INSTALL_AMQP=${PHP_WORKER_INSTALL_AMQP}
-
PUID=${PHP_WORKER_PUID}
-
PGID=${PHP_WORKER_PGID}
volumes
:
...
...
env-example
View file @
d5647295
...
...
@@ -173,6 +173,8 @@ PHP_WORKER_INSTALL_BCMATH=false
PHP_WORKER_INSTALL_PHALCON=false
PHP_WORKER_INSTALL_SOAP=false
PHP_WORKER_INSTALL_ZIP_ARCHIVE=false
PHP_WORKER_INSTALL_MYSQL_CLIENT=false
PHP_WORKER_INSTALL_AMQP=false
PHP_WORKER_PUID=1000
PHP_WORKER_PGID=1000
...
...
php-worker/Dockerfile
View file @
d5647295
...
...
@@ -63,8 +63,21 @@ RUN if [ ${INSTALL_ZIP_ARCHIVE} = true ]; then \
docker-php-ext-install zip \
;fi
RUN
rm
/var/cache/apk/
*
\
&&
mkdir
-p
/var/www
# Install MySQL Client:
ARG
INSTALL_MYSQL_CLIENT=false
RUN if
[
${
INSTALL_MYSQL_CLIENT
}
=
true
]
;
then
\
apk
--update
add mysql-client
\
;
fi
# Install AMQP:
ARG
INSTALL_AMQP=false
RUN if
[
${
INSTALL_AMQP
}
=
true
]
;
then
\
apk
--update
add rabbitmq-c rabbitmq-c-dev
&&
\
pecl
install
amqp
&&
\
docker-php-ext-enable amqp
&&
\
docker-php-ext-install sockets
\
;
fi
# Install Phalcon ext
ARG
INSTALL_PHALCON=false
...
...
@@ -80,6 +93,9 @@ RUN if [ $INSTALL_PHALCON = true ]; then \
&&
rm
-rf
/tmp/cphalcon
*
\
;
fi
RUN
rm
/var/cache/apk/
*
\
&&
mkdir
-p
/var/www
#
#--------------------------------------------------------------------------
# Optional Supervisord Configuration
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment