ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

php-fpm install mysql-client (#2005)

This commit is contained in:
Yu Li 2019-02-22 18:30:05 +08:00 committed by Shao Yu-Lung (Allen)
parent b0edaf93a1
commit 2deb9bf1cb
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docker-compose.yml
View File

@ -161,6 +161,7 @@ services:
- INSTALL_APCU=${PHP_FPM_INSTALL_APCU} - INSTALL_APCU=${PHP_FPM_INSTALL_APCU}
- INSTALL_YAML=${PHP_FPM_INSTALL_YAML} - INSTALL_YAML=${PHP_FPM_INSTALL_YAML}
- INSTALL_ADDITIONAL_LOCALES=${PHP_FPM_INSTALL_ADDITIONAL_LOCALES} - INSTALL_ADDITIONAL_LOCALES=${PHP_FPM_INSTALL_ADDITIONAL_LOCALES}
- INSTALL_MYSQL_CLIENT=${PHP_FPM_INSTALL_MYSQL_CLIENT}
- ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES} - ADDITIONAL_LOCALES=${PHP_FPM_ADDITIONAL_LOCALES}
volumes: volumes:
- ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini - ./php-fpm/php${PHP_VERSION}.ini:/usr/local/etc/php/php.ini
@ -942,16 +943,16 @@ services:
context: ./gitlab context: ./gitlab
environment: environment:
GITLAB_OMNIBUS_CONFIG: | GITLAB_OMNIBUS_CONFIG: |
external_url '${GITLAB_DOMAIN_NAME}' external_url '${GITLAB_DOMAIN_NAME}'
redis['enable'] = false redis['enable'] = false
nginx['listen_https'] = false nginx['listen_https'] = false
nginx['listen_port'] = 80 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;" 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 postgresql['enable'] = false
gitlab_rails['trusted_proxies'] = ['caddy','nginx','apache2'] gitlab_rails['trusted_proxies'] = ['caddy','nginx','apache2']
gitlab_rails['redis_host'] = 'redis' gitlab_rails['redis_host'] = 'redis'
gitlab_rails['redis_database'] = 8 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_username'] = '${GITLAB_POSTGRES_USER}'
gitlab_rails['db_password'] = '${GITLAB_POSTGRES_PASSWORD}' gitlab_rails['db_password'] = '${GITLAB_POSTGRES_PASSWORD}'
gitlab_rails['db_database'] = '${GITLAB_POSTGRES_DB}' gitlab_rails['db_database'] = '${GITLAB_POSTGRES_DB}'
@ -981,7 +982,7 @@ services:
volumes: volumes:
- ${DATA_PATH_HOST}/gitlab/runner:/etc/gitlab-runner - ${DATA_PATH_HOST}/gitlab/runner:/etc/gitlab-runner
- /var/run/docker.sock:/var/run/docker.sock:rw - /var/run/docker.sock:/var/run/docker.sock:rw
### JupyterHub ######################################### ### JupyterHub #########################################
jupyterhub: jupyterhub:
build: build:

1
env-example
View File

@ -172,6 +172,7 @@ PHP_FPM_FAKETIME=-0
PHP_FPM_INSTALL_APCU=false PHP_FPM_INSTALL_APCU=false
PHP_FPM_INSTALL_YAML=false PHP_FPM_INSTALL_YAML=false
PHP_FPM_INSTALL_ADDITIONAL_LOCALES=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_FPM_ADDITIONAL_LOCALES="es_ES.UTF-8 fr_FR.UTF-8"
### PHP_WORKER ############################################ ### PHP_WORKER ############################################

13
php-fpm/Dockerfile
View File

@ -606,6 +606,19 @@ RUN if [ ${INSTALL_ADDITIONAL_LOCALES} = true ]; then \
&& locale-gen \ && locale-gen \
;fi ;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: # Check PHP version:
########################################################################### ###########################################################################