Commit Graph

448 Commits

Author SHA1 Message Date
Shao Yu Lung 6ff7f4a402 percona service use DATA_SAVE_PATH env var, same way mysql, mariadb. 2017-05-13 22:04:35 +08:00
Shao Yu Lung 20fddc6de7 fix percona service create multiple db solution user can’t see other db problem. 2017-05-13 21:37:25 +08:00
Winfried 1eaac78fdd Merge pull request #936 from bestlong/fix-mariadb-create-multiple-db-user-cant-see
Fixing MariaDB service create multiple db solution
2017-05-13 13:45:40 +02:00
Shao Yu Lung 855241d966 fix mariadb service create multiple db solution user can’t see other db problem. 2017-05-13 11:00:36 +08:00
Mahmoud Zalt be9f7f8346 Merge pull request #935 from xpert13/patch-1
Fix #934. Add extra_hosts to php-worker container
2017-05-13 05:48:25 +03:00
Alex 41574fe026 Fix #934. Add extra_hosts to php-worker container 2017-05-12 17:17:38 +03:00
Shao Yu Lung 848398d443 php-fpm service LDAP support 2017-05-12 19:23:03 +08:00
Sascha Brendel a2058ca6f6 Merge branch 'master' into adding-env-aerospike-rethinkdb-mongodb 2017-05-09 14:07:15 +02:00
Sascha Brendel 546ef0ade6
Added ENV support for aerospike, rethinkdb and mongodb. Part of #763. 2017-05-09 01:31:00 +02:00
Sascha Brendel 4661f1ab0e
Improved caddy support to latest ENV-config. 2017-05-09 00:55:15 +02:00
Shao Yu Lung 533c8fc7f7 mysql create multiple database. 2017-05-08 22:26:10 +08:00
Winfried 07651842b6 Merge pull request #912 from zeroc0d3/master
Add network setup in Jenkins container
2017-05-08 02:36:07 +02:00
ZeroC0D3 Team 3796f9f70a Add network setup in Jenkins container 2017-05-08 06:20:43 +07:00
Winfried 4cf5f3eabf Removing suffix for Aerospike and V8JS 2017-05-07 16:54:55 +02:00
Mark Hilton e0d5fb03ed Added support for MS SQL server driver for PHP 7.0 - requested changes:
- removed cd / && \
- added INSTALL_MSSQL to docker-compose.yml and env-example
2017-05-03 13:01:03 -04:00
Winfried ef6071bff0 Fixing typo in the workspace V8 args 2017-04-23 21:16:58 +02:00
Shao Yu Lung d0effd9468 Fixing Unable to connect to postgresql server 2017-04-21 10:13:53 +12:00
Diego Antunes 5aab3add44 Added blackfire.io 2017-04-21 10:02:54 +12:00
Yu-Lung Shao (Allen) c67fa5b258 Fixing could not resolve host: elasticsearch (#823) 2017-04-18 12:23:44 +08:00
Diego Antunes a91bd19739 Merge branch 'master' of https://github.com/laradock/laradock 2017-04-18 10:27:37 +12:00
Diego Antunes ba32dedbef Added Percona container as an alternative to mysql mariadb 2017-04-18 10:19:09 +12:00
Shao Yu Lung 5f3e0a9109 Fixing Adminer can’t login 2017-04-17 13:40:30 +08:00
wxb f14b3b32cf add php.ini file 2017-04-16 19:33:27 +08:00
wxb 3a8bd8a015 add data save path(mysql/redis/memcached..) 2017-04-16 19:08:03 +08:00
Mahmoud Zalt efc23a693d add missing workspace tools to the docs 2017-04-14 21:02:04 -04:00
Mahmoud Zalt c78eb5228a Merge pull request #803 from activeobjects/master
Added support for jenkins official container
2017-04-13 11:48:57 -04:00
Steve Walker 81053c0868 Added support for jenkins official container 2017-04-12 15:54:42 +00:00
Winfried f91def64d7 Fixing whitespaces and tailing spaces 2017-04-11 21:22:57 +02:00
Mahmoud Zalt ddabb4620e Merge pull request #784 from winfried-van-loon/645-php-fpm-ghostscript
Fixing ghostscript env option
2017-04-11 13:24:29 -04:00
Mahmoud Zalt b86211d2d8 Merge pull request #781 from winfried-van-loon/764-780-php-fpm-mysql
Merging removed MySQL ext into MySQLi setting
2017-04-11 13:23:45 -04:00
Winfried ef38dd1532 Fixing ghostscript env option 2017-04-11 16:45:20 +02:00
Winfried 80a60d58cf Merging removed MySQL ext into MySQLi setting 2017-04-11 13:22:07 +02:00
Yu-Lung Shao (Allen) 15cac480fe Fixing can't login to PHPMyAdmin
fix #754, login to PHPMyAdmin get "#2005 - Unknown MySQL server host 'mysql' (-2)" error.
2017-04-10 09:50:53 +08:00
Mike Erickson 0d4bacecd8 bugfix/769 fix linuxbrew, deployer configuration 2017-04-09 11:42:44 -07:00
Mahmoud Zalt 5b60b7ffb8 Merge pull request #760 from bestlong/patch-1
fix php-fpm PHP56 can't enabled MySQL Support
2017-04-07 11:27:39 -04:00
Yu-Lung Shao (Allen) d376074936 fix #759, php-fpm can't enabled MySQL Support
lost passthru parameter
2017-04-07 15:14:15 +08:00
James Whiteman 64b985f005 Update docker-compose.yml 2017-04-07 14:27:15 +12:00
James Whiteman cc50339bcb Update docker-compose.yml 2017-04-07 14:25:40 +12:00
James Whiteman 68ff573904 Update docker-compose.yml
Added Install_symfony
2017-04-07 10:20:19 +12:00
Michael Chen 7230b11d3b Fixing specified Dockerfile name (#745) 2017-04-05 13:45:29 +08:00
Mahmoud Zalt adfb468913 Merge pull request #741 from winfried-van-loon/714-workspace-php-version
Updating env to switch workspace php version
2017-04-04 20:46:14 -04:00
Winfried f99eff3a99 Updating env to switch workspace php version. #714 2017-04-04 23:39:03 +02:00
Winfried ff4b913396 Simplifying PHP_FPM version. #724 2017-04-04 23:14:04 +02:00
Winfried 37dee56bb7 Fixing MariaDB root password variable. #736 2017-04-04 00:05:44 +02:00
ZeroC0D3 Team b58f859eff Merge branch 'master' into proxy 2017-03-31 16:42:30 +07:00
Patrick Artounian a11206d4ba Change adminer expose port to 8080
Most webservers default to 80, but Adminer's docker container runs on 8080.
2017-03-30 18:19:06 -07:00
Patrick Artounian 3d2eb81cd5 Add necessary Adminer config below PMA sections 2017-03-29 22:13:33 -07:00
ZeroC0D3 Team fc460f9497 Remove duplicate mssql & remove network setup for balancer 2017-03-29 13:59:53 +07:00
ZeroC0D3 Team 1fd55d98e1 Changing map network in docker-compose file 2017-03-26 16:31:18 +07:00
ZeroC0D3 Team e1036185ae Fixing from #708 (#715)
* Fixing workspace_yarn_version

* Remove duplicate type MAINTAINER

* Update README.md
2017-03-26 10:47:03 +08:00
ZeroC0D3 Team d1af24736b Merge branch 'master' into proxy 2017-03-25 21:40:37 -04:00
ZeroC0D3 Team 236665d7d3 Change haproxy port to 8085 2017-03-26 08:13:14 +07:00
ZeroC0D3 Team c340d851d3 Add mssql volumes 2017-03-26 07:30:59 +07:00
ZeroC0D3 Team bf19ecffcb Fixing conflict & add mssql 2017-03-26 07:20:24 +07:00
Mahmoud Zalt 6fa6d02360 Merge pull request #712 from cabrerabywaters/MSSQL_DATABASE_SUPPORT
adding MsSQL DATABASE support
2017-03-25 16:55:34 -04:00
Ignacio Cabrera 2e86243d88 Update docker-compose.yml 2017-03-24 13:49:38 -03:00
Ignacio Cabrera 6b61c7d454 adding MSSQL support 2017-03-24 12:31:38 -03:00
Thor Erik Lie 894cb6ea27 🐛 fix yarn again after #662 reverted it
#706
2017-03-23 11:51:59 +01:00
ZeroC0D3 Team b81e3e8f15 Fixing workspace_yarn_version 2017-03-23 16:32:11 +07:00
ZeroC0D3 Team 7d49f9b820 Fixing workspace_yarn_version 2017-03-23 16:07:59 +07:00
ZeroC0D3 Team 9dad1586af Fixing identitation for docker-compose haproxy 2017-03-23 15:01:32 +07:00
ZeroC0D3 Team 5d74e10b08 Update docker compose file for load balancer 2017-03-23 13:53:52 +07:00
ZeroC0D3 Team d31ccbd268 Conflict resolved docker-compose file 2017-03-18 08:29:14 +07:00
ZeroC0D3 Team 2bbe39cf4a Merge branch 'master' into master 2017-03-18 07:52:45 +07:00
Mahmoud Zalt 53f1032975 Merge pull request #673 from cabrerabywaters/PHP_WORKER
Php worker
2017-03-17 11:05:53 -04:00
g9308370 badad156e1 Merge branch 'master' into add_apache_vhost_conf 2017-03-17 16:37:59 +08:00
ZeroC0D3 Team 2219177eac Merge branch 'master' into master 2017-03-17 14:54:06 +07:00
ZeroC0D3 Team 8de9eca8ae Fixing the docker-compose.yml 2017-03-17 13:57:54 +07:00
Ignacio Cabrera f2805bca52 Update docker-compose.yml 2017-03-16 22:21:26 -03:00
Ignacio Cabrera 033e1b8721 Merge branch 'master' into PHP_WORKER 2017-03-16 21:59:28 -03:00
Mahmoud Zalt 9e290ffddb Merge pull request #680 from cjmaxik/feature-intl
Adding intl support to php-fpm container
2017-03-16 20:57:47 -04:00
Mahmoud Zalt 6ada2f1b91 nginx samples sites for multiple projects
- add `project-1.conf` and `project-1.conf` to match the docs.
- keep default to work with both multiple and single projects.
- delete the .gitignore.
- update docker-compose and example-env file to match the new settings
- update the docs
- delete `laravel-https.conf` to replace it with documentation instead
2017-03-16 20:53:14 -04:00
Max Mekenya 4e443cec09 Merge branch 'master' into feature-intl 2017-03-17 10:08:21 +10:00
Ignacio Cabrera 528b60eb17 fixing Volumes and Workdir 2017-03-16 21:03:04 -03:00
Mahmoud Zalt e0e4616ae0 update installation steps in the docs (.env) 2017-03-16 17:03:05 -04:00
Mahmoud Zalt c00fe5d7e0 Merge branch 'multiple-projects-improvement'
* multiple-projects-improvement:
  updated env-example and removed .env.example
  complete missings
  Seperated mysqli and tokenizer as seperate options without putting them under code igniter
  Apache should just go to /var/www not /var/www/public when supporting multiple projects
  fixed example and docker-compose.yml
  Fixed php-fpm variables and example
  Split up mysqli and tokenizer
  Removed homestead entirely this time
  Removed homestead entirely this time
  Removed Homestead reference in all DB containers
  Removed reference to homestead
  Fixed timezone issue in docker-compose.yml
  Added NGINX from env file and updated env-example
  Updated PHP-FPM container to accept .env variables
  Added workspace from env file and updated env-example
  Removed .env file
  Added env-example and adjusted docker-compose yml to support new env file
  Updated gitignore
2017-03-16 16:10:28 -04:00
Mahmoud Zalt dcec8a46a8 replace the links with depends_on in the docker-compose file
closes #636
2017-03-16 15:11:04 -04:00
Mahmoud Zalt 1d6583e97e Revert "Add apache conf file for specific virtualhost ServerName" 2017-03-16 14:40:45 -04:00
Mahmoud Zalt 1cf5bcde62 Merge pull request #682 from MauricioTRS/master
Elasticsearch - Fix plugins directory
2017-03-16 13:35:24 -04:00
Mahmoud Zalt db40c67f75 Merge pull request #639 from tiknil/master
Add apache conf file for specific virtualhost ServerName
2017-03-16 13:30:14 -04:00
Mahmoud Zalt a42a295951 Merge pull request #485 from AliveCorpse/feature/workspace_with_php_7.1
Add dokerfile with php 7.1
2017-03-16 13:26:36 -04:00
Mahmoud Zalt 73a3745cc3 Merge pull request #370 from philtrep/certbot
Certbot container
2017-03-16 13:25:15 -04:00
MauricioTRS bed0fd9bdb Elasticsearch - Fix plugins directory 2017-03-16 14:24:56 -03:00
Mahmoud Zalt 3f1d4b70a6 Merge pull request #650 from wayanjimmy/feature/mailhog
Add mailhog for mail debugging
2017-03-16 13:23:28 -04:00
Max Mekenya c62ce7d36f Update docker-compose.yml 2017-03-16 09:59:52 +10:00
Ignacio Cabrera cbd3cf7c20 Adding php-worker container to docker-compose 2017-03-14 11:06:45 -03:00
Ignacio Cabrera fd0cbff16c Adding ARG to docker-compose 2017-03-14 10:58:35 -03:00
Mahmoud Zalt ab1d5bae95 complete missings 2017-03-13 21:03:31 -04:00
ZeroC0D3 Team c88e690bb4 Merge branch 'master' into master 2017-03-10 08:09:07 +07:00
ZeroC0D3 Team c1de398acc Change default phpmyadmin environment for mysql 2017-03-10 07:53:33 +07:00
ZeroC0D3 Team 73f7c88122 Fixing environment in docker-compose file 2017-03-09 19:21:36 +07:00
Marius van Zundert 36fcc6674e Seperated mysqli and tokenizer as seperate options without putting them under code igniter 2017-03-09 09:29:07 +01:00
hchs 37ed904f1a add vhost example 2017-03-09 10:26:47 +08:00
Marius van Zundert 7a343f168f Updated with laradock master 2017-03-08 16:08:42 +01:00
alchimik 178d7e1505 fix selenium (#655)
see https://github.com/SeleniumHQ/docker-selenium#running-the-images
2017-03-07 23:57:18 -05:00
Marius van Zundert 1d918a71d8 fixed example and docker-compose.yml 2017-03-06 22:20:31 +01:00
Marius van Zundert 603010cbd5 Split up mysqli and tokenizer 2017-03-06 09:03:12 +01:00
Thor Erik Lie a7503ce3f3 Add Minio container
Minio is an s3 compatible server written in go.
2017-03-05 15:06:22 +01:00
Wayan Jimmy 48710f19c3 Sync with master 2017-03-04 02:10:34 +08:00
Wayan Jimmy 0983cc98fe Setup mailhog 2017-03-04 02:07:29 +08:00
Riccardo Tribbia 6be81f05c2 - Aggiunto servizio php-worker per avviamento queue 2017-03-02 12:14:38 +01:00
Riccardo Tribbia 8317fbde5c - Eliminato .env dal repo git per poterlo linkare nel progetto locale
- Impostata configurazione dinamica porte per apache
2017-03-01 15:55:33 +01:00
Marius van Zundert b45f395996 Removed homestead entirely this time 2017-03-01 08:29:17 +01:00
Marius van Zundert 59dfacee13 Removed homestead entirely this time 2017-03-01 08:17:34 +01:00
Marius van Zundert a6e0338245 Removed Homestead reference in all DB containers 2017-03-01 08:08:20 +01:00
Marius van Zundert f610aa63d1 Removed reference to homestead 2017-02-27 15:58:38 +01:00
Marius van Zundert 966a84fa39 Fixed timezone issue in docker-compose.yml 2017-02-27 14:49:43 +01:00
Marius van Zundert 356dc36fd5 Added NGINX from env file and updated env-example 2017-02-27 14:11:16 +01:00
Marius van Zundert c112fdffc1 Updated PHP-FPM container to accept .env variables 2017-02-27 14:05:47 +01:00
Marius van Zundert fa9ac1e471 Added workspace from env file and updated env-example 2017-02-27 13:53:40 +01:00
Marius van Zundert 474504f1d3 Added env-example and adjusted docker-compose yml to support new env file 2017-02-27 12:35:28 +01:00
Francis Lavoie 770a9779ca Fix Caddy volumes to persist SSL (#613)
I'm blaming commit 380eef5fd9 for breaking this functionality.
2017-02-21 23:26:56 +08:00
Austin Benesh cf34c4ed32 Fixed SOAP for both php-fpm and CLI 2017-02-07 15:21:30 -07:00
Talip Durmuş c5e2e7e1e2 Add deployer support (#579)
* add deployer option

* export path for all composer global installations

* add deployer option

* fix typo

* add readme for deployer installation

* deployer default option changed to false

* Add missing deployer menu
2017-01-31 17:05:42 +08:00
Talip Durmuş 5d2761bc92 Add missing PhpRedis option (#570) 2017-01-26 22:19:13 +08:00
choirudin a94f08920a add php exif (#564)
* add php exif

* format
2017-01-22 12:20:27 +08:00
Mike Erickson a80ef301a9 541-add-linuxbrew-option (#543)
* 541-add-linuxbrew-option

* 541 updated readme with installation information
2017-01-13 14:12:44 -05:00
hexu 14f6dffe99 Fix bug on mariadb
Bug on Docker for Mac when we change the database from mysql to mariadb.

Maybe It is not a perfect fix. This fix will not share the same mysql volume, means we could not change database directly. We have to import the database to both database. But it will fix the Bug . Wish for better solution
2017-01-12 18:47:11 +08:00
Edmund Luong 2fc3919598 Added service container for Selenium standalone with Chrome (#519)
* Added service container for Selenium standalone with Chrome
2017-01-01 10:22:01 -05:00
Cristian Mello 1ce802f2cc Update docker-compose.yml 2016-12-26 12:38:50 -02:00
Cristian Mello 33e8e91e49 Add Laravel Envoy (#510)
Add laravel envoy
2016-12-25 12:38:25 -05:00
Mahmoud Zalt b10108a9b5 disable installing the bcmath by default
disable installing the PHP bcmath extension by default on the php-fpm container
2016-12-21 14:20:40 -05:00
Mahmoud Zalt 860af556e2 Support bcmath php extention on php-fpm and workspace (base image 1.3)
Probably closes #453
2016-12-21 14:01:51 -05:00
Juan Eugenio Abadie d76f9e7722 Typo
elasticsearch-pkugins ->  elasticsearch-plugins
2016-12-21 10:16:32 -03:00
Bo-Yi Wu e9d3a838f1 Merge pull request #491 from laradock/bug
fix #490 duplication of key "volumes"
2016-12-16 17:23:01 +08:00
Bo-Yi Wu 380eef5fd9 fix #490 duplication of key "volumes"
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-12-16 17:21:45 +08:00
Bo-Yi Wu b8142222e5 Support specific version of yarn.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-12-16 09:36:08 +08:00
Austin Benesh da6b950623 Added SOAP option to php-fpm install. 2016-12-15 12:13:27 -07:00
Vladimir Kireyko aabe504c24 Add dokerfile with php 7.1 2016-12-15 15:13:00 +02:00
Edmund Luong 8bacb129c6 Add option to install Google V8 Javascript Engine PHP extension 2016-12-13 20:00:48 -05:00
Philippe Trépanier a3288462a8 Merge pull request #434 from dlnsk/Fixes
Fixes for nginx and mysql
2016-11-25 01:51:25 -05:00
philtrep 4ef5db3713 Added proper creation of mysql user, removal of default homestead user 2016-11-17 16:37:51 -05:00
Dmitry Pupinin d703c82c46 Exclude sites configuration from image and just use volume 2016-11-16 15:58:42 +07:00
philtrep d89a944e22 Added nginx config for certbot 2016-11-14 11:29:44 -05:00
philtrep 4030cc2f26 Added certbot container 2016-11-14 11:27:37 -05:00
Bo-Yi Wu 7e2814168a fixed #420 remove phpmyadmin volume setting. 2016-11-14 23:45:52 +08:00
Bo-Yi Wu 5d98e78dba Revert #418 and fix install yarn package management.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-11-10 10:23:49 +08:00
Mahmoud Zalt c5d1116333 Merge pull request #418 from moxar/yarn
Fix a bug that prevents yarn from installing #415
2016-11-09 15:17:42 -05:00
Alexandre Thomas 5594c53e03 Fix bug in PATH 2016-11-09 17:55:35 +01:00
Alexandre Thomas 44045f85e6 Fix a bug that prevents yarn from installing 2016-11-09 16:14:49 +01:00
João Joyce a42f62c626 Postgis 2016-11-08 13:17:23 +00:00
darthrevan13 3d54d68aa1 Fix for mariadb local path
When running docker-compose with mariadb the following message will appear:

ERROR: for mariadb  Cannot create container for service mariadb: Invalid volume spec "mariadb": Invalid volume destination path: 'mariadb' mount path must be absolute.
ERROR: Encountered errors while bringing up the project.

This commit fixes the issue.
2016-11-03 15:45:59 +02:00
Mahmoud Zalt 146f8ea6f4 rename volumes_source to applications 2016-11-01 10:05:10 -04:00
Mahmoud Zalt 9ab6d8fa15 remove volumes container 2016-11-01 10:03:47 -04:00
Mahmoud Zalt f630970151 remove `./databases:/docker-entrypoint-initdb.d` until it works 2016-10-31 20:46:02 -04:00
Mahmoud Zalt 739cc31f4c change app mapping directory from www/laravel to www
also add sample to show facilitate setup for multiple sites
2016-10-31 19:49:48 -04:00
Mahmoud Zalt 6ee790c26d Add support for Codeigniter 2016-10-31 12:21:01 -04:00
Mahmoud Zalt a1ade52cd6 Merge pull request #369 from LaraDock/patch
fixed #363 PHP_IDE_CONFIG variable.
2016-10-31 08:08:48 -04:00
Bo-Yi Wu a0981aa836 Add install elasticsearch plugin section.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-26 09:40:53 +08:00
Dilone 6eed8199df update port to 2222 - no conflict linux 2016-10-24 03:58:03 -04:00
calebfavor 891911ddc3 Removing double quotes for apache php fpm configuration. 2016-10-17 14:17:23 -07:00
Bo-Yi Wu 89a21ccf1b fixed #363 PHP_IDE_CONFIG variable.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-15 08:50:17 +08:00
Bo-Yi Wu 62e0f0443c Support Yarn MANAGEMENT tool.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-10-13 12:06:30 +08:00
philtrep fb26035e5c Added timezone arguments to workspace build 2016-10-10 09:44:25 -04:00
Mahmoud Zalt 781f5ff972 add missing info to the readme 2016-10-10 07:32:01 -04:00
Mahmoud Zalt 7ecb712e76 Revert ports fowarding for MySQL and MariaDB
Include production docker compose file
2016-10-09 16:51:18 -04:00
philtrep ec3ebb9701 Remove port fowarding for MySQL and MariaDB 2016-10-03 13:25:34 -04:00
Francis Lavoie 16b6223ba9 Fixes #305 2016-09-13 21:40:03 -04:00
Bo-Yi Wu b254d4a9c9 add mysql custom configuration file.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-11 08:39:25 +08:00
Lialosiu da6face95e add build options MAX_ALLOWED_PACKET to mysql 2016-09-09 10:21:33 +08:00
Bo-Yi Wu 8c392e94f2 Support ElasticSearch Container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-07 15:18:54 +08:00
Mahmoud Zalt a9ecdd0008 Merge pull request #284 from appleboy/patch-1
Update postgres share volume path
2016-09-04 05:26:40 -04:00
Mahmoud Zalt 1dab0c48d8 Merge pull request #283 from appleboy/patch-10
Add pgAdmin container
2016-09-04 05:26:10 -04:00
Bo-Yi Wu 4013553dbb Update postgres share volume path 2016-09-04 09:04:18 +08:00
Bo-Yi Wu 7999399e9a Add pgAdmin container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-09-03 21:24:36 +08:00
larryeitel d684cb4742 remove port 22 from php-fpm because of conflict 2016-09-02 10:38:15 -06:00
Luciano Gonçalves a3039958e3 Fix conflicts 2016-09-01 13:23:40 +01:00
Luciano Gonçalves b01bae59fc Fix volumes aerospike section 2016-09-01 13:21:21 +01:00
Luciano Gonçalves 92dc3be3b1 Remove duplicate argument on aerospike section 2016-09-01 13:05:53 +01:00
larryeitel 07d6ec85ca Merge branch 'master' of github.com:LarryEitel/laradock 2016-08-30 08:40:28 -06:00
Mahmoud Zalt adfb559521 Merge pull request #269 from LarryEitel/expose-port-22-and-add-insecure_id_rsa_ppk
expose-port-22-and-add-insecure_id_rsa_ppk
2016-08-30 17:29:51 +03:00
Mahmoud Zalt 05e0e9c817 Merge pull request #264 from LarryEitel/expose-port-22-in-workspace-add-insecure_id_rsa_ppk
expose-port-22-in-workspace-add-insecure_id_rsa_ppk
2016-08-30 11:06:16 +03:00
Mahmoud Zalt 6dcb174012 Merge pull request #266 from bktz/master
Added support for RabbitMQ
2016-08-30 11:03:57 +03:00
Mahmoud Zalt de914d106f Merge pull request #262 from computerfr33k/260-reduce-data-only-volume-size
use docker image which only supplies true & echo binaries.
2016-08-30 11:01:33 +03:00
Benjamin Katznelson 1e5d604470 Added support for RabbitMQ 2016-08-28 18:12:55 +10:00
larryeitel d441427852 Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:22:36 -06:00
larryeitel 227c8da17c Expose port 22 for workspace ssh. Add private key for PHPStorm Windows users. 2016-08-27 17:00:01 -06:00
Eric Pfeiffer 6ba76da709 use docker image which only supplies true & echo binaries. 2016-08-27 13:18:13 -05:00
Bo-Yi Wu 78be0b577e support specific node version
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-27 19:38:44 +08:00
Eric Pfeiffer 29d714a849 caddy log to file. enable gzip compression. 2016-08-26 13:26:22 -05:00
Mahmoud Zalt 9fb50b2c6b fix phpmyadmin port. closes #247 2016-08-24 00:43:11 +03:00
Bo-Yi Wu 3c8861d1d2 remove empty data folder for mariadb.
ref:
d969a465ee/10.1/Dockerfile (L83)

Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-22 11:02:21 +08:00
Bo-Yi Wu 2d51548879 support phpmyadmin container.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-08-22 11:01:34 +08:00
Mahmoud Zalt 4aa3902f32 Merge pull request #242 from LarryEitel/install-and-startup-workspace-ssh
Install and start workspace ssh
2016-08-22 03:30:17 +03:00
Luciano Gonçalves 1afad7f14c Add configuration to install aerospike php extension 2016-08-20 19:05:38 +01:00
Luciano Gonçalves 9bd70aadc8 Added aerospike cache service 2016-08-20 12:28:45 +01:00
Mahmoud Zalt e75da747a9 general clean up 2016-08-19 03:05:36 +03:00
larryeitel 4e7e003e87 ssh keys 2016-08-17 19:24:00 -06:00
Tim Bracken cfc81fca64 Allow for config of crush and opcache in the main docker file 2016-08-16 17:51:41 -04:00
Mahmoud Zalt 380c7bd1ec Merge branch 'multi-sites-branch' of https://github.com/LarryEitel/laradock into multi-sites
* 'multi-sites-branch' of https://github.com/LarryEitel/laradock:
  Proof of concept - LaraDock hosting multiple sites
2016-08-16 15:56:19 +03:00
Mahmoud Zalt b4760ac703 Merge branch 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock into LarryEitel-xdebugPhpFpm
* 'xdebugPhpFpm' of https://github.com/LarryEitel/laradock:
  Provided a way to Stop/Start php-fpm xdebug via bash script.
2016-08-16 15:13:42 +03:00
Suteepat Damrongyingsupab a6e04aa659 Added PHP Memcached extension installation for PHP 5.6 2016-08-16 16:31:52 +07:00
larryeitel 93504a714d Proof of concept - LaraDock hosting multiple sites 2016-08-15 15:14:05 -06:00
larryeitel d8a4537efb Provided a way to Stop/Start php-fpm xdebug via bash script. 2016-08-15 09:28:32 -06:00
Lialosiu 1fdf800988 add options INSTALL_ZIP_ARCHIVE to php-fpm 2016-08-14 15:53:08 +08:00
Maelle b7d38ef7dd parameter data in the path 2016-07-28 11:49:42 +02:00
Eric Pfeiffer 5e0e120950 add apache2 container. 2016-07-27 19:35:58 -05:00
Eric Pfeiffer 20adc9ca13 accidentally forgot to set INSTALL_NODE back to false. 2016-07-27 02:56:48 -05:00
Eric Pfeiffer 17e252a436 add non-root user for workspace container. 2016-07-27 02:43:38 -05:00
Mahmoud Zalt 062b7466f6 add composer.json to install global composer dependencies 2016-07-25 07:00:50 +03:00
Mahmoud Zalt e1dbb972f1 make Mongo, xDebug, Node, and prestissimo Installation Optional
on the Workspace and PHP-FPM Containers

+ general refactoring
2016-07-25 06:25:38 +03:00
Mahmoud Zalt 28a2d8e072 delete the .env file
making the central editing place is the docker-compose.yml file
2016-07-24 23:11:33 +03:00
orette ef8579987f Added HHVM container and used environment variable for switching 2016-07-24 02:49:57 +00:00
Eric Pfeiffer 9e7a669d5b incorporate upstream changes. 2016-07-19 22:01:20 -05:00
Eric Pfeiffer 9b084433c3 add caddy server. 2016-07-19 21:51:20 -05:00
Mahmoud Zalt 68576f9022 fix the volumes mapping 2016-07-13 17:04:06 +03:00
Mahmoud Zalt 2df00ecdad remove installing Prestissimo by default, to prevent the warning 2016-07-13 16:00:47 +03:00
Jack Fletcher dca0545293 Fixed incorrect `php-fpm` container mapping 2016-07-13 10:44:17 +01:00
Jack Fletcher 5f99478c76 Fixed workspace container mapping volumes to wrong container 2016-07-13 10:08:13 +01:00
Jack Fletcher 14cbe9f935 Moved volume container definitions
I've placed the `application` and `data` directories into a `volumes`
subdirectory. The top level `data` directory is now used for storing the
data used by the database (and other, if any) containers. The `data`
directory has also been added to the `.gitignore` file to prevent
accidental pushing of user data.
2016-07-12 17:11:57 +01:00
Jack Fletcher 42d63236f1 Changed the data container volume mappings
All of the database data volume mapping have been changed from the host's
`/var/lib` directory to locally alongside the laradock installation. This
should hopefully prevent issues where data disappears after containers are
restarted or data on the host machine is overwritten by accident (scary!)

Additionally this should make data easier to backup between installations
- especially on Windows where `/var` does not exist and is created
  transparently by Docker Machine/Windows beta.

This change will most likely cause data to disappear from existing
installations, however it may reappear if moved to it's new home.

References #137, #138
2016-07-12 16:39:08 +01:00
Jack Fletcher 11c65c4a00 Fix variable not set warning
Added an untracked `.env` file to the root directory to prevent the
`WARNING: The INSTALL_PRESTISSIMO variable is not set` message from being
displayed when `docker-compose` is run.

Added section in README for optional features.
2016-07-12 16:27:55 +01:00
Jack Fletcher bcb749151a Added support to conditionally install Prestissimo 2016-06-22 21:47:06 +01:00
Mahmoud Zalt f3eb6a5fc4 Merge branch 'support-mongo'
* support-mongo:
  add Mongo Support to the Readme
  added php-mongodb extension
  simple reformatting
  set the original volume path
  get mongo volum from the data container
  added mongodb driver for php5.5 5.6
  added mongodb image + PHP7 driver

Fix Conflicts in:
	docker-compose.yml
	php-fpm/Dockerfile-55
	php-fpm/Dockerfile-56
	php-fpm/Dockerfile-70
	php-fpm/laravel.ini
2016-06-11 17:29:27 +03:00
Mahmoud Zalt a8b4b61e28 update the volumes mounting of the DB containers 2016-06-03 01:50:11 +03:00
Mahmoud Zalt 4c06a03ead get mongo volum from the data container 2016-06-01 14:44:10 +03:00
Bo-Yi Wu 99b54c5f7d remove unnecessary data volume of redis.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-01 13:44:41 +08:00
Amin Mkh 9c7054abe2 added mongodb image + PHP7 driver 2016-05-29 14:19:43 +03:00
Amin Mkh fd4253afb6 Update docker-compose.yml 2016-05-23 22:23:10 +03:00
Mahmoud Zalt 06c4c19a6f replace official neo4j image with tpires/neo4j
because of this wired error
(https://github.com/neo4j/docker-neo4j/issues/33)
2016-05-20 21:21:19 +03:00
Mahmoud Zalt 5c9eb97db5 Support Neo4j DB (beta) 2016-05-20 20:35:10 +03:00
Mahmoud Zalt 01a056dd25 make the workspace container run automatically 2016-05-19 20:49:16 +03:00
Mahmoud Zalt 2c05c87400 update the logs section 2016-05-18 07:56:12 +03:00
Mahmoud Zalt 4d8a798224 Create Application Container to hold App code 2016-05-18 07:13:19 +03:00
Mahmoud Zalt 377f24fe2b keep workspace container alive with tty 2016-05-18 06:28:31 +03:00
Mahmoud Zalt efd062fd88 fix linking containers to php-fpm instead of php 2016-05-18 02:54:23 +03:00
Mahmoud Zalt 504c9c59d5 Create workspace container
the workspace container is based from Ubuntu 16.04
it includes PHP-CLI 7 - Git - cURL and Vim for now
2016-05-18 02:46:27 +03:00
Mahmoud Zalt 4edf941872 rename php to php-fpm
preparing to add php cli as part of the workspace container
2016-05-18 02:43:23 +03:00
Mahmoud Zalt 405067d4af Separate the PHP versions to multiple dockerfiles
Because there's some difference in installing some libraries
between PHP 5 and PHP 7. There must be multiple php dockerfiles.
For that I created 3 docker files each of a different version,
this will make it easy for the users to switch between the PHP
version by just editing the docker-compose file and not touching
the dockerfiles.
2016-05-14 04:50:47 +03:00
Mahmoud Zalt 7f4e411d3d link containers to PHP 2016-05-14 04:20:20 +03:00
matt cf89670671 add memcached support 2016-05-12 02:17:39 +01:00
Mahmoud Zalt 12587bc712 Support Beanstalkd and Beanstalkd Console
Closes feature #38
2016-05-09 05:02:15 +03:00
Mahmoud Zalt 81f2602464 Support MariaDB
closes feature #21
2016-05-09 04:23:03 +03:00
Mahmoud Zalt ecefee4d65 update postgres volume path 2016-05-09 04:20:03 +03:00
Mahmoud Zalt de8cbb0605 simple updates to docker compose and readme 2016-05-08 15:21:59 +03:00
Mahmoud Zalt 5190da831a remove containers names from docker-compose
to void conflict while scalling using the scale command
2016-05-08 13:39:43 +03:00
Mahmoud Zalt 5d84c6481f revers the dependancies between php and the db
to prevent running all the db engines when php is running
2016-05-07 05:29:48 +03:00
Mahmoud Zalt 26229e150d Merge pull request #35 from benmag/master
link postgres service to php service
2016-05-07 05:14:01 +03:00
Mahmoud Zalt 457c5d4b1b update the readme file
Support selecting your own containers in the docker compose command.
2016-05-07 05:03:07 +03:00
benmag@users.noreply.github.com cd97ac0aa6 link postgres service to php service 2016-05-07 11:55:00 +10:00
benmag@users.noreply.github.com 5d62ec1e67 Add support for postgres 2016-05-07 11:16:06 +10:00
Mahmoud Zalt 05a83d383f Major updates.
- upgrade docker compose to v2
- build images locally instead of pulling them from the registry
- separate php container form nginx container
- support all the php versions including php 7.0
- remove beanstalked container to be optionally added later by the user
2016-05-06 17:04:02 +03:00
Mahmoud Zalt 530ffe7433 remove redis restart always from the docker compose file 2016-04-18 12:08:57 +03:00
Mahmoud Zalt 105fce8965 simlify and reduce the usage steps 2016-04-08 11:33:33 +03:00
Mahmoud Zalt dac12296c6 upgrade to php 5.6 by default
adding `phpnginx` or `php55nginx` will pull PHP 5.5 while `php56nginx`
will pull PHP 5.6
2016-04-04 10:02:21 +03:00
Mahmoud Zalt 62ec36d9dd replace the images versions from the latest to the latest stable version (tag).
to avoid any errors while experimenting on the master branch
2016-04-04 05:33:18 +03:00
Mahmoud Zalt e572b0b9e7 edit docker-compose.yml variables to support the new LaraDock structure 2016-02-17 17:51:23 +02:00
Mahmoud Zalt 7e49f6708e get rid of the docker directory 2016-02-17 17:48:59 +02:00