Commit Graph

46 Commits

Author SHA1 Message Date
Yu-Lung Shao (Allen) 91d202dff4
Update laravel.conf.example 2018-02-26 15:47:23 +08:00
nymd 6e96b1c6f9
Update default.conf 2018-01-29 16:38:09 -08:00
nymd 639b14445f
Update default.conf 2018-01-29 16:31:48 -08:00
mouyong ee205d1198 [F] fix syntax error. 2018-01-04 13:57:46 +08:00
Mahmoud Zalt ad3698670b replace .dev with .test to avoid issues with the new google chrome 2017-12-17 21:35:31 +01:00
Ennio Simões 57918b69a7 adding '\' to the Dockerfile nginx statement 2017-11-26 17:30:32 -02:00
牟勇 a99281cda8 Change application source from dl-cdn.alpinelinux.org to aliyun source 2017-11-14 21:03:19 +08:00
牟勇 1342b696ea Merge branch 'master' of https://github.com/laradock/laradock 2017-11-14 20:57:52 +08:00
Vjekoslav Nikolic 4150f0b140 Fixes issue #1139, non-responding mirrors.aliyun.com. Reverses 6440ca841a 2017-09-20 05:44:36 -07:00
Mahmoud Zalt 5c0b8316b1 make the PHP_UPSTREAM config for NGINX and Apache identical 2017-08-04 00:50:20 +03:00
Mahmoud Zalt c836500488 add symfony, laravel and app nginx sites sampels 2017-08-01 22:12:43 +03:00
LinBo len 4c732aa5d6 nginx sites-available shoule only use *.conf
although most much of use case developer should modify laradock to suit their project. we can use *.conf.example to take effect.
but we also need a dummy nginx conf to info other newer to know how to config their nginx conf. the *.conf.example should be.

so i think we should only take *.conf to take effect. not *
2017-06-26 11:11:10 +08:00
Winfried 8246863cd7 Partly reverting 690137a3 2017-05-01 12:36:31 +02:00
Winfried 690137a349 Changing docroots to have the same defaults
Caddy, NGINX and Apache2 should have the same default application paths. The `public/` path suffix is now added in the dotenv file to be able to use Laradock for non-laravel projects as well. Also, updated the documentation.
2017-04-23 20:44:18 +02:00
Mahmoud Zalt bccb1a3162 fix typo in nginx site 2017-04-22 15:10:43 -04:00
Tim Lytle 585baf0668 Sending logs to docker `stdout` and `stderr`. 2017-04-04 18:05:28 -04:00
Marius van Zundert 4588685e97 Updated project example confs to fit nameing convention used in apache example 2017-03-17 19:34:32 +01:00
Marius van Zundert 4b2ddfad20 Updated project example confs to not have gitignore issues 2017-03-17 19:32:45 +01:00
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 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
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 73a3745cc3 Merge pull request #370 from philtrep/certbot
Certbot container
2017-03-16 13:25:15 -04:00
Thor Erik Lie 048b55186e Fix issue 619 2017-03-08 09:26:08 +01:00
蜗牛 6440ca841a change application source #397 (#609)
# fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source.
2017-02-15 09:34:30 -05:00
蜗牛 025a339062 change application source #397
# fix a problem--#397, change application source from dl-cdn.alpinelinux.org to aliyun source.
2017-02-15 10:20:18 +08:00
Kapil Viren Ahuja e9d4e5579e Fixing issue 568 (#574)
Increasing buffer sizes for applications like react/babel.

Working on default images was throwing intermitten NGing errors and
requried multiple refreshes
2017-01-27 16:31:46 +08: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 48f8f3c02d Added certbot serving in laravel conf 2016-11-14 11:27:39 -05:00
philtrep 4030cc2f26 Added certbot container 2016-11-14 11:27:37 -05:00
Mahmoud Zalt dbee864d44 rename laravel.conf to default and add sample conf 2016-10-31 19:50:30 -04:00
Mahmoud Zalt 28130c5907 delete site_a and site_b nginx config samples 2016-10-31 19:31:15 -04:00
Mahmoud Zalt 5da4058613 delete the drupal sample nginx config file 2016-10-31 19:28:47 -04:00
Aivan Monceller ffe45fed50 use utf8 charset on nginx 2016-10-15 01:01:59 +08:00
Mahmoud Zalt e75da747a9 general clean up 2016-08-19 03:05:36 +03:00
Tim Bracken 928451ae88 This is a better Drupal nginx config. Built from a combination of contributions from here:
https://groups.drupal.org/node/305633
https://www.nginx.com/resources/wiki/start/topics/recipes/drupal/
2016-08-16 16:32:59 -04:00
Tim Bracken c324114b7a Add drupal 8 example to make laradock framework agnostic. 2016-08-16 15:08:27 -04:00
larryeitel 93504a714d Proof of concept - LaraDock hosting multiple sites 2016-08-15 15:14:05 -06:00
Eric Pfeiffer e4f6cec536 fix nginx to actually log to files. 2016-07-26 12:53:26 -05:00
Eric Pfeiffer e6cf30e7ba re-added www-data user for nginx. log to stdout. 2016-07-26 12:41:52 -05:00
Eric Pfeiffer ed8e241007 use nginx:alpine as base. 2016-07-26 11:19:31 -05:00
orette ef8579987f Added HHVM container and used environment variable for switching 2016-07-24 02:49:57 +00:00
Bo-Yi Wu e0b4734dab Added support upload file size setting.
Signed-off-by: Bo-Yi Wu <appleboy.tw@gmail.com>
2016-06-28 17:18:37 +08:00
Mahmoud Zalt 588819ab6d turn errors and access logs on by default for nginx 2016-05-20 20:32:33 +03:00
Mahmoud Zalt 6eb3a9bd5f fix nginx not connecting to php port 9000 2016-05-18 06:29:33 +03: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