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

717 commits

This branch
This branch
All branches
Author SHA1 Message Date
Dakota Hawkins
9bad218f23
Add vhost.d includes to nginx.tmpl's https redirect server block 
Adds customization points to https redirect responses that are analogous
to other response handling. This gives you the opportunity to add
response headers or etc. before returning the 301 redirect.

If `$host` or `default` exist in `/etc/nginx/vhost.d/`, we rely on
nginx-proxy/acme-companion to add the Let's Encrypt acme challenge
location block there, so it's only included here if those files don't
exist.

New tests in `test_ssl` are similar to tests in `test_custom`, except they
expect 301 responses along with custom configs.

Fixes #1613
 2021-08-03 08:58:29 +02:00
Nicolas Duchon
df638c3fe6
ci: cleanup left over volumes after tests 2021-08-02 19:31:36 +02:00
Nicolas Duchon
10a4db5067
ci: remove xfail from tests that were fixed 2021-08-02 19:08:06 +02:00
Nicolas Duchon
d3fc5c506a
ci: enable Docker IPv6 on tests that require it 2021-08-02 18:37:33 +02:00
Nicolas Duchon
795e0acda7
ci: remove InsecureRequestWarning from urllib3 2021-08-02 18:09:34 +02:00
Nicolas Duchon
caab609f5d
Merge pull request #1723 from nginx-proxy/ci-pip-docker 
Update docker and docker-compose pip packages
 2021-08-02 15:11:44 +02:00
Nicolas Duchon
90a7218622
ci: update contest.py 2021-08-02 14:48:40 +02:00
Nicolas Duchon
ce4ce0676a
ci: update docker and docker-compose pip packages 2021-08-02 14:44:21 +02:00
Nicolas Duchon
6988797759
Merge pull request #1720 from nginx-proxy/dependabot/pip/test/requirements/pytest-6.2.4 
chore(deps): bump pytest from 6.2.2 to 6.2.4 in /test/requirements
 2021-08-02 14:36:04 +02:00
dependabot[bot]
1ba594cc4d
chore(deps): bump pytest from 6.2.2 to 6.2.4 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.2 to 6.2.4.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pytest-dev/pytest/compare/6.2.2...6.2.4)

---
updated-dependencies:
- dependency-name: pytest
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-02 11:05:37 +00:00
Nicolas Duchon
54f66dc67a
Merge pull request #1721 from nginx-proxy/dependabot/pip/test/requirements/backoff-1.11.1 
chore(deps): bump backoff from 1.10.0 to 1.11.1 in /test/requirements
 2021-08-02 13:04:51 +02:00
dependabot[bot]
9855571616
chore(deps): bump backoff from 1.10.0 to 1.11.1 in /test/requirements 
Bumps [backoff](https://github.com/litl/backoff) from 1.10.0 to 1.11.1.
- [Release notes](https://github.com/litl/backoff/releases)
- [Changelog](https://github.com/litl/backoff/blob/master/CHANGELOG.md)
- [Commits](https://github.com/litl/backoff/compare/v1.10.0...v1.11.1)

---
updated-dependencies:
- dependency-name: backoff
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-02 10:55:56 +00:00
Nicolas Duchon
16b21a3af8
Merge pull request #1718 from nginx-proxy/dependabot/pip/test/requirements/requests-2.26.0 
chore(deps): bump requests from 2.25.1 to 2.26.0 in /test/requirements
 2021-08-02 12:55:16 +02:00
dependabot[bot]
eefea9daec
chore(deps): bump requests from 2.25.1 to 2.26.0 in /test/requirements 
Bumps [requests](https://github.com/psf/requests) from 2.25.1 to 2.26.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/master/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.25.1...v2.26.0)

---
updated-dependencies:
- dependency-name: requests
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-08-02 10:47:08 +00:00
Nicolas Duchon
b01d6dd9cc
ci: enable Dependabot checks for Python 2021-08-02 12:46:45 +02:00
Nicolas Duchon
4e3e518936
docs: update issue template w/ link to discussions 2021-07-19 21:24:28 +02:00
Nicolas Duchon
607f481d44
Merge pull request #1697 from nginx-proxy/dependabot/docker/golang-1.16.6 
chore(deps): bump golang from 1.16.5 to 1.16.6
 2021-07-15 07:57:17 +02:00
dependabot[bot]
0b735897cb
chore(deps): bump golang from 1.16.5 to 1.16.6 
Bumps golang from 1.16.5 to 1.16.6.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-15 04:11:52 +00:00
Nicolas Duchon
785141c7a0
docs: update nginx version badge to 1.21.1 (typo) 2021-07-09 08:13:06 +02:00
Nicolas Duchon
d61f25ed3e
docs: update nginx version badge to 1.21.1 2021-07-09 08:12:06 +02:00
Nicolas Duchon
6889b3a25a
Merge pull request #1686 from nginx-proxy/dependabot/docker/nginx-1.21.1 
chore(deps): bump nginx from 1.21.0 to 1.21.1
 2021-07-09 08:09:54 +02:00
dependabot[bot]
d743160597
chore(deps): bump nginx from 1.21.0 to 1.21.1 
Bumps nginx from 1.21.0 to 1.21.1.

---
updated-dependencies:
- dependency-name: nginx
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-07-09 04:11:58 +00:00
Nicolas Duchon
323837bf70
Merge pull request #1679 from pini-gh/pini-1609 
Add test and fix `server 127.0.0.1 down` fallback for load balancing use case
 2021-07-03 23:48:09 +02:00
Gilles Filippini
dfc84558a5 fix: upstream fallback entry with load balancing 2021-06-21 00:48:21 +02:00
Gilles Filippini
a637b399b8 test: add test_server-down/test_load-balancing 
Check that when multiple containers have the same WIRTUAL_HOST and one of
them is unreachable, the resulting `upstream` block has no
`server 127.0.0.1 down;` entry.
 2021-06-21 00:48:21 +02:00
Nicolas Duchon
2006968c05
Merge pull request #1667 from pini-gh/pini-1609 
Use `server 127.0.0.1 down` entry only when required
 2021-06-20 18:04:19 +02:00
Nicolas Duchon
54347a9787
docs: precision about ports in VIRTUAL_HOST 2021-06-20 17:51:09 +02:00
Nicolas Duchon
f9e58cea9b
ci: allow tests to be manually triggered 2021-06-16 01:39:47 +02:00
Gilles Filippini
7c0a4cb0b3 fix: escape backslash in test 2021-06-15 23:55:31 +02:00
Gilles Filippini
fca248a965 fix: server 127.0.0.1 down entry only when required 2021-06-15 23:54:24 +02:00
Nicolas Duchon
98fe68432a
ci: update Dependabot labels 2021-06-15 23:32:38 +02:00
Nicolas Duchon
84ae835582
docs: fix markdown link error 2021-06-15 00:51:00 +02:00
Nicolas Duchon
ef2bdb5304
Merge pull request #1662 from nginx-proxy/http-https-port-doc-tests 
Docs, fix and tests for custom HTTP/HTTPS ports
 2021-06-15 00:46:28 +02:00
John Stucklen
790785f1ab
test: custom HTTPS port and redirection 2021-06-15 00:38:32 +02:00
John Stucklen
fa8b0d7bad
fix: HTTPS redirection with custom HTTPS port 2021-06-15 00:33:06 +02:00
John Stucklen
6bb7c37605
test: custom HTTP port 2021-06-15 00:13:06 +02:00
Nicolas Duchon
d1cf6b57d7
docs: custom external HTTP/HTTPS ports 2021-06-15 00:00:50 +02:00
Nicolas Duchon
b9e301d769
docs: update nginx version badge 2021-06-14 15:17:23 +02:00
Nicolas Duchon
987c996173
Merge pull request #1641 from nginx-proxy/dependabot/docker/nginx-1.21.0 
chore(deps): bump nginx from 1.19.10 to 1.21.0
 2021-06-14 13:47:26 +02:00
Nicolas Duchon
eb00b066de
Merge pull request #1659 from exussum12/patch-1 
Improve logging
 2021-06-14 11:42:19 +02:00
Scott Dutton
e9ab13781d
Fix spacing 2021-06-09 20:51:51 +01:00
Scott Dutton
9f069a42ac
Improve logging 
Currently its almost impossible to know which host actually handled the request, this extra variable logs the upstream server too
 2021-06-09 20:51:08 +01:00
Nicolas Duchon
d9d7a3354d
Merge pull request #1653 from nginx-proxy/dependabot/docker/golang-1.16.5 
chore(deps): bump golang from 1.15.10 to 1.16.5
 2021-06-09 01:34:47 +02:00
dependabot[bot]
1967ca2a57
chore(deps): bump golang from 1.15.10 to 1.16.5 
Bumps golang from 1.15.10 to 1.16.5.

---
updated-dependencies:
- dependency-name: golang
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 23:28:24 +00:00
dependabot[bot]
ae5623916b
chore(deps): bump nginx from 1.19.10 to 1.21.0 
Bumps nginx from 1.19.10 to 1.21.0.

Signed-off-by: dependabot[bot] <support@github.com>
 2021-06-08 23:28:15 +00:00
Nicolas Duchon
7f2307626d
Merge pull request #1603 from nginx-proxy/forego 
Chore: switch to go mod compatible fork of forego
 2021-06-09 01:27:31 +02:00
Nicolas Duchon
242caf9e69
chore: switch to go mod compatible fork of forego 2021-06-09 01:18:02 +02:00
Nicolas Duchon
49b2b5cd97
Merge pull request #1609 from pini-gh/pini-1132 
Honor VIRTUAL_PORT + DEBUG flag + fallback entry
 2021-05-28 12:07:32 +02:00
Gilles Filippini
2bb53bd303 test: add tests for the DEBUG flag 2021-05-28 01:52:01 +02:00
Gilles Filippini
3785649eb6 test: VIRTUAL_PORT != single exposed port 2021-05-28 00:04:59 +02:00