thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-25 05:16:30 +00:00
Code Issues Releases Wiki Activity
281 Commits 3 Branches 6 Tags 672 KiB
5f684d4fc5
Commit Graph

281 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
a2ab8363ca Merge pull request #483 from jwilder/jw-docker-gen 
Update to docker-gen 0.7.3
 2016-06-13 08:18:07 -06:00
Jason Wilder
8ed5ab38b8 Update to docker-gen 0.7.3 2016-06-13 00:24:21 -06:00
Jason Wilder
db3ef67a7f Merge pull request #482 from jwilder/jw-revert 
Revert 9c93efa
 2016-06-13 00:21:38 -06:00
Jason Wilder
580517725f Revert 9c93efa 2016-06-13 00:10:49 -06:00
Jason Wilder
d1e6e1c0be Merge pull request #344 from schmunk42/feature/error-code 
changed error code for non-usable/default SSL cert, fixes #341
 2016-06-12 15:54:40 -06:00
Jason Wilder
fc619d63ad Merge pull request #460 from kumy/patch-1 
Fix a typo in comment
 2016-06-12 15:28:40 -06: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
fdfb0becd2 Merge pull request #480 from jwilder/jw-certs 
Fix template error when /etc/nginx/certs does not exist
 2016-06-12 14:28:35 -06:00
Jason Wilder
fdf93cafba Add docker-compose.yml v2 example 2016-06-12 14:10:46 -06:00
Jason Wilder
b325dad98d Remove -only-exposed from Procfile 2016-06-12 14:10:46 -06:00
Jason Wilder
9c93efaef9 Fix template error when /etc/nginx/certs does not exist 2016-06-12 14:10:40 -06:00
Jason Wilder
adf4573de4 Remove Circle CI badge 2016-06-12 10:45:59 -06:00
Jason Wilder
8393a57f1f Merge pull request #477 from jwilder/jw-nginx 
Nginx updates
 2016-06-10 20:22:07 -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
kumy
8c76ea9f9b Fix a typo in comment 2016-05-17 01:46:46 +02:00
Jason Wilder
0ef8dca98c Merge pull request #443 from jwilder/jw-circle 
Remove circle.yml
 2016-05-04 16:52:41 -06:00
Jason Wilder
c30640b024 Remove circle.yml 
Using travis now
 2016-05-04 16:05:03 -06:00
Jason Wilder
e964b9d29f Merge pull request #441 from jwilder/jw-0.7.1 
Update to docker-gen 0.7.1
 2016-05-04 16:03:52 -06:00
Jason Wilder
d40d1d4052 Update to docker-gen 0.7.1 2016-05-04 14:51:30 -06: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
786a2375aa Using different path method to hopefully fix cert volume issue in CI systems 2016-04-20 12:47:14 -04:00
Steve Kamerman
f296b273ce Normalized indentation, added explicit CERT_NAME 2016-04-20 12:33:21 -04:00
Steve Kamerman
1d0a5d9194 Added SSL/HTTPS tests 2016-04-20 12:20:08 -04: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
48c31836be Merge pull request #407 from jwilder/jw-travis 
Add travis.yml
 2016-04-04 17:27:12 -06:00
Jason Wilder
30e2da01e9 Add travis.yml 
From #312
 2016-04-04 17:18:05 -06:00
Jason Wilder
59f8d4301a Merge pull request #406 from jwilder/jw-forego 
Switch forego downloads
 2016-04-04 16:56:49 -06:00
Jason Wilder
a54af7d73b Switch forego downloads 
Official ddollar site has been down for a while and not sure if it's
coming back up or not.
 2016-04-04 16:48:52 -06:00
Baptiste Donaux
6928d62e1e Upgrade Docker dependency from 1.9 to 1.10 2016-03-24 14:40:50 +01:00
Baptiste Donaux
88cc096aaf [FIX] expose port for separated containers test 2016-03-24 11:16:22 +01:00
Baptiste Donaux
6b88365465 Merge remote-tracking branch 'upstream/master' 2016-03-24 08:41:23 +01:00
Jason Wilder
6adc04be83 Merge pull request #396 from pitkley/docker-gen-0.7.0 
Update to docker-gen 0.7.0
 2016-03-23 11:33:00 -06:00
Pit Kleyersburg
86aea653c8 Update to docker-gen 0.7.0 
Since [1] some timings seem to have changed. This caused the unit tests
to fail intermittently, from my testings especially on Ubuntu systems
(much less often on e.g. Arch).

This commit adds the `dockergen_wait_for_event` helper-function to try
and wait for the configuration to be generated by docker-gen before
continuing on with the actual tests themselves.

Additionally, at the end of every test file, all containers spun up by
the bats-tests will be stopped. This required adding the `bats-type`
label to every container started during the bats-tests.

The stopping of the containers reduces the amount of events docker-gen
has to process, thus resulting in lower wait times for the generation to
happen.

[1]: 50435652b1
 2016-03-23 17:45:34 +01:00
Baptiste Donaux
74fb2acc4b Merge remote-tracking branch 'upstream/master' 2016-03-23 08:52:58 +01:00
Jason Wilder
f2966c5db1 Merge pull request #374 from mrohland/master 
updated to nginx 1.9.12
 2016-03-21 16:28:18 -06: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
Jason Wilder
87d0c68aac Merge pull request #371 from gabriel403/patch-1 
Mention the docker-compose networking issues
 2016-03-03 15:35:43 -07:00
Baptiste Donaux
b42cd85570 Unit test - removed network creation 2016-02-26 09:12:11 +01:00
Baptiste Donaux
47631eb5de Merge remote-tracking branch 'upstream/master' 2016-02-25 09:59:04 +01:00
Baptiste Donaux
2b418319f2 Test to support overlay networks 2016-02-25 09:58:17 +01:00
Baptiste Donaux
163d1ce174 Upgrade docker-gen from 0.5.0 to 0.7.0 2016-02-25 08:26:41 +01:00