blackbirdchess/blackbirdchess-docker-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
715 Commits 1 Branch 0 Tags 15 MiB
baf29b1223
Commit Graph

715 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Marius van Zundert
baf29b1223 re-added .gitignore for nginx dir, still do not want configs in git 2017-03-17 08:48:47 +01:00
Mahmoud Zalt
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
Mahmoud Zalt
94d88e91c5 add missing steps to the docs 2017-03-17 02:46:19 -04: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
Mahmoud Zalt
aedc7c8438 edit the docs 2017-03-16 19:28:01 -04:00
Mahmoud Zalt
ec4ccb4a20 Move CNAME from the docs to the DOC.. 2017-03-16 18:33:29 -04:00
Mahmoud Zalt
de6040a14d move the documentation markdown files outside the generated html folder 2017-03-16 17:44:14 -04: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
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
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
1c7e2e7d85 Merge pull request #684 from laradock/revert-639-master 
Revert "Add apache conf file for specific virtualhost ServerName"
 2017-03-16 14:41:12 -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
e10ba9fa9f Merge pull request #617 from alchimik/patch-1 
don't load opcache extension twice
 2017-03-16 13:28:28 -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
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
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
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
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
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
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
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