thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-11-04 11:09:20 +00:00
Code Issues Releases Wiki Activity
1,300 Commits 3 Branches 6 Tags
e6c301a4a5b2eff4e885195ef133b021f09c52d7
Commit Graph

283 Commits

Author SHA1 Message Date
Nicolas Duchon
443ee5202c test: do we get desired number of idle keepalive connections 2023-12-26 18:52:43 +01:00
Nicolas Duchon
a4ced5b8bd test: revert "Fix test" and "Sleep longer" 
This reverts commit 5174495963.
This reverts commit 33ceec07d8.
 2023-12-24 00:16:40 +01:00
Niek
33ceec07d8 Sleep longer 2023-12-22 17:50:09 +01:00
Niek
5174495963 Fix test 2023-12-22 17:19:42 +01:00
Niek
c338a7cf22 Color terminal output 2023-12-22 14:37:20 +01:00
Gilles Filippini
9e77e81e7d Tests: support custom 'docker compose' command 
Enable overriding default 'docker compose' command with environment variable
'DOCKER_COMPOSE'. This way docker compose v1 is still supported with:

  $ DOCKER_COMPOSE=docker-compose pytest

This is important because people using the Debian packaged docker compose
are stuck to v1.
 2023-12-20 09:30:06 +01:00
Gilles Filippini
5d2f51dfe2 Fix test case assertion depending on python version 2023-12-19 21:31:19 +01:00
Nicolas Duchon
7d44f98e4f test: remove unused import 2023-12-12 22:16:32 +01:00
dependabot[bot]
c1617a6fac ci: bump docker from 6.1.3 to 7.0.0 in /test/requirements 
Bumps [docker](https://github.com/docker/docker-py) from 6.1.3 to 7.0.0.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](https://github.com/docker/docker-py/compare/6.1.3...7.0.0)

---
updated-dependencies:
- dependency-name: docker
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-12 21:07:53 +00:00
Nicolas Duchon
c4cf0af373 test: fix failing tests 2023-12-12 21:56:27 +01:00
Nicolas Duchon
060f09cfce ci: ensure all compose files are valid compose v2 + formatting 2023-12-12 21:56:27 +01:00
Nicolas Duchon
b5cac06305 ci: remove python docker-compose 2023-12-12 21:56:24 +01:00
Nicolas Duchon
c4cb1c3797 test: tests for HTTP/3 
Co-authored-by: Nicolas Duchon <nicolas.duchon@gmail.com>
Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
 2023-12-08 00:48:08 +01:00
Nicolas Duchon
7ca3769a39 Merge pull request #2322 from nginx-proxy/dependabot/docker/nginx-1.25.3-alpine 
build: bump nginx from 1.25.2-alpine to 1.25.3-alpine
 2023-12-08 00:47:06 +01:00
dependabot[bot]
3f764a5f84 build: bump nginx from 1.25.2-alpine to 1.25.3-alpine 
Bumps nginx from 1.25.2-alpine to 1.25.3-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-08 00:28:25 +01:00
dependabot[bot]
94259dd22c ci: bump pytest from 7.4.1 to 7.4.3 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.1 to 7.4.3.
- [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/7.4.1...7.4.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-10-30 04:38:05 +00:00
dependabot[bot]
39fb91675f ci: bump pytest from 7.4.0 to 7.4.1 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.0 to 7.4.1.
- [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/7.4.0...7.4.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-09-04 04:53:51 +00:00
Niek
0cbc998381 Bump create_server_certificate.sh to nginx:1.25.1 2023-07-31 13:04:19 +02:00
dependabot[bot]
f878cd8c04 ci: bump pytest from 7.3.2 to 7.4.0 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.2 to 7.4.0.
- [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/7.3.2...7.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-26 04:58:03 +00:00
dependabot[bot]
893eefc99d ci: bump pytest from 7.3.1 to 7.3.2 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.1 to 7.3.2.
- [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/7.3.1...7.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-12 04:57:57 +00:00
Nicolas Duchon
c1a2b31f35 Merge pull request #2222 from rot169/support-hostnet-containers 
Support containers running --net=host (#1537)
 2023-06-07 07:55:28 +02:00
dependabot[bot]
bebb3bba86 ci: bump docker from 6.1.2 to 6.1.3 in /test/requirements 
Bumps [docker](https://github.com/docker/docker-py) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](https://github.com/docker/docker-py/compare/6.1.2...6.1.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-06-05 04:57:33 +00:00
Nicolas Duchon
b382d0bbb6 Merge pull request #2250 from SaturnIC-Forks/main 
fix: Replace mDNS .local domain with .internal domain
 2023-05-30 07:28:13 +02:00
dependabot[bot]
e34d00f42c ci: bump requests from 2.30.0 to 2.31.0 in /test/requirements 
Bumps [requests](https://github.com/psf/requests) from 2.30.0 to 2.31.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.30.0...v2.31.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-29 04:57:57 +00:00
SaturnIC
13eb61a639 fix: Replace mDNS .local domain with .example domain 
See RFC 6762 for details on mDNS .local domain: https://datatracker.ietf.org/doc/html/rfc6762
And RFC 6761 for details on .example domain: https://datatracker.ietf.org/doc/html/rfc6761
 2023-05-23 09:43:30 +02:00
dependabot[bot]
bd5816b705 ci: bump docker from 6.1.1 to 6.1.2 in /test/requirements 
Bumps [docker](https://github.com/docker/docker-py) from 6.1.1 to 6.1.2.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](https://github.com/docker/docker-py/compare/6.1.1...6.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-15 04:58:28 +00:00
Nicolas Duchon
35b1493e16 feat: support proxy + container in host network mode 2023-05-09 19:31:42 +02:00
Nicolas Duchon
b88d33d2f3 feat: handle multiple proxy networks 2023-05-09 00:58:05 +02:00
Nicolas Duchon
2b621599ff test: fix wildcard_certs_and_nohttps test 2023-05-08 21:20:47 +02:00
dependabot[bot]
faad1cc29e ci: bump requests from 2.29.0 to 2.30.0 in /test/requirements 
Bumps [requests](https://github.com/psf/requests) from 2.29.0 to 2.30.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.29.0...v2.30.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-08 10:48:18 +00:00
dependabot[bot]
28fef687ad ci: bump docker from 6.0.1 to 6.1.1 in /test/requirements 
Bumps [docker](https://github.com/docker/docker-py) from 6.0.1 to 6.1.1.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](https://github.com/docker/docker-py/compare/6.0.1...6.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-05-08 04:58:23 +00:00
Nicolas Duchon
882e9a3b3c test: add tests for host mode fix 2023-04-28 22:43:20 +02:00
dependabot[bot]
00a1e5ef5c ci: bump requests from 2.28.2 to 2.29.0 in /test/requirements 
Bumps [requests](https://github.com/psf/requests) from 2.28.2 to 2.29.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.28.2...v2.29.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-27 05:00:28 +00:00
Nicolas Duchon
ff676b519e Merge pull request #2219 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.3.1 
ci: bump pytest from 7.3.0 to 7.3.1 in /test/requirements
 2023-04-18 07:20:04 +02:00
dependabot[bot]
b34c917977 ci: bump pytest from 7.3.0 to 7.3.1 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.0 to 7.3.1.
- [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/7.3.0...7.3.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-17 05:01:01 +00:00
Richard Hansen
035bd2b5ac fix: Remove default_server listen option from fallback server 
This fixes a bug introduced in commit
9b4bb07b34.
 2023-04-13 01:16:54 -04:00
dependabot[bot]
695ad54dcf ci: bump pytest from 7.2.2 to 7.3.0 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.2 to 7.3.0.
- [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/7.2.2...7.3.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-04-10 05:00:55 +00:00
Richard Hansen
9b4bb07b34 fix: Don't create fallback http(s) server when http(s) disabled 
Before, a fallback http server was created to handle requests for
unknown virtual hosts even when `HTTPS_METHOD=nohttp`.  (In this case,
all http vhosts would be unknown.)  Likewise, a catch-all fallback
https server was still created even if `HTTPS_METHOD=nohttps`.

Now the fallback servers are created only if needed.  This brings the
behavior in line with the documentation and user expectation.  It will
also make it easier to implement a planned feature: different servers
on different ports.
 2023-02-04 18:59:38 -05:00
Richard Hansen
9297e94389 fix: Emit TLS error if there are no certs available 
Before, if neither the vhost-specific cert nor `default.crt` existed,
nginx-proxy would not create the https vhost.  This resulted in nginx
either refusing the connection or serving the wrong vhost depending on
whether there was another https vhost with a certificate.

Now nginx-proxy always creates an https server for a vhost, even if
the vhost-specific certificate and the default certificate are both
missing.  When both certs are missing, nginx is given empty
certificate data to make it possible for it to start up without an
error.  The empty certificate data causes the user to see a TLS error,
which is much easier to troubleshoot than a connection refused error
or serving the wrong vhost.
 2023-02-02 22:02:06 -05:00
Richard Hansen
16066cab61 fix: Don't create cert error https server if https is not enabled 2023-02-02 17:17:00 -05:00
Niek
7ca1da8358 feat: Add support for HTTP load balancing between the proxy and upstream server groups (#2173) 
Add initial tests

Newlines

Remove unused variable

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

Change comment value

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

add missing services line

Co-authored-by: Richard Hansen <rhansen@rhansen.org>

Use deploy.replicas

Remove details about choosing a load balancing method

Feedback note

Co-authored-by: Nicolas Duchon <nicolas.duchon@gmail.com>
 2023-03-21 07:49:27 +01:00
Richard Hansen
49bb37dfdb feat: Add support for HTTP keep-alive between the proxy and upstream 2023-03-14 04:20:17 -04:00
dependabot[bot]
2fc3e6c28c ci: bump pytest from 7.2.1 to 7.2.2 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.2.1 to 7.2.2.
- [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/7.2.1...7.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-06 05:04:42 +00:00
Richard Hansen
b5a54ac219 tests: Reduce scope of docker_compose fixture (and friends) 
This makes it possible to bring up different compose files for
different tests in the same test module.

This change does not negatively affect performance because the fixture
is a no-op if the docker compose filename is unchanged between tests.
 2023-02-17 02:34:08 -05:00
Richard Hansen
4d8f878ba7 tests: Fixture that simplifies Docker compose file changes 2023-02-17 02:34:08 -05:00
Richard Hansen
f5a3492926 tests: Factor out DNS monkey patching to its own fixture 2023-02-17 02:34:08 -05:00
Richard Hansen
09a2f40633 tests: Turn helper function into docker_compose_file fixture 
This makes it easier for tests to override the filename.
 2023-02-17 02:34:08 -05:00
Richard Hansen
01745a836f tests: Fix path to ca-root.crt 
`os.getcwd()` is not guaranteed to always return the `test/`
directory.
 2023-02-17 02:34:08 -05:00
Richard Hansen
2115974e93 feat: Add ability to completely override location blocks 
Co-authored-by: Trent Harvey <trent@harvdog.net>
 2023-01-31 04:53:12 -05:00
Nicolas Duchon
8ac8b021b8 Merge pull request #2155 from rhansen/docker-pull 
chore: Pass `--pull` to `docker build` to get fresh images
 2023-01-30 07:57:44 +01:00