Commit Graph

1739 Commits

Author SHA1 Message Date
d172180660 Add constant PHP_FPM_INSTALL_INTL=false & APPLICATION 2017-03-17 13:53:04 +07:00
9f78b17fd1 Fixing indent_size=2 from 4 2017-03-17 13:52:19 +07:00
f5e33fb396 Update .gitignore file 2017-03-17 13:49:21 +07:00
9ae6e45dda Merge branch 'master' of https://github.com/Laradock/laradock
* 'master' of https://github.com/Laradock/laradock:
  Update docker-compose.yml
  intl support
2017-03-17 02:46:35 -04:00
94d88e91c5 add missing steps to the docs 2017-03-17 02:46:19 -04:00
8b4901ce57 Closed if
Closed if [] ;fi in Human Language and Character Encoding Support:
2017-03-16 23:28:29 -07:00
08086be4c5 PHP_FPM_INSTALL_INTL env-example
added PHP_FPM_INSTALL_INTL=false to PHP_FPM_INSTALL_INTL=false
2017-03-16 23:26:54 -07:00
f2805bca52 Update docker-compose.yml 2017-03-16 22:21:26 -03:00
033e1b8721 Merge branch 'master' into PHP_WORKER 2017-03-16 21:59:28 -03:00
9e290ffddb Merge pull request #680 from cjmaxik/feature-intl
Adding intl support to php-fpm container
2017-03-16 20:57:47 -04:00
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
v5.0.1
2017-03-16 20:53:14 -04:00
c6e393f5ce Update Dockerfile-71
We have already 7.1 image builded. + intl and ghostscript support 
https://github.com/laradock/laradock/pull/672
https://github.com/laradock/laradock/pull/680
2017-03-17 10:32:04 +10:00
4e443cec09 Merge branch 'master' into feature-intl 2017-03-17 10:08:21 +10:00
528b60eb17 fixing Volumes and Workdir 2017-03-16 21:03:04 -03:00
aedc7c8438 edit the docs 2017-03-16 19:28:01 -04:00
ec4ccb4a20 Move CNAME from the docs to the DOC.. 2017-03-16 18:33:29 -04:00
de6040a14d move the documentation markdown files outside the generated html folder v5.0.0 2017-03-16 17:44:14 -04:00
e0e4616ae0 update installation steps in the docs (.env) 2017-03-16 17:03:05 -04:00
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
30cf27e011 Fix nginx: [emerg] BIO_new_file("/var/certs/cert1.pem") failed (SSL: error:02001002:system library:fopen:No such file or directory:fopen('/var/certs/cert1.pem','r') error:2006D080:BIO routines:BIO_new_file:no such file) 2017-03-16 15:56:37 -04:00
dcec8a46a8 replace the links with depends_on in the docker-compose file
closes #636
2017-03-16 15:11:04 -04:00
1c7e2e7d85 Merge pull request #684 from laradock/revert-639-master
Revert "Add apache conf file for specific virtualhost ServerName"
v4.20.0
2017-03-16 14:41:12 -04:00
1d6583e97e Revert "Add apache conf file for specific virtualhost ServerName" 2017-03-16 14:40:45 -04:00
1cf5bcde62 Merge pull request #682 from MauricioTRS/master
Elasticsearch - Fix plugins directory
2017-03-16 13:35:24 -04:00
db40c67f75 Merge pull request #639 from tiknil/master
Add apache conf file for specific virtualhost ServerName
2017-03-16 13:30:14 -04:00
e10ba9fa9f Merge pull request #617 from alchimik/patch-1
don't load opcache extension twice
2017-03-16 13:28:28 -04:00
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
0678415663 Merge pull request #484 from AliveCorpse/feature/php_fpm_v7.1
Add dockerfile with php-fpm 7.1
2017-03-16 13:26:14 -04:00
73a3745cc3 Merge pull request #370 from philtrep/certbot
Certbot container
2017-03-16 13:25:15 -04:00
bed0fd9bdb Elasticsearch - Fix plugins directory 2017-03-16 14:24:56 -03:00
3f1d4b70a6 Merge pull request #650 from wayanjimmy/feature/mailhog
Add mailhog for mail debugging
2017-03-16 13:23:28 -04:00
218ffe641e Merge pull request #659 from thorerik/fix-issue-619
Fix issue 619
2017-03-16 13:21:17 -04:00
be39e93ea2 Merge pull request #672 from cabrerabywaters/GOHSTSCRIPT_SUPPORT
Gohstscript support
2017-03-16 13:11:08 -04:00
783c9321c9 Merge pull request #679 from davidvleung/master
Refine container name retrieval
2017-03-16 13:10:00 -04:00
c62ce7d36f Update docker-compose.yml 2017-03-16 09:59:52 +10:00
8ee2229c84 intl support 2017-03-16 09:59:05 +10:00
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
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
0d41c3d65e updated env-example and removed .env.example 2017-03-15 09:12:07 +01:00
cbd3cf7c20 Adding php-worker container to docker-compose 2017-03-14 11:06:45 -03:00
d505871faf Adding php-worker for Laravel 2017-03-14 11:05:22 -03:00
9c14954ff4 Adding GHOSTSCRIPT support 2017-03-14 10:59:38 -03:00
fd0cbff16c Adding ARG to docker-compose 2017-03-14 10:58:35 -03:00
246814874c Adding Arg to docker-compose 2017-03-14 10:49:44 -03:00
1250668267 Adding MSSQL Support 2017-03-14 10:47:10 -03:00
d616545268 Merge pull request #19 from laradock/master
Just update the fork
2017-03-14 13:00:16 +00:00
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
ab1d5bae95 complete missings 2017-03-13 21:03:31 -04:00
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
1a80385a48 change some desgins in the docs site 2017-03-10 13:48:13 -05:00