1
0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-08-23 16:01:57 +00:00
Commit Graph

355 Commits

Author SHA1 Message Date
Nicolas Duchon
145278b0ae Merge pull request #2279 from Knapoc/network-segregation-seperate-containers
feat: allow nginx / docker-gen network segregation
2025-05-15 13:18:29 +02:00
Nicolas Duchon
db51154175 test: custom nginx network segregation label 2025-05-11 12:46:45 +02:00
Nicolas Duchon
bfabd46054 test: network segregation w/ internal Docker network 2025-05-11 12:40:17 +02:00
Nicolas Duchon
3da268fd04 Merge pull request #2611 from nginx-proxy/dependabot/docker/library/nginx-1.27.5
build: bump library/nginx from 1.27.4 to 1.27.5
2025-05-08 13:44:28 +02:00
Nicolas Duchon
860d63fbc2 test: bump nginx version used for cert creation to 1.27.5 2025-05-08 13:31:29 +02:00
dependabot[bot]
b9c9b975d8 ci: bump urllib3 from 2.3.0 to 2.4.0 in /test/requirements
Bumps [urllib3](https://github.com/urllib3/urllib3) from 2.3.0 to 2.4.0.
- [Release notes](https://github.com/urllib3/urllib3/releases)
- [Changelog](https://github.com/urllib3/urllib3/blob/main/CHANGES.rst)
- [Commits](https://github.com/urllib3/urllib3/compare/2.3.0...2.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-05-08 10:52:22 +00:00
Knapoc
c338e1bcdf test: docker-gen network segregation
* fix tests
* remove obsolete compose version
2025-04-22 17:04:29 +02:00
Knapoc
ded6f89c56 test: check docker-gen network segregation 2025-04-22 12:04:04 +02:00
dependabot[bot]
84d2370f72 ci: bump packaging from 24.2 to 25.0 in /test/requirements
Bumps [packaging](https://github.com/pypa/packaging) from 24.2 to 25.0.
- [Release notes](https://github.com/pypa/packaging/releases)
- [Changelog](https://github.com/pypa/packaging/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pypa/packaging/compare/24.2...25.0)

---
updated-dependencies:
- dependency-name: packaging
  dependency-version: '25.0'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-04-21 05:00:00 +00:00
Nicolas Duchon
1842acba7d Merge pull request #2591 from SchoNie/tests-contextmanager-fixes
tests: DockerComposer contextmanager improvements
2025-03-10 23:55:06 +01:00
Niek
005b0bdd62 chore: fix whitespace 2025-03-10 09:53:52 +01:00
Niek
15e6fa8e07 tests: skip test_proxy-host-network-mode when PYTEST_RUNNING_IN_CONTAINER
Connecting to host network not supported when pytest is running in container
2025-03-10 09:53:52 +01:00
Niek
c18795b10e tests: variable interpolation comments
To make same as in test_wildcard-host.yml
2025-03-10 09:53:52 +01:00
Niek
58e21618b4 tests: DockerComposer connect_to_network except
If running from a container host-network-mode test fail because we cannot connect to host network. This prevents the cleanup.
So make sure we always return network for later removal.

Explicitly return None for readability
2025-03-10 09:53:52 +01:00
Niek
545e9cebb6 tests: DockerComposer KeyboardInterrupt
make sure we teardown on KeyboardInterrupt
2025-03-10 09:53:51 +01:00
Niek
a6271639ad tests: DockerComposer contextmanager do not fail
Change pytest.fail to a logging error because pytest.fail makes DockerComposer ContextManager exit and no _down teardown is executed.
2025-03-10 09:53:51 +01:00
Niek
d87ee36909 tests: self._docker_compose_file typo 2025-03-10 09:53:51 +01:00
Niek
557069583d tests: DockerComposer contextmanager improvements
-Improve the DockerComposer contextmanager to make sure teardown happens by using try except block.
-Move the self. declarations up so we are sure they are set even if an exception occurs.
-set self._networks
2025-03-10 09:53:50 +01:00
Marukome0743
82ae7443c6 chore: add syntax parser directive to Dockerfile 2025-03-10 17:30:48 +09:00
dependabot[bot]
ee7ba1a77b ci: bump pytest from 8.3.4 to 8.3.5 in /test/requirements
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.3.4 to 8.3.5.
- [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/8.3.4...8.3.5)

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

Signed-off-by: dependabot[bot] <support@github.com>
2025-03-03 04:29:06 +00:00
Nicolas Duchon
04797a52e1 test: bump nginx version used for cert creation to 1.27.4 2025-02-09 14:04:55 +01:00
Gilles Filippini
c1f1c85aeb ci: standalone compose file for proxy-host-network-mode
This is to prevent the below error with docker-compose v1:

ERROR: for nginx-proxy  "host" network_mode is incompatible with port_bindings
2025-02-08 15:27:53 +01:00
Gilles Filippini
06f412f622 ci: fix a few tests to support docker-compose v1 2025-02-08 15:27:53 +01:00
Gilles Filippini
78307266d4 Revert commit 142a159 to support python docker 5
Debian bookworm (current stable) still has python3-docker 5.0.3. The
reverted commit prevented the test-suite to run natively on this distro.

The version check could be bumped again when the next Debian stable (trixie)
will be released (by fall 2025 hopefully).
2025-02-08 15:27:53 +01:00
Nicolas Duchon
18030a7896 Merge pull request #1737 from junderw/fix-redirect
feat: redirect non-GET methods using 308 instead of 301
2025-01-18 22:03:27 +01:00
Nicolas Duchon
34a33a2255 tests: virtual proto 2025-01-18 21:50:41 +01:00
Nicolas Duchon
a61e485410 tests: refactor due to rebase 2025-01-18 20:41:17 +01:00
Nicolas Duchon
9fc7cec15c feat: customizable non get redirect code 2025-01-18 20:25:01 +01:00
Nicolas Duchon
8447a36046 tests: parameterize test 2025-01-18 20:25:01 +01:00
Nicolas Duchon
923f05032f tests: fix tests & test compose file 2025-01-18 20:25:01 +01:00
junderw
820d4a29ac tests: redirects 2025-01-18 20:25:01 +01:00
Nicolas Duchon
aa8145b62d tests: review changes
Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
2025-01-05 00:05:30 +01:00
Nicolas Duchon
836012cad6 docs: update test README 2025-01-03 16:00:36 +01:00
Nicolas Duchon
005377c6e5 tests: remove remaining unneeded container config 2024-12-30 20:45:08 +01:00
Nicolas Duchon
bfdd72fe95 tests: type hints and linting 2024-12-30 14:17:03 +01:00
Nicolas Duchon
40309e2441 tests: enable local testing on macOS / Darwin 2024-12-30 13:41:47 +01:00
Nicolas Duchon
daa9449176 tests: factor out base nginx-proxy config 2024-12-30 12:07:30 +01:00
Nicolas Duchon
1f732a54c6 tests: missing doubles quotes on WEB_PORTS 2024-12-27 21:36:39 +01:00
Nicolas Duchon
ae0c9a8e96 tests: fixture type hints and style standardization 2024-12-27 21:36:07 +01:00
Nicolas Duchon
ea99c1a6f9 tests: review comments 2024-12-27 16:16:55 +01:00
Nicolas Duchon
1e9745f604 tests: complete typing, minor fixes 2024-12-26 16:21:30 +01:00
Nicolas Duchon
7b6baa43cd tests: remove custom system_has_ipv6() method 2024-12-26 01:13:29 +01:00
Nicolas Duchon
fb0fc331c0 tests: minor typos and code style 2024-12-24 16:26:23 +01:00
Nicolas Duchon
eb09876f97 tests: standardize file structure & naming 2024-12-24 16:22:20 +01:00
Nicolas Duchon
35e2d21527 tests: do not remove containers on host 2024-12-24 14:05:42 +01:00
Nicolas Duchon
b5dea1cf50 tests: cleanup test code
- remove unused imports in test cases
- fix code smells and code style in conftest.py
2024-12-24 13:53:09 +01:00
Niek
142a159d56 ci: bump python module docker version check
ci: bump python module docker version check
2024-12-18 11:35:01 +01:00
Niek
92eb45f0ec ci: python 3.12+ compatibility
ci: python 3.12+ compatibility
2024-12-18 11:34:19 +01:00
Nicolas Duchon
fbad3ac3fc chore: docker compose version is obsolete 2024-12-18 02:08:46 +01:00
Nicolas Duchon
56a4bb8601 tests: supplemental test for certificate selection 2024-12-08 21:30:47 +01:00