thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-02-24 17:58:16 +00:00
Code Issues Releases Wiki Activity
1,414 Commits 3 Branches 6 Tags
Commit Graph

1414 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Duchon
b6e9cdc065
ci: use docker-gen main on dev branch tests 2022-02-24 15:05:52 +01:00
Nicolas Duchon
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 Duchon
3670d39b71
docs: xip.io -> nip.io 2022-02-15 11:12:52 +01:00
Nicolas Duchon
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 Duchon
15e33a3de5
docs: suggest alternatives to xip.io 
Fixes #1887
 2022-02-14 16:18:25 +01:00
Nathan Weeks
098e551c35
Fix path to default.conf in README.md 2022-02-14 07:42:46 -05:00
Nicolas Duchon
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]
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 Duchon
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]
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 Duchon
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]
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 Duchon
b411a84a59
docs: update issue template 2022-01-14 13:38:23 +01:00
Nicolas Duchon
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 Duchon
53ef90a2f6
docs: nginx badge 1.21.4 -> 1.21.5 2022-01-06 17:12:36 +01:00
Nicolas Duchon
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 Duchon
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]
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 Duchon
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 Duchon
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
polarathene
b2b4c71997 fix: Don't remove pytest container when running with host network mode 
When the container runs with host networking instead of the default bridge, the `$HOSTNAME` / `/etc/hostname` reflects that of the host instead of the container ID , which causes the pytest container to get removed accidentally.

Using a container name instead we can more reliably target the container to avoid removing it, should we need to run with host networking instead.
 2021-12-31 22:12:25 +13:00
polarathene
e748d53a1f chore: Extract hostname access to a var 
DRY and clearer that we're referring to the pytest container.
 2021-12-31 21:51:40 +13:00
polarathene
93c04dce8d fix: Properly detect pytest running via container 
The original `/.dockerenv` approach is no longer valid, and context wise we're only using this for the test suite, so using an ENV in that container is a better solution.
 2021-12-31 21:42:38 +13:00
dependabot[bot]
0493e799f4
chore(deps): bump nginx from 1.21.4 to 1.21.5 
Bumps nginx from 1.21.4 to 1.21.5.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2021-12-30 04:08:35 +00:00
polarathene
c5166f580e tests: Add utility method to verify TLS chain of trust 2021-12-21 18:44:51 +13:00
polarathene
9dc9d90d34 tests: Verify site-specific DH params feature works correctly 
This addition requires usage of `DEFAULT_HOST` on containers tested to ensure they don't accidentally use `web2` as their default fallback (due to no SNI / `-servername` requested in openssl queries), otherwise they would be testing against the incorrect DH params response.

They could alternatively request an FQDN explicitly as well, instead of relying on implicit fallback/default server selection behaviour.

---

`web2.nginx-proxy.tld.dhparam.pem` is a copy of `ffdhe2048.pem`.
 2021-12-21 18:41:43 +13:00
polarathene
0f15130476 tests: Verify correct DH group size when negotiating 
Additionally allows for adding extra openssl params when needed.
 2021-12-21 18:41:43 +13:00
polarathene
75528bdfcb chore: Refactor checksum comparisons 
- Use a DRY method instead.
- ENV test changed from 2048-bit to 3072-bit to avoid confusion in a future test that should not be mixed up accidentally with 2048-bit elsewhere.
- Custom DH file test comparison changed to match other comparisons for equality against the expected DH param content.
- Related comments revised, additional comment for context added by the test definition.
- Minor white-space adjustments.
 2021-12-21 18:41:43 +13:00
Nicolas Duchon
7c02ff637a
Merge pull request #1843 from nginx-proxy/nginx-1.21.4 
Bump nginx to 1.21.4
 2021-12-15 14:02:25 +01:00
Nicolas Duchon
496e0f5f27
tests: mark test_deleted_cert as xfail 
test_delete_cert_and_restart_reverseproxy still fails intermitently
 2021-12-15 13:01:38 +01:00
Nicolas Duchon
8c909e7d11
build: nginx 1.21.3 -> 1.21.4 2021-12-15 11:53:37 +01:00
Nicolas Duchon
d29a53dc1f
Merge pull request #1807 from ucyang/pr/remove-tab 
Remove unnecessary tabs
 2021-12-11 16:08:30 +01:00
Nicolas Duchon
a5eaf29c33
Merge pull request #1819 from HPPinata/main 
Clarify grammar in DH-GROUP section
 2021-11-05 17:39:39 +01:00
HPPinata
bbdee361f1
Clarify grammar in DH-GROUP section 
Since the second option got removed, the "either" makes no sense any more and may lead to confusion about non existent alternatives
 2021-11-04 21:45:10 +01:00
Unchun Yang
0780e636f9
Remove unnecessary tabs 2021-10-23 00:08:32 +09:00
Nicolas Duchon
83e3b25c46
Merge pull request #1797 from polarathene/feat/prefer-rfc-7919-dhparams 
feat: Use RFC 7919 DH groups + Remove DH generation
 2021-10-21 08:35:39 +02:00
Nicolas Duchon
36c4ed7632
test: replace test dhparam.pem with ffdhe3072.pem 2021-10-20 21:04:29 +02:00