Fabio/nginx-proxy-auto-docker
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
414 commits 10 branches 36 tags 13 MiB
Commit graph

112 commits

Author SHA1 Message Date
Thomas LEVEIL
5c2f50402a fix template when running docker-gen and nginx in separate containers 
Since commit 658e20f, the template makes the assumption that the container running docker-gen is the container running nginx while checking that upstream containers are reachable.
By introducint the `NGINX_CONTAINER` environment variable, users are now able to indicate which container is actually running nginx when running docker-gen and nginx in separated containers.
 2017-03-08 21:32:54 +01:00
Matthias Döring
7bafa37a52 Upgrade to nginx 1.11.10 2017-02-21 14:03:54 +01:00
Thomas LEVEIL
6069bc53cd TESTS: replace old test suite with the new one 
get rid of Bats definitively
 2017-02-17 00:29:30 +01:00
Thomas LEVEIL
eeed150858 README: fix instruction for overriding default custom conf 2017-02-16 21:40:54 +01:00
Jason Wilder
2d588871f0 Merge pull request #719 from thomasleveil/optional_IPv6 
optional IPv6 support
 2017-02-16 12:09:30 -07:00
Jason Wilder
d7a2aa7823 Merge pull request #676 from matt-hh/feature/alpine-readme 
Add info about alpine base image
 2017-02-16 09:40:12 -07:00
Thomas LEVEIL
f0951df040 optional IPv6 support 
Fix #127 and fix #717 by improving #713
 2017-02-15 11:50:16 +01:00
Jason Wilder
b9e2053c38 Merge pull request #704 from yosmanyga/patch-1 
Fixed typo
 2017-02-06 12:43:16 -07:00
Matthias Döring
15cbb5debf Upgrade to nginx 1.11.9 2017-02-05 21:40:29 +01:00
Yosmany Garcia
d8f66e2411 Fixed typo 2017-02-03 16:19:40 -08:00
Kevin Doveton
4c06935b62 Update README.md 2017-01-27 13:24:24 +10:30
Kevin Doveton
2be48ec982 Update EXPOSE link in README.md 2017-01-27 13:16:27 +10:30
Steve Kamerman
276b4dbe3e Merge branch 'master' into feature_nohttps 2017-01-13 13:07:03 -05:00
Matthias Döring
8dfe5ae384 Add info about alpine base image 
For todo in #558
 2017-01-11 16:57:37 +01:00
Konstantin L
16c9853dc2 Set appropriate X-Forwarded-Ssl header. 2017-01-10 15:44:02 +01:00
Jason Wilder
e9a5519fb0 Merge pull request #611 from MichaelSp/patch-1 
add link to letsencrypt-nginx-proxy-companion
 2016-12-30 15:26:40 -07:00
Matthias Döring
004cc3cb8c Upgrade to nginx 1.11.8 2016-12-28 23:38:47 +01:00
Cody Ramaker
b66398d1bf Updated nginx to 1.11.6 2016-12-08 13:24:49 -06:00
Steve Kamerman
fc7653bf3d Merge branch 'master' into feature_nohttps 2016-12-05 09:06:39 -05:00
Jason Wilder
e60fefad27 Merge pull request #587 from kamermans/feature_x_forwarded_port 
Added X-Forwarded-Port and proxy headers tests
 2016-12-02 11:17:44 -07:00
Max Wilkinson
fddae94ed8 Clarified a couple parts in the README 2016-10-28 14:46:37 -04:00
Michael
1a608eaefb add link to letsencrypt-nginx-proxy-companion 2016-10-22 14:31:57 +02:00
Steve Kamerman
8cf0b75d80 Updated README with HTTPS_METHOD=nohttps 2016-10-01 11:25:11 -04:00
Steve Kamerman
7422539f20 Updated README to reflect X-Forwarded-Port 2016-09-29 15:42:49 -04:00
Steve Kamerman
6ebbdb10c7 Merge branch 'master' into feature_x_forwarded_port 2016-09-29 11:26:51 -04:00
Jason Wilder
40d433ae80 Merge pull request #493 from ryneeverett/docker_compose_separate_containers 
Add docker-compose file for separate containers.
 2016-09-09 14:18:06 -06:00
Jason Wilder
ec7169c112 Merge pull request #323 from pabra/master 
connect to uWSGI backends
 2016-09-09 14:16:08 -06:00
hwang
03e863d838 upgrade nginx to 1.11.3 2016-08-25 20:16:37 +02:00
hwang
86c408bbdd upgrade nginx to 1.11.0 2016-07-29 21:17:14 +02:00
Steve Kamerman
2e29168d92 Added X-Forwarded-Port 2016-07-21 11:23:35 -04:00
Steve Kamerman
fd127517b9 Added comments about httpoxy 2016-07-19 11:03:41 -04:00
Steve Kamerman
357d58ad97 Mitigate httpoxy attack (httpoxy.org, CVE-2016-(5385-5388,1000109-1000110) 2016-07-18 13:34:37 -04:00
ryneeverett
5f684d4fc5 Add docker-compose file for separate containers. 
Demonstrate that this pattern works.

This is based on the example at
<https://github.com/fatk/docker-letsencrypt-nginx-proxy-companion-examples/blob/master/docker-compose/v2/simple-site/docker-compose.yml>.
 2016-07-13 17:31:53 -04:00
Jason Wilder
c36b42933d Merge pull request #462 from kamermans/master 
Disable HSTS when HTTPS_METHOD=noredirect
 2016-06-12 15:28:08 -06:00
Jason Wilder
a0dee5c833 Remove -only-exposed from separate container instructions 2016-06-12 15:25:32 -06:00
Jason Wilder
fdf93cafba Add docker-compose.yml v2 example 2016-06-12 14:10:46 -06:00
Jason Wilder
adf4573de4 Remove Circle CI badge 2016-06-12 10:45:59 -06:00
Jason Wilder
9b0138f944 Remove docker compose v2 notes 2016-06-10 20:11:58 -06:00
Jason Wilder
c256f31728 Update nginx 1.9.15 2016-06-10 20:08:10 -06:00
Steve Kamerman
da3e257843 Removed HSTS when HTTPS_METHOD=noredirect, added tests, improved docs wrt HSTS 2016-05-19 23:20:43 -04:00
Steve Kamerman
3d77979efb Expanded documentation on HTTPS_METHOD 2016-05-19 23:16:19 -04:00
Jason Wilder
5b9264d945 Merge pull request #298 from kamermans/master 
Added env var to disable SSL redirect
 2016-05-01 17:45:45 -06:00
Jason Wilder
1c98df2de4 Merge pull request #337 from baptistedonaux/master 
Support Overlay Network
 2016-05-01 17:35:48 -06:00
Jason Wilder
a72c7e6e20 Add docker hub badges 2016-04-22 09:56:21 -06:00
Steve Kamerman
f294582ae8 Merge branch 'master' of https://github.com/jwilder/nginx-proxy 2016-04-20 11:05:20 -04:00
Baptiste Donaux
f66934567e Merge remote-tracking branch 'upstream/master' 2016-04-05 09:22:31 +02:00
Jason Wilder
30e2da01e9 Add travis.yml 
From #312
 2016-04-04 17:18:05 -06:00
Baptiste Donaux
74fb2acc4b Merge remote-tracking branch 'upstream/master' 2016-03-23 08:52:58 +01:00
Mike Rohland
1f8b480365 moved nginx to 1.9.12 2016-03-21 22:47:01 +01:00
Steve Kamerman
9671e0c1a2 Merge branch 'master' of https://github.com/jwilder/nginx-proxy 2016-03-18 13:47:11 -04:00