 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 |
|
|
Marius van Zundert
|
0d41c3d65e
|
updated env-example and removed .env.example
|
2017-03-15 09:12:07 +01: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
|
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 |
|
|
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 |
|
|
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
|
3f13aa4f50
|
Removed .env file
|
2017-02-27 12:36:44 +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 |
|
|
Marius van Zundert
|
ca45806aaa
|
Updated gitignore
|
2017-02-27 12:34:20 +01:00 |
|