thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-08-23 16:01:57 +00:00
Code Issues Releases Wiki Activity
1,476 Commits 3 Branches 6 Tags
f47f171f887af8ea2099bcab37a8f6e06d99a764
Commit Graph

1476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Duchon
f47f171f88 Merge pull request #2612 from nginx-proxy/dependabot/pip/test/requirements/packaging-25.0 
ci: bump packaging from 24.2 to 25.0 in /test/requirements
 2025-05-08 12:51:17 +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
45342410bf Merge pull request #2607 from p12tic/doc-config-file-ordering 
docs: Add a note about configuration ordering in /etc/nginx/conf.d
 2025-04-11 18:06:51 +02:00
Povilas Kanapickas
c646aeebc9 docs: Add a note about configuration ordering in /etc/nginx/conf.d 
Users may not be aware that the filename chosen to add extra
configuration in /etc/nginx/conf.d may interfere with nginx-proxy.
nginx-proxy stores its configuration at /etc/nginx/conf.d/default.conf.
Any files that come before default.conf in alphabetical order will be
applied before default.conf and vice-versa.

This is confusing, because the documentation does not specify how
exactly nginx-proxy interacts with nginx.

This can be remedied by a simple note alerting the users of the
importance of filename choices.
 2025-04-09 01:26:59 +03:00
Nicolas Duchon
3150db44e4 Merge pull request #2603 from nginx-proxy/dependabot/docker/nginxproxy/docker-gen-0.14.6-debian 
build: bump nginxproxy/docker-gen from 0.14.5 to 0.14.6
 2025-03-23 18:09:27 +01:00
dependabot[bot]
4e69f361bb build: bump nginxproxy/docker-gen from 0.14.5-debian to 0.14.6-debian 
Bumps nginxproxy/docker-gen from 0.14.5-debian to 0.14.6-debian.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-03-23 16:44:28 +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
Nicolas Duchon
485b3c3445 Merge pull request #2599 from Marukome0743/syntax 
build: add `syntax` parser directive to Dockerfile
 2025-03-10 23:10:26 +01:00
Nicolas Duchon
59106c541b Merge pull request #2598 from Marukome0743/bump 
docs: bump docker image version
 2025-03-10 23:05:35 +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
Marukome0743
ec5343cc46 docs: bump docker image version 2025-03-10 17:23:09 +09:00
Nicolas Duchon
65b4804f7d Merge pull request #2594 from nginx-proxy/dependabot/pip/test/requirements/pytest-8.3.5 
ci: bump pytest from 8.3.4 to 8.3.5 in /test/requirements
 2025-03-08 17:45:03 +01: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
f4bd1ff63a ci: fix quote typo 2025-02-22 14:40:31 +01:00
Nicolas Duchon
82eec358bf ci: disable scheduled build/push on forks 2025-02-22 14:28:06 +01:00
Nicolas Duchon
04797a52e1 test: bump nginx version used for cert creation to 1.27.4 2025-02-09 14:04:55 +01:00
Nicolas Duchon
05e2c249a8 docs: bump nginx badge to 1.27.4 2025-02-09 14:02:55 +01:00
Nicolas Duchon
8f864e3198 Merge pull request #2584 from pini-gh/pini-debian-docker 
test: support docker-compose v1 & debian bookworm
 2025-02-09 13:49:02 +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
3594435cd8 Merge pull request #2585 from nginx-proxy/dependabot/docker/library/nginx-1.27.4 
build: bump library/nginx from 1.27.3 to 1.27.4
 2025-02-07 11:02:33 +01:00
dependabot[bot]
77f2df30d8 build: bump library/nginx from 1.27.3 to 1.27.4 
Bumps library/nginx from 1.27.3 to 1.27.4.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-02-06 04:11:31 +00:00
Nicolas Duchon
1da623019f Merge pull request #2576 from nginx-proxy/dependabot/docker/nginxproxy/docker-gen-0.14.5-debian 
build: bump nginxproxy/docker-gen from 0.14.4 to 0.14.5
 2025-01-19 23:03:10 +01:00
dependabot[bot]
e234ffba20 build: bump nginxproxy/docker-gen from 0.14.4-debian to 0.14.5-debian 
Bumps nginxproxy/docker-gen from 0.14.4-debian to 0.14.5-debian.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-01-19 20:34:13 +00: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
dfbff1eb9c Merge pull request #2561 from nginx-proxy/fix/proto-with-multiports 
fix: add proto to VIRTUAL_HOST_MULTIPORTS
 2025-01-18 22:01:09 +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
9312d5239a docs: typo 2025-01-18 20:25:01 +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
junderw
1859811311 feat: redirect using 308 for non-GET requests 2025-01-18 20:25:01 +01:00
Nicolas Duchon
691724c81f Merge pull request #2570 from nginx-proxy/test/refactor-darwin 
tests: factor out base nginx-proxy config and enable local testing on macOS / Darwin
 2025-01-05 11:37:45 +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