ykxiao
/
laradock
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,000 Commits 1 Branch 159 Tags 14 MiB
Commit Graph

1000 Commits

Author SHA1 Message Date
Mahmoud Zalt 218ffe641e Merge pull request #659 from thorerik/fix-issue-619 
Fix issue 619
 2017-03-16 13:21:17 -04:00
Mahmoud Zalt be39e93ea2 Merge pull request #672 from cabrerabywaters/GOHSTSCRIPT_SUPPORT 
Gohstscript support
 2017-03-16 13:11:08 -04:00
Mahmoud Zalt 783c9321c9 Merge pull request #679 from davidvleung/master 
Refine container name retrieval
 2017-03-16 13:10:00 -04:00
Max Mekenya c62ce7d36f Update docker-compose.yml 2017-03-16 09:59:52 +10:00
Max Mekenya 8ee2229c84 intl support 2017-03-16 09:59:05 +10:00
David Leung 735647bdf7 Refine container definition 
Changed to `docker ps` because this one word wraps.  `docker-compose ps` will create a newline if text is too long in a small terminal window.  Also `awk` represents tokens better than ones created with a " " delimiter.
 2017-03-15 13:51:54 -10:00
Mahmoud Zalt f61535427c Merge pull request #677 from Mvzundert/multiple-projects-improvement 
updated env-example and removed .env.example
 2017-03-15 18:36:49 -04:00
Marius van Zundert 0d41c3d65e updated env-example and removed .env.example 2017-03-15 09:12:07 +01:00
Ignacio Cabrera cbd3cf7c20 Adding php-worker container to docker-compose 2017-03-14 11:06:45 -03:00
Ignacio Cabrera d505871faf Adding php-worker for Laravel 2017-03-14 11:05:22 -03:00
Ignacio Cabrera 9c14954ff4 Adding GHOSTSCRIPT support 2017-03-14 10:59:38 -03:00
Ignacio Cabrera fd0cbff16c Adding ARG to docker-compose 2017-03-14 10:58:35 -03:00
Ignacio Cabrera 246814874c Adding Arg to docker-compose 2017-03-14 10:49:44 -03:00
Ignacio Cabrera 1250668267 Adding MSSQL Support 2017-03-14 10:47:10 -03:00
Mahmoud Zalt faa42d8651 Merge branch 'Mvzundert-multiple_frameworks' 
* Mvzundert-multiple_frameworks:
  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-13 21:03:58 -04:00
Mahmoud Zalt ab1d5bae95 complete missings 2017-03-13 21:03:31 -04:00
Mahmoud Zalt 7f27073a4e Merge branch 'multiple_frameworks' of https://github.com/Mvzundert/laradock into Mvzundert-multiple_frameworks 
* 'multiple_frameworks' of https://github.com/Mvzundert/laradock:
  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-13 19:29:30 -04:00
Mahmoud Zalt 1a80385a48 change some desgins in the docs site 2017-03-10 13:48:13 -05: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 f7b94ac599 Merge branch 'non-framework' into multiple_frameworks 2017-03-09 09:33:40 +01:00
Marius van Zundert ff39e6045d Merge branch 'multiple_frameworks' of github.com:Mvzundert/laradock into multiple_frameworks 2017-03-09 09:32:13 +01:00
Marius van Zundert 07ebd5f69b Fixed merge conflicts when merging upstream with master 2017-03-09 09:30:47 +01: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
Marius van Zundert 0ac0166068 Merge branch 'master' into multiple_frameworks 2017-03-08 11:33:20 +01:00
Thor Erik Lie 048b55186e Fix issue 619 2017-03-08 09:26:08 +01:00
alchimik 94c6240586 workaround for 'Xdebug breaks on access to class static property' (#654) 
see https://github.com/docker-library/php/issues/133
 2017-03-08 00:15:46 -05:00
alchimik 178d7e1505 fix selenium (#655) 
see https://github.com/SeleniumHQ/docker-selenium#running-the-images
 2017-03-07 23:57:18 -05:00
Max Mekenya 082a73ee33 Bump NVM script version to 0.33.1 (#658) 
https://github.com/creationix/nvm/releases/tag/v0.33.1
 2017-03-07 23:56:35 -05:00
Marius van Zundert 25c2768557 Apache should just go to /var/www not /var/www/public when supporting multiple projects 2017-03-06 22:26:17 +01:00
Marius van Zundert 1d918a71d8 fixed example and docker-compose.yml 2017-03-06 22:20:31 +01:00
Marius van Zundert 9e3f8dd43d fixed merge conflicts 2017-03-06 21:25:16 +01:00
Mahmoud Zalt 164b699f24 Merge pull request #653 from thorerik/add-minio 
Add minio container
 2017-03-06 09:37:56 -05:00
Thor Erik Lie c63bf5ea07 Revert "Docs updated" 
This reverts commit d95b52b7db.
 2017-03-06 10:58:05 +01:00
Marius van Zundert 46fcb9e09c Fixed php-fpm variables and example 2017-03-06 09:31:11 +01:00
Marius van Zundert 603010cbd5 Split up mysqli and tokenizer 2017-03-06 09:03:12 +01:00
Thor Erik Lie d95b52b7db Docs updated 2017-03-05 15:07:29 +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
David Chen 84b742315a Update README-zh.md (#648) 2017-03-02 16:56:35 +08: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