Merge pull request #677 from Mvzundert/multiple-projects-improvement

updated env-example and removed .env.example
This commit is contained in:
Mahmoud Zalt 2017-03-15 18:36:49 -04:00 committed by GitHub
commit f61535427c
2 changed files with 67 additions and 234 deletions

View File

@ -1,124 +0,0 @@
### Application
# Point to your application code, wish should be available at `/var/www`
APPLICATIONS_HOST_DIR=../
### PHP version (Does not apply for HHVM)
# PHP_VERSION=55
# PHP_VERSION=56
PHP_VERSION=70
### PHP interpreter
# PHP_INTERPRETER=hhvm
PHP_INTERPRETER=php-fpm
### WORKSPACE Container
WORKSPACE_INSTALL_XDEBUG=false
WORKSPACE_INSTALL_SOAP=false
WORKSPACE_INSTALL_MONGO=false
WORKSPACE_INSTALL_NODE=false
WORKSPACE_INSTALL_YARN=false
WORKSPACE_INSTALL_DRUSH=false
WORKSPACE_INSTALL_AEROSPIKE_EXTENSION=false
WORKSPACE_INSTALL_INSTALL_V8JS_EXTENSION=false
WORKSPACE_COMPOSER_GLOBAL_INSTALL=false
WORKSPACE_INSTALL_WORKSPACE_SSH=false
WORKSPACE_INSTALL_LARAVEL_ENVOY=false
WORKSPACE_INSTALL_DEPLOYER=false
WORKSPACE_INSTALL_LINUXBREW=false
WORKSPACE_PUID=1000
WORKSPACE_PGID=1000
WORKSPACE_NODE_VERSION=stable
WORKSPACE_TIMEZONE=UTC
WORKSPACE_SSH_PORT=2222
### PHP_FPM Container
PHP_FPM_DOCKER_FILE=Dockerfile-70
PHP_FPM_INSTALL_XDEBUG=false
PHP_FPM_INSTALL_MONGO=false
PHP_FPM_INSTALL_SOAP=false
PHP_FPM_INSTALL_ZIP_ARCHIVE=false
PHP_FPM_INSTALL_BCMATH=false
PHP_FPM_INSTALL_PHPREDIS=false
PHP_FPM_INSTALL_MEMCACHED=false
PHP_FPM_INSTALL_OPCACHE=false
PHP_FPM_INSTALL_EXIF=false
PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
PHP_FPM_INSTALL_MYSQLI=false
PHP_FPM_INSTALL_TOKENIZER=false
### NGINX Container
NGINX_HOST_HTTP_PORT=80
NGINX_HOST_HTTPS_PORT=433
NGINX_HOST_LOG_PATH=./logs/nginx/
NGINX_SITES_PATH=./nginx/sites/
### APACHE Container
APACHE_HOST_HTTP_PORT=80
APACHE_HOST_HTTPS_PORT=443
APACHE2_PHP_SOCKET=php-fpm:9000
APACHE_HOST_LOG_PATH=./logs/apache2
PHP_SOCKET=php-fpm:9000
### MYSQL Container
MYSQL_DATABASE=default
MYSQL_USER=default
MYSQL_PASSWORD=secret
MYSQL_PORT=3306
MYSQL_ROOT_PASSWORD=root
### MARIADB Container
MARIADB_DATABASE=default
MARIADB_USER=default
MARIADB_PASSWORD=secret
MARIADB_PORT=3306
### POSTGRES Container
POSTGRES_DB=default
POSTGRES_USER=default
POSTGRES_PASSWORD=secret
POSTGRES_PORT=5432
### RABBITMQ Container
RABBITMQ_NODE_HOST_PORT=5672
RABBITMQ_MANAGEMENT_HTTP_HOST_PORT=15672
RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT=15671
RABBITMQ_DEFAULT_USER=guest
RABBITMQ_DEFAULT_PASS=guest
### ELASTICSEARCH Container
ELASTICSEARCH_HOST_HTTP_PORT=9200
ELASTICSEARCH_HOST_TRANSPORT_PORT=9300
### MEMCACHED Container
MEMCACHED_HOST_PORT=11211
### BEANSTALKD CONSOLE
BEANSTALKD_CONSOLE_BUILD_PATH=./beanstalkd-console
BEANSTALKD_CONSOLE_CONTAINER_NAME=beanstalkd-console
BEANSTALKD_CONSOLE_HOST_PORT=2080
### BEANSTALKD Container
BEANSTALKD_HOST_PORT=11300
### SELENIUM Container
SELENIUM_PORT=4444
### MINIO Container
MINIO_PORT=9000
### PHP MY ADMIN Container
# PMA_DB_ENGINE=mariadb
PMA_DB_ENGINE=mysql
PMA_USER=default
PMA_PASSWORD=secret
PMA_ROOT_PASSWORD=secret
PMA_PORT=88
### MISC
# Replace with your Docker Host IP (will be appended to /etc/hosts)
DOCKER_HOST_IP=10.0.75.1
# The Remote Interpreter entry matching name `laradock`
PHP_IDE_CONFIG=serverName=laradock
### to be continue neo4j mongo rethinkdb redis aerospike pgadmin ...

View File

@ -1,25 +1,17 @@
################## ### Application
# DOCKER COMPOSE # # Point to your application code, wish should be available at `/var/www`
# ################ APPLICATIONS_HOST_DIR=../
DOCKER_HOST_IP=10.0.75.1 ### PHP version (Does not apply for HHVM)
# Switch between PHP and HHVM interpreter
# PHP_INTERPRETER=hhvm
PHP_INTERPRETER=php-fpm
# Switch between supported PHP versions... does not apply for HHVM.
# Please see composer.json in Laravel Framework for the minimum Php Version
# PHP_VERSION=55 # PHP_VERSION=55
# PHP_VERSION=56 # PHP_VERSION=56
PHP_VERSION=70 PHP_VERSION=70
# APPLICATIONS ### PHP interpreter
APPLICATIONS_HOST_DIR=../ # PHP_INTERPRETER=hhvm
APPLICATIONS_IMAGE_NAME=tianon/true PHP_INTERPRETER=php-fpm
APPLICATIONS_CONTAINER_NAME=applications
# WORKSPACE ### WORKSPACE Container
WORKSPACE_INSTALL_XDEBUG=false WORKSPACE_INSTALL_XDEBUG=false
WORKSPACE_INSTALL_SOAP=false WORKSPACE_INSTALL_SOAP=false
WORKSPACE_INSTALL_MONGO=false WORKSPACE_INSTALL_MONGO=false
@ -39,7 +31,7 @@ WORKSPACE_NODE_VERSION=stable
WORKSPACE_TIMEZONE=UTC WORKSPACE_TIMEZONE=UTC
WORKSPACE_SSH_PORT=2222 WORKSPACE_SSH_PORT=2222
# PHP_FPM ### PHP_FPM Container
PHP_FPM_DOCKER_FILE=Dockerfile-70 PHP_FPM_DOCKER_FILE=Dockerfile-70
PHP_FPM_INSTALL_XDEBUG=false PHP_FPM_INSTALL_XDEBUG=false
PHP_FPM_INSTALL_MONGO=false PHP_FPM_INSTALL_MONGO=false
@ -54,114 +46,79 @@ PHP_FPM_INSTALL_AEROSPIKE_EXTENSION=false
PHP_FPM_INSTALL_MYSQLI=false PHP_FPM_INSTALL_MYSQLI=false
PHP_FPM_INSTALL_TOKENIZER=false PHP_FPM_INSTALL_TOKENIZER=false
# NGINX ### NGINX Container
NGINX_HOST_HTTP_PORT=8080 NGINX_HOST_HTTP_PORT=80
NGINX_HOST_HTTPS_PORT=8433 NGINX_HOST_HTTPS_PORT=433
NGINX_HOST_LOG_PATH=./logs/nginx/ NGINX_HOST_LOG_PATH=./logs/nginx/
NGINX_SITES_PATH=./nginx/sites/ NGINX_SITES_PATH=./nginx/sites/
### APACHE Container
APACHE_HOST_HTTP_PORT=80
# APACHE APACHE_HOST_HTTPS_PORT=443
APACHE2_BUILD_PATH=./apache2
APACHE2_CONTAINER_NAME=apache2
APACHE_HOST_HTTP_PORT=7080
APACHE_HOST_HTTPS_PORT=7443
APACHE2_PHP_SOCKET=php-fpm:9000 APACHE2_PHP_SOCKET=php-fpm:9000
APACHE_HOST_LOG_PATH=./logs/apache2 APACHE_HOST_LOG_PATH=./logs/apache2
PHP_SOCKET=php-fpm:9000
# HHVM ### MYSQL Container
HHVM_BUILD_PATH=./hhvm MYSQL_DATABASE=default
HHVM_CONTAINER_NAME=hhvm MYSQL_USER=default
HHVM_HOST_PORT=9000 MYSQL_PASSWORD=secret
MYSQL_PORT=3306
# MYSQL
MYSQL_BUILD_PATH=./mysql
MYSQL_CONTAINER_NAME=mysql
MYSQL_HOST_PORT=3307
MYSQL_ROOT_PASSWORD=root MYSQL_ROOT_PASSWORD=root
# MEMCACHED ### MARIADB Container
MEMCACHED_BUILD_PATH=./memcached MARIADB_DATABASE=default
MEMCACHED_CONTAINER_NAME=memcached MARIADB_USER=default
MARIADB_PASSWORD=secret
MARIADB_PORT=3306
### POSTGRES Container
POSTGRES_DB=default
POSTGRES_USER=default
POSTGRES_PASSWORD=secret
POSTGRES_PORT=5432
### RABBITMQ Container
RABBITMQ_NODE_HOST_PORT=5672
RABBITMQ_MANAGEMENT_HTTP_HOST_PORT=15672
RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT=15671
RABBITMQ_DEFAULT_USER=guest
RABBITMQ_DEFAULT_PASS=guest
### ELASTICSEARCH Container
ELASTICSEARCH_HOST_HTTP_PORT=9200
ELASTICSEARCH_HOST_TRANSPORT_PORT=9300
### MEMCACHED Container
MEMCACHED_HOST_PORT=11211 MEMCACHED_HOST_PORT=11211
# BEANSTALKD ### BEANSTALKD CONSOLE
BEANSTALKD_BUILD_PATH=./beanstalkd
BEANSTALKD_CONTAINER_NAME=beanstalkd
BEANSTALKD_HOST_PORT=11300
# BEANSTALKD CONSOLE
BEANSTALKD_CONSOLE_BUILD_PATH=./beanstalkd-console BEANSTALKD_CONSOLE_BUILD_PATH=./beanstalkd-console
BEANSTALKD_CONSOLE_CONTAINER_NAME=beanstalkd-console BEANSTALKD_CONSOLE_CONTAINER_NAME=beanstalkd-console
BEANSTALKD_CONSOLE_HOST_PORT=2080 BEANSTALKD_CONSOLE_HOST_PORT=2080
# RABBITMQ ### BEANSTALKD Container
RABBITMQ_BUILD_PATH=./rabbitmq BEANSTALKD_HOST_PORT=11300
RABBITMQ_CONTAINER_NAME=rabbitmq
RABBITMQ_NODE_HOST_PORT=5672
RABBITMQ_MANAGEMENT_HTTPS_HOST_PORT=15671
RABBITMQ_MANAGEMENT_HTTP_HOST_PORT=15672
RABBITMQ_DEFAULT_USER=guest
RABBITMQ_DEFAULT_PASS=guest
# ELASTICSEARCH ### SELENIUM Container
ELASTICSEARCH_BUILD_PATH=./elasticsearch/versions/2 SELENIUM_PORT=4444
ELASTICSEARCH_CONTAINER_NAME=elasticsearch
ELASTICSEARCH_HOST_HTTP_PORT=9200
ELASTICSEARCH_HOST_TRANSPORT_PORT=9300
#################### ### MINIO Container
# LARAVEL SPECIFIC # MINIO_PORT=9000
# ##################
# APP ### PHP MY ADMIN Container
APP_ENV=local # PMA_DB_ENGINE=mariadb
APP_KEY=base64:FeZgPe6Pqm7dOCy7Sx0P/PQ9ICMuwAsHLms7DUOxCkI= PMA_DB_ENGINE=mysql
APP_DEBUG=true PMA_USER=default
APP_LOG_LEVEL=debug PMA_PASSWORD=secret
APP_URL=http://localhost PMA_ROOT_PASSWORD=secret
PMA_PORT=88
# DATABASE ### MISC
DB_CONNECTION=mysql # Replace with your Docker Host IP (will be appended to /etc/hosts)
DOCKER_HOST_IP=10.0.75.1
# The Remote Interpreter entry matching name `laradock`
PHP_IDE_CONFIG=serverName=laradock
# Laravel Original: DB_HOST=127.0.0.1 ### to be continue neo4j mongo rethinkdb redis aerospike pgadmin ...
# must match the service name or container name.
# so if we want to use mariadb it must look like:
# DB_HOST=mariadb
DB_HOST=mysql
# IMPORTANT:
# - ports are defined in docker-compose.yml like HOST_PORT:CONTAINER_PORT
# - DB_PORT=3306 represents the CONTAINER_PORT not the HOST_PORT
#
# This means that this should not be changed unless you have also tweaked the database image created by
# docker-compose.yml.
DB_PORT=3306
DB_DATABASE=default
DB_USERNAME=default
DB_PASSWORD=secret
# DRIVERS
BROADCAST_DRIVER=log
CACHE_DRIVER=file
SESSION_DRIVER=file
QUEUE_DRIVER=sync
# REDIS
REDIS_HOST=redis
REDIS_PASSWORD=null
REDIS_PORT=6379
# MAIL
MAIL_DRIVER=smtp
MAIL_HOST=mailtrap.io
MAIL_PORT=2525
MAIL_USERNAME=null
MAIL_PASSWORD=null
MAIL_ENCRYPTION=null
# PUSHER
PUSHER_APP_ID=
PUSHER_KEY=
PUSHER_SECRET=