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,498 Commits 3 Branches 6 Tags
145278b0aeabd18307ff173fd9642e22815acbbd
Commit Graph

1498 Commits

This Branch
This Branch
All Branches
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
eb9f0f31d7 docs: add NGINX_CONTAINER_LABEL to docs 2025-05-11 13:05:12 +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
40744f6f41 refactor: deduplicate code 2025-05-11 12:28:32 +02:00
Nicolas Duchon
be1fd94778 chore: configure the issue template chooser 2025-05-11 12:01:38 +02:00
Nicolas Duchon
67aa2aafd2 chore: update issue templates 2025-05-11 11:38:13 +02:00
Nicolas Duchon
08ece5784f Merge pull request #2617 from nginx-proxy/dependabot/docker/nginxproxy/docker-gen-0.14.7-debian 
build: bump nginxproxy/docker-gen from 0.14.6-debian to 0.14.7-debian
 2025-05-08 14:13:32 +02:00
Nicolas Duchon
deda07a5c6 Merge pull request #2616 from nginx-proxy/dependabot/docker/nginxproxy/forego-0.18.3-debian 
build: bump nginxproxy/forego from 0.18.2-debian to 0.18.3-debian
 2025-05-08 14:13:13 +02:00
dependabot[bot]
c3b9d126e3 build: bump nginxproxy/docker-gen from 0.14.6-debian to 0.14.7-debian 
Bumps nginxproxy/docker-gen from 0.14.6-debian to 0.14.7-debian.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-05-08 12:00:49 +00:00
dependabot[bot]
6b15e12b05 build: bump nginxproxy/forego from 0.18.2-debian to 0.18.3-debian 
Bumps nginxproxy/forego from 0.18.2-debian to 0.18.3-debian.

---
updated-dependencies:
- dependency-name: nginxproxy/forego
  dependency-version: 0.18.3-debian
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
 2025-05-08 12:00:39 +00: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
Nicolas Duchon
c581ca2982 docs: bump nginx badge to 1.27.5 2025-05-08 13:31:18 +02:00
Nicolas Duchon
9d5e77a12c Merge pull request #2609 from nginx-proxy/dependabot/pip/test/requirements/urllib3-2.4.0 
ci: bump urllib3 from 2.3.0 to 2.4.0 in /test/requirements
 2025-05-08 13:17:59 +02:00
Nicolas Duchon
955797c07d Merge pull request #2614 from damascene/patch-1 
Clear instruction for naming of htpasswd file
 2025-05-08 13:10:53 +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
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
uak
f091544c27 Clear instruction for naming of htpasswd file 
Previous instructions could make the impression that user have to create a directory named as the virtual host and also a file named as the virutal host.
 2025-05-03 08:14:06 +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
Knapoc
9711ade7a6 feat: allow nginx / docker-gen network segregation 
* fix merge conflicts
 2025-04-22 11:58:44 +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
dependabot[bot]
d3162f0af1 build: bump library/nginx from 1.27.4 to 1.27.5 
Bumps library/nginx from 1.27.4 to 1.27.5.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2025-04-17 04:45:01 +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