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

318 Commits

Author SHA1 Message Date
Gilles Filippini
6c1b532ffb Improve acme-challenge handling 
So that there is no need anymore for the Let's Encrypt companion to fiddle
with vhosts nginx configuration.

When `HTTPS_METHOD=nohttp` and the certificate is missing, enforce nohttp
instead of switching to `HTTPS_METHOD=redirect`.
 2024-05-13 21:10:48 +02:00
Nicolas Duchon
db07d90ad8
Merge pull request #2434 from nginx-proxy/multiport-support 
feat: multiport support
 2024-05-09 12:29:00 +02:00
Gilles Filippini
59d5293480 fix 'requirements' path in test/test_build.py 
Without this patch the test fails when run from project base directory.
 2024-05-08 18:30:11 +02:00
Povilas Kanapickas
d6c38a0bab tests: Add tests for how Let's Encrypt ACME challenge is handled 
At the moment no changes to functionality are done, only the current
behavior is captured.
 2024-05-06 13:07:04 +03:00
Nicolas Duchon
1bf7eff04f
test: multiport merge with legacy variable 2024-05-05 20:45:43 +02:00
Nicolas Duchon
9a76577ebc
style: shellcheck linting 2024-05-05 16:31:50 +02:00
Nicolas Duchon
1b97b11173
test: use python:3-alpine as base for the web image 2024-05-05 16:31:32 +02:00
Nicolas Duchon
d80ca7ec36
test: json syntax for multiports variable 2024-05-05 16:15:28 +02:00
Nicolas Duchon
53e9a03ac9
feat: print warning on unparsable VIRTUAL_HOST_MULTIPORTS 2024-05-05 16:15:28 +02:00
Nicolas Duchon
47e2838e61
refactor: rename VIRTUAL_HOST_YAML -> VIRTUAL_HOST_MULTIPORTS 2024-05-05 16:15:27 +02:00
Nicolas Duchon
216eae9f70
test: multiports base test 2024-05-05 16:15:27 +02:00
Nicolas Duchon
62212186eb
test: re-organize test files 2024-05-05 16:15:27 +02:00
Nicolas Duchon
6602769d9a
style: linting 2024-05-03 12:37:53 +02:00
Niek
c678cfdddf
Apply suggestions from code review 
Commited code style consistency suggestions.

Co-authored-by: Nicolas Duchon <nicolas.duchon@gmail.com>
 2024-05-03 12:09:40 +02:00
Niek
46724e7cb6 tests: add test if nginx-proxy-builder can be build successfully 2024-05-03 11:36:50 +02:00
Niek
12d639dad7 Change to raw string literal 
To fix:
/webserver.py:17: SyntaxWarning: invalid escape sequence '\d'
  elif re.match("/status/(\d+)", self.path):
/webserver.py:18: SyntaxWarning: invalid escape sequence '\d'
  result = re.match("/status/(\d+)", self.path)
 2024-05-03 10:49:15 +02:00
dependabot[bot]
103cb7d4ca
ci: bump pytest from 8.1.1 to 8.2.0 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.1 to 8.2.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/8.1.1...8.2.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-04-29 04:03:15 +00:00
dependabot[bot]
6441daf25b
ci: bump pytest from 8.1.0 to 8.1.1 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.1.0 to 8.1.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/8.1.0...8.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-11 04:19:22 +00:00
dependabot[bot]
12e1360fc3
ci: bump pytest from 8.0.2 to 8.1.0 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.2 to 8.1.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/8.0.2...8.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-03-04 04:52:02 +00:00
dependabot[bot]
2a5521625d
ci: bump pytest from 8.0.1 to 8.0.2 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 8.0.1 to 8.0.2.
- [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.0.1...8.0.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-26 04:49:11 +00:00
Nicolas Duchon
9d2eeb7273
Merge pull request #2399 from nginx-proxy/dependabot/pip/test/requirements/pytest-8.0.1 
ci: bump pytest from 7.4.4 to 8.0.1 in /test/requirements
 2024-02-21 17:55:46 +01:00
Niek
a9f8a9c32a htpasswd tests 2024-02-21 08:34:38 +01:00
Niek
4464269c51 remove obsolete stress-test 2024-02-20 15:21:09 +01:00
dependabot[bot]
0dd4f7a8a8
ci: bump pytest from 7.4.4 to 8.0.1 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.4 to 8.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.4.4...8.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-02-19 04:53:15 +00:00
Nicolas Duchon
e75c2dfb79
build: revert nginx to 1.25.3 (#2396) 
* Revert "build: update docs and tests with nginx 1.25.4"

This reverts commit d9b1751f9763e8d29e166f61c7c8966a52d3e129.

* Revert "build: bump nginx from 1.25.3 to 1.25.4"

This reverts commit 1aef017df2dac59659ed2fb1402e181091141959.
 2024-02-15 09:50:12 +01:00
Nicolas Duchon
d9b1751f97
build: update docs and tests with nginx 1.25.4 2024-02-15 08:40:46 +01:00
Niek
cb59c24470
tests non standard port Host header 2024-02-13 15:24:37 +01:00
Nicolas Duchon
25883ac05f
style: remove extra blank lines 2024-02-10 19:04:56 +01:00
Nicolas Duchon
8aefce916f
tests: fix the json log test compose files 2024-02-10 18:02:42 +01:00
Denis Arh
de9809a9e5 Add more control over log_format config directive 
Introduces 3 new environmental variables:
 - `LOG_FORMAT`
 - `LOG_FORMAT_ESCAPE`
 - `LOG_JSON`

`LOG_FORMAT` and `LOG_FORMAT_ESCAPE` default to standard values.
When `LOG_JSON` is set, defaults are changed to: `{"time_local":"$time_iso8601","client_ip":"$http_x_forwarded_for","remote_addr":"$remote_addr","request":"$request","status":"$status","body_bytes_sent":"$body_bytes_sent","request_time":"$request_time","upstream_response_time":"$upstream_response_time","upstream_addr":"$upstream_addr","http_referrer":"$http_referer","http_user_agent":"$http_user_agent","request_id":"$request_id"}`and `json`.

See `nginx.tmpl` and https://nginx.org/en/docs/http/ngx_http_log_module.html#log_format for details
 2024-02-10 17:39:16 +01:00
Nicolas Duchon
6f042854e1
Merge pull request #2364 from nginx-proxy/keepalive 
feat: keepalive auto setting
 2024-01-13 11:40:45 +01:00
Niek
329b69fe76
Update test readme 2024-01-05 14:33:05 +01:00
Niek
1433daed4d
Install docker dependencies in nginx-proxy-tester image 2024-01-05 14:32:11 +01:00
dependabot[bot]
e2bd0d6365
ci: bump pytest from 7.4.3 to 7.4.4 in /test/requirements 
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.4.3 to 7.4.4.
- [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.4.3...7.4.4)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-01-01 04:39:54 +00:00
Nicolas Duchon
2aa35aa637 tests: keepalive auto setting 2023-12-26 19:07:09 +01:00
Nicolas Duchon
443ee5202c test: do we get desired number of idle keepalive connections 2023-12-26 18:52:43 +01:00
Nicolas Duchon
a4ced5b8bd test: revert "Fix test" and "Sleep longer" 
This reverts commit 51744959634af2b0bec2a3080b1762d72a82e9c5.
This reverts commit 33ceec07d82e2671d4bee144931b1811323497c0.
 2023-12-24 00:16:40 +01:00
Niek
33ceec07d8
Sleep longer 2023-12-22 17:50:09 +01:00
Niek
5174495963
Fix test 2023-12-22 17:19:42 +01:00
Niek
c338a7cf22
Color terminal output 2023-12-22 14:37:20 +01:00
Gilles Filippini
9e77e81e7d Tests: support custom 'docker compose' command 
Enable overriding default 'docker compose' command with environment variable
'DOCKER_COMPOSE'. This way docker compose v1 is still supported with:

  $ DOCKER_COMPOSE=docker-compose pytest

This is important because people using the Debian packaged docker compose
are stuck to v1.
 2023-12-20 09:30:06 +01:00
Gilles Filippini
5d2f51dfe2 Fix test case assertion depending on python version 2023-12-19 21:31:19 +01:00
Nicolas Duchon
7d44f98e4f
test: remove unused import 2023-12-12 22:16:32 +01:00
dependabot[bot]
c1617a6fac
ci: bump docker from 6.1.3 to 7.0.0 in /test/requirements 
Bumps [docker](https://github.com/docker/docker-py) from 6.1.3 to 7.0.0.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](https://github.com/docker/docker-py/compare/6.1.3...7.0.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-12 21:07:53 +00:00
Nicolas Duchon
c4cf0af373 test: fix failing tests 2023-12-12 21:56:27 +01:00
Nicolas Duchon
060f09cfce ci: ensure all compose files are valid compose v2 + formatting 2023-12-12 21:56:27 +01:00
Nicolas Duchon
b5cac06305 ci: remove python docker-compose 2023-12-12 21:56:24 +01:00
Nicolas Duchon
c4cb1c3797
test: tests for HTTP/3 
Co-authored-by: Nicolas Duchon <nicolas.duchon@gmail.com>
Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
 2023-12-08 00:48:08 +01:00
Nicolas Duchon
7ca3769a39
Merge pull request #2322 from nginx-proxy/dependabot/docker/nginx-1.25.3-alpine 
build: bump nginx from 1.25.2-alpine to 1.25.3-alpine
 2023-12-08 00:47:06 +01:00
dependabot[bot]
3f764a5f84
build: bump nginx from 1.25.2-alpine to 1.25.3-alpine 
Bumps nginx from 1.25.2-alpine to 1.25.3-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2023-12-08 00:28:25 +01:00