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
2deb9bf1
Commit
2deb9bf1
authored
Feb 22, 2019
by
Yu Li
Committed by
Shao Yu-Lung (Allen)
Feb 22, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
php-fpm install mysql-client (#2005)
parent
b0edaf93
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
9 deletions
+24
-9
docker-compose.yml
docker-compose.yml
+10
-9
env-example
env-example
+1
-0
Dockerfile
php-fpm/Dockerfile
+13
-0
No files found.
docker-compose.yml
View file @
2deb9bf1
...
...
@@ -161,6 +161,7 @@ services:
-
INSTALL_APCU=${PHP_FPM_INSTALL_APCU}
-
INSTALL_YAML=${PHP_FPM_INSTALL_YAML}
-
INSTALL_ADDITIONAL_LOCALES=${PHP_FPM_INSTALL_ADDITIONAL_LOCALES}
-
INSTALL_MYSQL_CLIENT=${PHP_FPM_INSTALL_MYSQL_CLIENT}
-
ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
volumes
:
-
./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
...
...
@@ -942,16 +943,16 @@ services:
context
:
./gitlab
environment
:
GITLAB_OMNIBUS_CONFIG
:
|
external_url '${GITLAB_DOMAIN_NAME}'
redis['enable'] = false
nginx['listen_https'] = false
nginx['listen_port'] = 80
external_url '${GITLAB_DOMAIN_NAME}'
redis['enable'] = false
nginx['listen_https'] = false
nginx['listen_port'] = 80
nginx['custom_gitlab_server_config'] = "set_real_ip_from 172.0.0.0/8;\nreal_ip_header X-Real-IP;\nreal_ip_recursive on;"
postgresql['enable'] = false
gitlab_rails['trusted_proxies'] = ['caddy','nginx','apache2']
gitlab_rails['redis_host'] = 'redis'
postgresql['enable'] = false
gitlab_rails['trusted_proxies'] = ['caddy','nginx','apache2']
gitlab_rails['redis_host'] = 'redis'
gitlab_rails['redis_database'] = 8
gitlab_rails['db_host'] = '${GITLAB_POSTGRES_HOST}'
gitlab_rails['db_host'] = '${GITLAB_POSTGRES_HOST}'
gitlab_rails['db_username'] = '${GITLAB_POSTGRES_USER}'
gitlab_rails['db_password'] = '${GITLAB_POSTGRES_PASSWORD}'
gitlab_rails['db_database'] = '${GITLAB_POSTGRES_DB}'
...
...
@@ -981,7 +982,7 @@ services:
volumes
:
-
${DATA_PATH_HOST}/gitlab/runner:/etc/gitlab-runner
-
/var/run/docker.sock:/var/run/docker.sock:rw
### JupyterHub #########################################
jupyterhub
:
build
:
...
...
env-example
View file @
2deb9bf1
...
...
@@ -172,6 +172,7 @@ PHP_FPM_FAKETIME=-0
PHP_FPM_INSTALL_APCU=false
PHP_FPM_INSTALL_YAML=false
PHP_FPM_INSTALL_ADDITIONAL_LOCALES=false
PHP_FPM_INSTALL_MYSQL_CLIENT=false
PHP_FPM_ADDITIONAL_LOCALES="es_ES.UTF-8 fr_FR.UTF-8"
### PHP_WORKER ############################################
...
...
php-fpm/Dockerfile
View file @
2deb9bf1
...
...
@@ -606,6 +606,19 @@ RUN if [ ${INSTALL_ADDITIONAL_LOCALES} = true ]; then \
&& locale-gen
\
;fi
###########################################################################
# MySQL Client:
###########################################################################
USER
root
ARG
INSTALL_MYSQL_CLIENT=false
RUN if
[
${
INSTALL_MYSQL_CLIENT
}
=
true
]
;
then
\
apt-get update
-yqq
&&
\
apt-get
-y
install
mysql-client
\
;
fi
###########################################################################
# Check PHP version:
###########################################################################
...
...
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