thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2026-08-15 18:42:48 +00:00
Code Issues Releases Wiki Activity
1,381 Commits 3 Branches 6 Tags
d4b1925624ec18ae6981e5139b0263ef7ddb2af0
Commit Graph
1381 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander LieretandNicolas Duchon 2509fc1076 test: Add test cases for NETWORK_ACCESS=internal 2022-02-24 15:08:18 +01:00
Alexander LieretandNicolas Duchon 28c74e8dae fix: Move NETWORK_ACCESS to location block 2022-02-24 15:08:18 +01:00
Alexander LieretandNicolas Duchon 6a580ad664 test: Add test case for location config priority 2022-02-24 15:08:18 +01:00
Alexander LieretNicolas DuchonJonathan Underwood
 		4099fcd618 test: Add test case for default app redirect 
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
 2022-02-24 15:08:18 +01:00
Alexander LieretandNicolas Duchon e08b3487c9 test: Add test to cover SSL of path-based routing 2022-02-24 15:08:18 +01:00
Nicolas DuchonandJonathan Underwood 12887a977b docs: update DEFAULT_ROOT documentation 
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
 2022-02-24 15:08:17 +01:00
Nicolas DuchonandJonathan Underwood efb250da01 fix: use most specific custom location config first 
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
 2022-02-24 15:08:17 +01:00
Nicolas DuchonandJonathan Underwood c75622db87 docs: fix typo in README.md 
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
 2022-02-24 15:08:17 +01:00
Alexander LieretandNicolas Duchon 33eab70d32 feat: Add custom location block to virtual paths 
This features allows the custom location blocks to be added to the
virtual path based routing. The custom config can be specified for each
container individually.
 2022-02-24 15:08:17 +01:00
Alexander LieretandNicolas Duchon 4b85e95824 feat: Replace path stripping with variable 
This commit removes the automatic path stripping and replaces it with a
user configurable environment variable. This can be set individually for
each container.
 2022-02-24 15:08:17 +01:00
Alexander LieretandNicolas Duchon 9df330e51e feat: Add user customizable default root response 2022-02-24 15:08:15 +01:00
Nicolas Duchon 28c73e5b52 fix: non working https with virtual path 2022-02-24 15:07:49 +01:00
Rafael KrautandNicolas Duchon dad4a2d7bf docs: remove unnecessary word 2022-02-24 15:07:49 +01:00
Nicolas Duchon 9cd85f61d5 build: build and push the dev branch to Dockerhub 2022-02-24 15:07:47 +01:00
Greg SymonsNicolas DuchonJosh TrowAdrianRodrigo AguileraAlexander Lieret
 		e0e1732842 docs: Add documentation for path-based routing 
Co-authored-by: Josh Trow <josh.trow@gmail.com>
Co-authored-by: Adrian <WolfspiritM@users.noreply.github.com>
Co-authored-by: Rodrigo Aguilera <hi@rodrigoaguilera.net>
Co-authored-by: Alexander Lieret <alexander.lieret@fau.de>
 2022-02-24 15:07:02 +01:00
Alexander LieretandNicolas Duchon fc4c4e17ca ci: Add tests for the virtual-path routing 
@gregsymons test cases were too outdated to be ported easily. The new
tests should include the coverage of the old ones.
 2022-02-24 15:07:02 +01:00
Greg SymonsNicolas DuchonJosh TrowAdrianRodrigo AguileraAlexander Lieret
 		2901b917a0 feat: support for path-based routing 
Co-authored-by: Josh Trow <josh.trow@gmail.com>
Co-authored-by: Adrian <WolfspiritM@users.noreply.github.com>
Co-authored-by: Rodrigo Aguilera <hi@rodrigoaguilera.net>
Co-authored-by: Alexander Lieret <alexander.lieret@fau.de>
 2022-02-24 15:06:57 +01:00
Nicolas Duchon b6e9cdc065 ci: use docker-gen main on dev branch tests 2022-02-24 15:05:52 +01:00
Nicolas DuchonandGitHub 9cdb8047bf Merge pull request #1895 from seitenwerke/feature/add-container-logs 
Add container logs in case testcontainer exited unexpectedly
 2022-02-22 08:41:29 +01:00
Robin Windey 18027fa71b Add container logs in case testcontainer exited unexpectedly 2022-02-20 15:10:05 +01:00
Nicolas DuchonandGitHub 3670d39b71 docs: xip.io -> nip.io 2022-02-15 11:12:52 +01:00
Nicolas DuchonandGitHub 4c622708bd Merge pull request #1888 from nathanweeks/patch-1 
Fix path to default.conf in README.md
 2022-02-14 16:19:33 +01:00
Nicolas DuchonandGitHub 15e33a3de5 docs: suggest alternatives to xip.io 
Fixes #1887
 2022-02-14 16:18:25 +01:00
Nathan WeeksandGitHub 098e551c35 Fix path to default.conf in README.md 2022-02-14 07:42:46 -05:00
Nicolas DuchonandGitHub fdc90a49be Merge pull request #1886 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.0.1 
chore(deps): bump pytest from 7.0.0 to 7.0.1 in /test/requirements
 2022-02-14 09:07:18 +01:00
dependabot[bot]andGitHub 42535c01d9 chore(deps): bump pytest from 7.0.0 to 7.0.1 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.0.0 to 7.0.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.0.0...7.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-14 04:20:00 +00:00
Nicolas DuchonandGitHub f70d81be66 Merge pull request #1882 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.0.0 
chore(deps): bump pytest from 6.2.5 to 7.0.0 in /test/requirements
 2022-02-07 09:05:41 +01:00
dependabot[bot]andGitHub dc8094daf5 chore(deps): bump pytest from 6.2.5 to 7.0.0 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 6.2.5 to 7.0.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/6.2.5...7.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-02-07 04:23:26 +00:00
Nicolas DuchonandGitHub dbdf7d70e4 Merge pull request #1875 from nginx-proxy/dependabot/docker/nginx-1.21.6 
chore(deps): bump nginx from 1.21.5 to 1.21.6
 2022-02-03 12:40:55 +01:00
dependabot[bot]andGitHub 2671ef4aef chore(deps): bump nginx from 1.21.5 to 1.21.6 
Bumps nginx from 1.21.5 to 1.21.6.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-26 04:07:38 +00:00
Nicolas Duchon 42c8b0c4c9 CI: replace maintainer label w/ OCI authors label 2022-01-14 14:39:33 +01:00
Nicolas Duchon 0ff39b804c ci: use git describe for OCI image version label 2022-01-14 14:29:03 +01:00
Nicolas Duchon 2daa09ff21 ci: upgrade to docker/metadata-action@v3 2022-01-14 14:17:21 +01:00
Nicolas DuchonandGitHub b411a84a59 docs: update issue template 2022-01-14 13:38:23 +01:00
Nicolas DuchonandGitHub 54dd5d1ef0 Merge pull request #1865 from nginx-proxy/container-version 
Add and display nginx-proxy version
 2022-01-13 12:22:08 +01:00
Nicolas Duchon dbca945a8f ci: add nginx-proxy version to image on build 2022-01-12 11:26:20 +01:00
Nicolas Duchon e22ae4a6fd tests: display container version 2022-01-12 10:17:49 +01:00
Nicolas Duchon fbf37456d0 feat: display container version 2022-01-11 22:38:30 +01:00
Nicolas Duchon fde0e809e4 chore: jwilder/docker-gen > nginx-proxy/docker-gen 2022-01-11 19:55:29 +01:00
Nicolas Duchon 679c971a19 docs: update maintainers list on license 2022-01-11 19:46:42 +01:00
Nicolas DuchonandGitHub 53ef90a2f6 docs: nginx badge 1.21.4 -> 1.21.5 2022-01-06 17:12:36 +01:00
Nicolas DuchonandGitHub ed7b17d9d7 Merge pull request #1856 from polarathene/tests/fix-container-networking 
tests: Fix pytest container networking issues
 2022-01-06 10:32:40 +01:00
Nicolas DuchonandGitHub 6260c0265e Merge pull request #1858 from nginx-proxy/dependabot/pip/test/requirements/requests-2.27.1 
chore(deps): bump requests from 2.26.0 to 2.27.1 in /test/requirements
 2022-01-06 10:24:17 +01:00
dependabot[bot]andGitHub b9ac4b936e chore(deps): bump requests from 2.26.0 to 2.27.1 in /test/requirements 
Bumps [requests](https://github.com/psf/requests) from 2.26.0 to 2.27.1.
- [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.26.0...v2.27.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2022-01-06 04:21:32 +00:00
Nicolas DuchonandGitHub 780744f231 Merge pull request #1853 from nginx-proxy/dependabot/docker/nginx-1.21.5 
chore(deps): bump nginx from 1.21.4 to 1.21.5
 2021-12-31 13:58:44 +01:00
polarathene 6b3ee66783 chore: white-space housekeeping 
Noticed some trailing white-space. Removed for consistency with the rest of the file.
 2022-01-01 01:39:51 +13:00
polarathene 115461744b fix: Skip IPv6 when forced but not available + avoid none network 
A test on raw IP addresses doesn't reach the existing IPv6 skip logic, added that to avoid a test failing when only IPv4 is available (eg: standard docker container networks).

Additionally some other tests set the `none` network and connecting to this fails as it's not allowed? Preventing that from happening resolves the final failing tests within containerized pytest.
 2022-01-01 01:38:13 +13:00
Nicolas DuchonandGitHub a96135b74d Merge pull request #1848 from polarathene/tests/dhparam-followup 
tests: Revise DH param tests
 2021-12-31 13:27:50 +01:00
polarathene 04b0181980 fix: Ensure networks are actually connected to pytest container 
The `network` object would never be in a list of network names (strings), and without `greedy=True` arg as the `docker-py` API docs note, the containers will not be part of the results, thus always returning an empty list which was not intended..

Now the network will properly match the current networks for pytest container, avoiding duplicate connect attempts, and the network list result will actually have containers to count when filtering by length.
 2021-12-31 22:30:49 +13:00
polarathene 0e5d97a268 fix: Don't connect pytest container to networks when using host network 
This is not compatible or required, since host networking is no longer isolated to container networks only.
 2021-12-31 22:14:26 +13:00