mirror/ nginx-proxy
1
0
Fork 0
mirror of https://github.com/nginx-proxy/nginx-proxy synced 2024-06-10 08:46:30 +02:00
Code Issues
980 Commits 10 Branches 31 Tags 23 MiB
Commit Graph

980 Commits

Author SHA1 Message Date
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
Nicolas Duchon 55d53e6659
Merge pull request #1934 from rhansen/keepalive 
feat: Add support for HTTP keep-alive between the proxy and upstream
 2023-03-21 07:31:13 +01:00
Nicolas Duchon 6c2d17586b
Merge pull request #2200 from nginx-proxy/docker-gen-0.10.2 
build: dockergen 0.10.1 -> 0.10.2
 2023-03-21 07:27:48 +01:00
Nicolas Duchon 4696944245
build: dockergen 0.10.1 -> 0.10.2 2023-03-21 07:15:34 +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
Nicolas Duchon 1f855fc7b3
Merge pull request #2191 from rhansen/nil-currentcontainer 
fix: Don't error if `$globals.CurrentContainer` is `nil`
 2023-03-14 06:49:21 +01:00
Richard Hansen 364beed773 fix: Don't error if `$globals.CurrentContainer` is `nil` 
Also:
  * Note when there are no networks.
  * Fix "networks available" comment.
 2023-03-10 15:23:44 -05:00
Richard Hansen 51fd6918ca
Merge pull request #2188 from nginx-proxy/dependabot/docker/golang-1.20.2-alpine 
build: bump golang from 1.20.1-alpine to 1.20.2-alpine
 2023-03-08 15:00:19 -05:00
dependabot[bot] 9906ccda42
build: bump golang from 1.20.1-alpine to 1.20.2-alpine 
Bumps golang from 1.20.1-alpine to 1.20.2-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-03-08 04:58:06 +00:00
Richard Hansen d990354e3d
Merge pull request #2187 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.2.2 
ci: bump pytest from 7.2.1 to 7.2.2 in /test/requirements
 2023-03-06 15:50:46 -05: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
Nicolas Duchon abcef6be86
Merge pull request #2184 from nginx-proxy/dockergen-0.10.1 
build: dockergen 0.10.0 -> 0.10.1
 2023-02-28 08:50:19 +01:00
Nicolas Duchon 6e9d46e672
Merge pull request #2164 from rhansen/tests 
chore: minor test improvements
 2023-02-28 08:49:12 +01:00
Nicolas Duchon 16b8cde8e4
build: dockergen 0.10.0 -> 0.10.1 2023-02-28 08:36:27 +01:00
Nicolas Duchon afd6544702
Merge pull request #2179 from rhansen/swarm 
fix: Partially revert "chore: Remove support for legacy swarm"
 2023-02-28 07:40:16 +01:00
Richard Hansen 4fc17d6139
Merge pull request #2183 from JanMalte/patch-1 
fix: Sort networks and ports before iterating
 2023-02-21 00:56:06 -05:00
Jan Malte Gerth 37134c44d7 fix: Sort networks and ports before iterating 
This avoids unnecessary nginx restarts caused by config file churn.
 2023-02-21 00:22:47 -05: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 6207be5f8f fix: Partially revert "chore: Remove support for legacy swarm" 
This partially reverts commit 2494e20784
by ignoring any network named "ingress" when searching for a
container's IP address.

That commit was technically a backwards-incompatible change: Some
users use nginx-proxy with Swarm mode even though it is not fully
supported.  In such cases nginx-proxy should ignore the `ingress`
network, otherwise nginx will not be able to reach the
server (container-to-container traffic apparently doesn't work over
the Swarm `ingress` network).

The parts of that commit that examine the `SwarmNode` structure are
not reverted here because docker-gen does not currently populate that
structure -- not even when both docker-gen and the service task
container are running on the same manager node.
 2023-02-17 01:52:05 -05:00
Richard Hansen 6f2a549ef1
Merge pull request #2175 from nginx-proxy/dependabot/docker/golang-1.20.1 
build: bump golang from 1.20.0 to 1.20.1
 2023-02-15 03:47:19 -05:00
dependabot[bot] de4386e440
build: bump golang from 1.20.0 to 1.20.1 
Bumps golang from 1.20.0 to 1.20.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-15 04:57:57 +00:00
Nicolas Duchon bc2ada1f44
Merge pull request #2163 from nginx-proxy/dockergen-0.10.0 
build: dockergen 0.9.4 -> 0.10.0
 2023-02-09 08:28:09 +01:00
Nicolas Duchon c10c7bcbe9
build: dockergen 0.9.4 -> 0.10.0 2023-02-09 08:10:43 +01:00
Nicolas Duchon 41e025f0f0
Merge pull request #2159 from rhansen/refactor 
chore: Factor out container IP:port lookup
 2023-02-09 08:01:26 +01:00
Richard Hansen ee8d2cede4
Merge pull request #2162 from nginx-proxy/dependabot/docker/golang-1.20.0 
build: bump golang from 1.19.5 to 1.20.0
 2023-02-02 02:20:26 -05:00
dependabot[bot] 7b6b2f773d
build: bump golang from 1.19.5 to 1.20.0 
Bumps golang from 1.19.5 to 1.20.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-02-02 04:01:39 +00:00
Richard Hansen 11a46f728c chore: Factor out container IP:port lookup 
This will make planned future changes easier.
 2023-02-01 03:06:39 -05:00
Richard Hansen 2494e20784 chore: Remove support for legacy swarm 
It doesn't work with the newer Docker Swarm mode so it doesn't have
much value anymore.
 2023-02-01 03:04:37 -05:00
Nicolas Duchon 1462ff019d
Merge pull request #1179 from harvdogg/master 
Allow complete override of location blocks
 2023-02-01 07:42:42 +01: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
Nicolas Duchon 926bd43cff
Merge pull request #2153 from rhansen/upstream-cleanup 
fix: Generate at most one `server` directive per container
 2023-01-30 07:56:50 +01:00
Richard Hansen 912a065406 chore: Pass `--pull` to `docker build` to get fresh images 
This is a no-op if the images are already up to date, and it prevents
puzzling problems when the images are old.
 2023-01-28 18:17:40 -05:00
Richard Hansen 6162427c45 fix: Generate at most one `server` directive per container 2023-01-28 18:01:19 -05:00
Richard Hansen bcec2d9075 chore: Refactor `upstream` template for readability 
In particular, reduce the nesting depth to make it easier to
understand what the code is doing by:

  * converting an $O(nm)$ nested loop into two serial $O(n)+O(m)$
    loops, and
  * consolidating similar nested `if` cases.
 2023-01-28 18:01:19 -05:00
Richard Hansen daeed502cb feat: Add a warning comment if the container port is published 2023-01-28 18:01:19 -05:00
Richard Hansen 5a8a6ceae2 chore: Improve debug comments in `upstream` template 2023-01-28 18:01:19 -05:00
Richard Hansen 2760ead490 chore: Remove warning comment when port is not exposed 
Exposing ports is largely deprecated because it doesn't actually do
anything in Docker.
 2023-01-28 18:01:19 -05:00
Richard Hansen e97bf606c8 chore: Move version comment to the top of the template 
to ensure that the version is always the first output line.

Also, always output `# nginx-proxy`, even if the version isn't known.
This makes it easier to find the start of the generated config in the
output of `nginx -T`.
 2023-01-28 18:01:19 -05:00
Richard Hansen d6d53893e8
Merge pull request #2152 from vincent-herlemont/documentation-log-format 
Documentation custom log format.
 2023-01-28 03:32:21 -05:00
Vincent Herlemont aa50116272 Documentation custom log format. 2023-01-27 23:16:49 +01:00
Vincent Herlemont 07cc80ac6b
feat: Support LOG_FORMAT env variable (#2151) 2023-01-27 12:28:40 -05:00
Richard Hansen 8346b68a28 fix: Ignore `VIRTUAL_HOST` set to the empty string 
Fixes #2144
 2023-01-23 20:48:16 -05:00
Richard Hansen f8ae0a4b00 feat: `DEFAULT_ROOT=none` disables the default `location /` block 2023-01-23 20:47:00 -05:00
Nicolas Duchon d3ded293ac
Merge pull request #2147 from nginx-proxy/dockergen-0.9.4 
build: dockergen 0.9.3 -> 0.9.4
 2023-01-24 00:27:54 +01:00
Nicolas Duchon fa52426d54
ci: set Dependabot commit prefixs 2023-01-23 23:24:58 +01:00