thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2026-08-15 10:32:48 +00:00
Code Issues Releases Wiki Activity
1,268 Commits 3 Branches 6 Tags
6c1b532ffb4cd732d99a59f753e4f77deac4a157
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas DuchonandGitHub db07d90ad8 Merge pull request #2434 from nginx-proxy/multiport-support 
feat: multiport support
 2024-05-09 12:29:00 +02:00
Nicolas DuchonandGitHub 8e2642909e Merge pull request #2445 from pini-gh/pini-disambiguate 
build: disambiguate base image names
 2024-05-08 21:17:59 +02:00
Nicolas DuchonandGitHub fc02a5ae38 Merge pull request #2444 from pini-gh/pini-fix-test-test_build.py 
fix 'requirements' path in test/test_build.py
 2024-05-08 19:31:01 +02:00
Nicolas DuchonandGitHub ec405f31d7 Merge pull request #2078 from KagurazakaNyaa/main 
Support TCP and UDP proxy
 2024-05-08 13:41:31 +02:00
Nicolas DuchonGitHubNiek
 		be319e6629 docs: typo 
Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
 2024-05-06 15:34:51 +02:00
Nicolas DuchonandGitHub 99645f104d docs: typo 2024-05-06 14:40:32 +02:00
Nicolas DuchonandGitHub f964176106 Merge pull request #2438 from p12tic/test-acme-challenge 
tests: Add tests for how Let's Encrypt ACME challenge is handled
 2024-05-06 12:19:29 +02:00
Nicolas Duchon 1bf7eff04f test: multiport merge with legacy variable 2024-05-05 20:45:43 +02:00
Nicolas DuchonandGitHub c4c65a4441 Merge pull request #2440 from nginx-proxy/web-image-alpine 
test: use python alpine variant as base for web image
 2024-05-05 17:48:43 +02:00
Nicolas Duchon be7c4c8c85 fix: do not discard containers without VIRTUAL_PATH 
For containers grouped by identical VIRTUAL_HOST,
those with no VIRTUAL_PATH variable were silently discarded
when at least one container with VIRTUAL_PATH existed.
 2024-05-05 16:36:04 +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 8b91f09a9b docs: use examples closer to real life scenarios 2024-05-05 16:15:28 +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 0baff189bc refactor: get rid of get_path_info template 2024-05-05 16:15:28 +02:00
Nicolas Duchon 8359aa2089 docs: documentation for multiports support 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 62d9c08474 fix: default values if port and dest are missing 2024-05-05 16:15:27 +02:00
Nicolas Duchon fc98f4c953 refactor: cleanup template 2024-05-05 16:15:27 +02:00
Nicolas DuchonandGitHub 6e771fb3be Merge pull request #2439 from nginx-proxy/dependabot/docker/nginxproxy/docker-gen-0.13.0-debian 
build: bump nginxproxy/docker-gen from 0.12.1 to 0.13.0
 2024-05-05 16:15:02 +02:00
Nicolas DuchonandGitHub 2ac4509a61 Merge pull request #2436 from nginx-proxy/dependabot/docker/nginxproxy/docker-gen-0.12.1-debian 
build: bump nginxproxy/docker-gen from 0.12.0 to 0.12.1
 2024-05-03 12:57:21 +02:00
Nicolas DuchonandGitHub b4bceac3fd Merge pull request #2435 from SchoNie/nginx-proxy-tester 
tests: add test if nginx-proxy-builder can be build successfully
 2024-05-03 12:56:53 +02:00
Nicolas DuchonandGitHub 6602769d9a style: linting 2024-05-03 12:37:53 +02:00
Nicolas DuchonandGitHub e46e62e660 Merge pull request #2433 from SchoNie/docs-urls 
docs: url fixes
 2024-05-03 11:32:25 +02:00
Nicolas DuchonandGitHub 43b8ab82a9 Merge pull request #2432 from SchoNie/webserver-syntaxwarning-fix 
fix: tests webserver syntaxwarning
 2024-05-03 11:08:46 +02:00
Nicolas DuchonandGitHub 1e55d9883f Merge pull request #2429 from nginx-proxy/docs-qol 
docs: redordering, grouping and navigation
 2024-05-02 17:51:05 +02:00
Nicolas DuchonandGitHub 2ac4540a0d docs: redordering, grouping and navigation 2024-05-02 15:28:24 +02:00
Nicolas DuchonandGitHub 769d58bcfb Merge pull request #2425 from nginx-proxy/dependabot/docker/nginx-1.26.0 
build: bump nginx from 1.25.4 to 1.26.0
 2024-05-01 13:47:35 +02:00
Nicolas Duchon 766db8d942 docs: update nginx version badge 2024-05-01 13:38:32 +02:00
Nicolas DuchonandGitHub 0d7aac7c53 Merge pull request #2428 from nginx-proxy/dependabot/pip/test/requirements/pytest-8.2.0 
ci: bump pytest from 8.1.1 to 8.2.0 in /test/requirements
 2024-05-01 13:25:05 +02:00
Nicolas DuchonandGitHub 94fb8459cd Merge pull request #2410 from pini-gh/pini-refactor-template-3 
refactor: add 'ports' dict to the data structure
 2024-03-12 21:35:11 +01:00
Nicolas DuchonandGitHub c7bf75609b Merge pull request #2411 from nginx-proxy/dependabot/pip/test/requirements/pytest-8.1.1 
ci: bump pytest from 8.1.0 to 8.1.1 in /test/requirements
 2024-03-12 21:12:40 +01:00
Nicolas DuchonandGitHub 3c3b3675c1 Merge pull request #2413 from Huge/patch-1 
Update README.md to use 1.5 version and link DockerHub
 2024-03-12 21:11:50 +01:00
Nicolas DuchonandGitHub 26b0a0008b Merge pull request #2408 from nginx-proxy/dependabot/pip/test/requirements/pytest-8.1.0 
ci: bump pytest from 8.0.2 to 8.1.0 in /test/requirements
 2024-03-04 22:06:21 +01:00
Nicolas DuchonandGitHub 4b38bf259d Merge pull request #2405 from nginx-proxy/refactor-template-2 
refactor: template internal data structure
 2024-03-04 22:03:30 +01:00
Nicolas DuchonGitHubNiek
 		b09575297d docs: typo in comments 
Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
 2024-02-27 13:27:11 +01:00
Nicolas DuchonGitHubpini-gh
 		418f1a3cd0 fix: don't re-assign variable 
Co-authored-by: pini-gh <pini@debian.org>
 2024-02-27 13:20:39 +01:00
Nicolas DuchonandGitHub 60618afe52 Merge pull request #2407 from nginx-proxy/dependabot/pip/test/requirements/pytest-8.0.2 
ci: bump pytest from 8.0.1 to 8.0.2 in /test/requirements
 2024-02-26 08:20:17 +01:00
Nicolas DuchonandGitHub b8b53794bf Merge pull request #2406 from nginx-proxy/dependabot/docker/nginxproxy/docker-gen-0.12.0-debian 
build: bump nginxproxy/docker-gen from 0.11.2 to 0.12.0
 2024-02-25 11:51:11 +01:00
Nicolas DuchonandGitHub f960061e2d Merge pull request #2404 from nginx-proxy/network-host 
docs: add comment about host network to compose example
 2024-02-25 10:01:02 +01:00
Nicolas Duchon e97be61272 refactor: refactor virtual paths 2024-02-24 21:51:50 +01:00
Nicolas Duchon 4d9d067630 refactor: refactor virtual hosts 2024-02-24 21:51:38 +01:00
Nicolas DuchonandGitHub 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
Nicolas DuchonandGitHub 24592e39a3 Merge pull request #2402 from SchoNie/htpasswd-tests 
tests: htpasswd
 2024-02-21 08:42:56 +01:00
Nicolas DuchonandGitHub da006557d0 Merge pull request #2400 from SchoNie/tests-remove-obsolete 
tests: remove obsolete stress-test
 2024-02-21 08:33:58 +01:00
Nicolas DuchonandGitHub b4902f145d Merge pull request #2401 from SchoNie/docs-htpasswd-readability 
docs: htpasswd readability
 2024-02-19 22:42:24 +01:00
Nicolas DuchonandGitHub a2a441e1db docs: update nginx badge 2024-02-18 10:08:23 +01:00
Nicolas DuchonandGitHub 5a32bffd6f Merge pull request #2398 from nginx-proxy/dependabot/docker/nginx-1.25.4 
build: bump nginx from 1.25.3 to 1.25.4
 2024-02-18 09:56:22 +01:00
Nicolas DuchonandGitHub 745a2035cf Merge pull request #2397 from whomobile/patch-1 
fix typo README.md
 2024-02-16 10:59:15 +01:00
Nicolas DuchonandGitHub e75c2dfb79 build: revert nginx to 1.25.3 (#2396) 
* Revert "build: update docs and tests with nginx 1.25.4"

This reverts commit d9b1751f97.

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

This reverts commit 1aef017df2.
 2024-02-15 09:50:12 +01:00
Nicolas DuchonandGitHub 020b993654 Merge pull request #2395 from nginx-proxy/dependabot/docker/nginx-1.25.4 
build: bump nginx from 1.25.3 to 1.25.4
 2024-02-15 08:54:52 +01:00
Nicolas Duchon 5583b385cb style: docs linting 2024-02-15 08:41:11 +01:00
Nicolas Duchon d9b1751f97 build: update docs and tests with nginx 1.25.4 2024-02-15 08:40:46 +01:00
Nicolas DuchonandGitHub 5c0c8c93d8 Merge pull request #2393 from SchoNie/tests-nonstandardport-hostheader 
tests: non standard port Host header check
 2024-02-13 18:23:14 +01:00
Nicolas DuchonandGitHub 887e2e950c Merge pull request #2390 from nginx-proxy/dependabot/docker/nginxproxy/docker-gen-0.11.2-debian 
build: bump nginxproxy/docker-gen from 0.11.1 to 0.11.2
 2024-02-10 19:25:13 +01:00
Nicolas DuchonandGitHub f47c874c5a Merge pull request #2197 from darh/json_log_format 
Add more control over log_format config directive
 2024-02-10 19:16:11 +01:00
Nicolas Duchon 25883ac05f style: remove extra blank lines 2024-02-10 19:04:56 +01:00
Nicolas Duchon 62f55b4428 docs: add logging documentation 2024-02-10 19:03:13 +01:00
Nicolas Duchon 76778cebb1 refactor: parse LOG_JSON as boolean + avoid unnecessary backticks 2024-02-10 18:40:18 +01:00
Nicolas Duchon 8aefce916f tests: fix the json log test compose files 2024-02-10 18:02:42 +01:00
Nicolas DuchonandGitHub e50429e87e Merge pull request #2389 from nginx-proxy/2300 
feat: define basic auth for virtual path
 2024-02-10 16:33:27 +01:00
Nicolas DuchonandGitHub df890def7c Merge pull request #2388 from nginx-proxy/2386 
fix: add non standard port to Host header
 2024-02-10 16:06:46 +01:00
Nicolas Duchon 40a347bfae fix: add non standard port to Host header 2024-02-10 15:23:35 +01:00
Nicolas DuchonandGitHub af56ba2254 Merge pull request #2387 from nginx-proxy/1780 
fix: set worker_rlimit_nofile to (worker_connections x 2)
 2024-02-10 14:17:40 +01:00
Nicolas Duchon 5d10467c42 fix: set worker_rlimit_nofile to (worker_connections x 2) 2024-02-10 13:56:38 +01:00
Nicolas DuchonandGitHub 3d61f47b54 Merge pull request #2383 from lysliu/patch-1 
Add s390x support
 2024-02-01 11:19:41 +01:00
Nicolas DuchonandGitHub e8d95764fb Merge pull request #2381 from nginx-proxy/dependabot/github_actions/peter-evans/dockerhub-description-4 
ci: bump peter-evans/dockerhub-description from 3 to 4
 2024-01-29 19:59:23 +01:00
Nicolas DuchonandGitHub d46881fb58 Merge pull request #2321 from theFra985/patch-1 
Add support for grpcs protocol
 2024-01-16 18:59:45 +01:00
Nicolas DuchonandGitHub 6f042854e1 Merge pull request #2364 from nginx-proxy/keepalive 
feat: keepalive auto setting
 2024-01-13 11:40:45 +01:00
Nicolas DuchonandGitHub 14347a4178 Merge pull request #2372 from nginx-proxy/add-openssl-back 
build: add the openssl cli back to the alpine image
 2024-01-10 17:11:52 +01:00
Nicolas Duchon 63411b2407 build: add the openssl cli back to the alpine image 2024-01-10 17:00:47 +01:00
Nicolas DuchonandGitHub b492cae053 Merge pull request #2369 from SchoNie/nginx-proxy-tester-compose 
Install docker compose dependencies in nginx-proxy-tester image
 2024-01-05 17:44:31 +01:00
Nicolas DuchonandGitHub a3de83c7d1 Merge pull request #2365 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.4.4 
ci: bump pytest from 7.4.3 to 7.4.4 in /test/requirements
 2024-01-01 10:58:15 +01:00
Nicolas Duchon d12689cd52 docs: keepalive auto setting 2023-12-26 19:10:42 +01: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 d56e8f1d8a refactor: $server_found and $servers aren't both needed 2023-12-26 18:43:05 +01:00
Nicolas Duchon 7ce72d59a9 feat: add auto keepalive setting 2023-12-26 18:33:28 +01:00
Nicolas Duchon 26db13387e refactor: explicitely default keepalive to disabled 2023-12-26 17:58:24 +01:00
Nicolas DuchonandGitHub 35c6b2afe5 Merge pull request #2362 from nginx-proxy/dependabot/docker/nginxproxy/forego-0.18.1-debian 
build: bump nginxproxy/forego from 0.17.3 to 0.18.1
 2023-12-25 21:26:58 +01:00
Nicolas Duchon beeb80732a docs: mention color disabling 2023-12-25 21:19:02 +01:00
Nicolas DuchonandGitHub 53656ffe51 Merge pull request #2360 from nginx-proxy/dependabot/docker/nginxproxy/docker-gen-0.11.1-debian 
build: bump nginxproxy/docker-gen from 0.11.0 to 0.11.1
 2023-12-25 21:11:57 +01:00
Nicolas DuchonandGitHub 795cc1332b Merge pull request #2358 from nginx-proxy/proxy_buffering 
feat: enable proxy_buffering
 2023-12-25 20:45:51 +01:00
Nicolas DuchonandGitHub 4fbd14f1fd Merge pull request #2359 from nginx-proxy/cleanup-dockerfiles 
refactor: cleanup dockerfiles
 2023-12-25 20:22:37 +01:00
Nicolas Duchon eb9fca85cf refactor: remove already present or unneeded dependencies 2023-12-25 19:19:57 +01:00
Nicolas Duchon 758b43a5b2 refactor: remove unneeded nginx.conf modification 
the upstream nginx.conf already has "worker_processes  auto;"
 2023-12-25 19:18:00 +01:00
Nicolas Duchon de4cb3d2b0 refactor: move nginx daemon off to procfile 2023-12-25 19:16:10 +01:00
Nicolas Duchon 5c1db95551 feat: enable proxy_buffering 2023-12-25 17:27:34 +01:00
Nicolas DuchonandGitHub 4a8aa5db67 docs: fix two links in updated README.md 2023-12-25 11:27:22 +01:00
Nicolas DuchonandGitHub ac3131844f Merge pull request #2357 from nginx-proxy/split-docs 
docs: split documentation
 2023-12-25 11:24:43 +01:00
Nicolas Duchon 7f43f0a66b docs: split documentation 2023-12-25 11:22:47 +01:00
Nicolas DuchonandGitHub 18e788575d Merge pull request #2356 from nginx-proxy/revert-2355 
test: revert "Fix test" and "Sleep longer"
 2023-12-24 15:35:52 +01:00
Nicolas Duchon a4ced5b8bd test: revert "Fix test" and "Sleep longer" 
This reverts commit 5174495963.
This reverts commit 33ceec07d8.
 2023-12-24 00:16:40 +01:00
Nicolas DuchonandGitHub db27a07741 Merge pull request #2355 from SchoNie/fix-test_restart_while_missing_cert.py-xfails-xpass 
Fix xpass and xfails test_restart_while_missing_cert.py
 2023-12-23 22:27:46 +01:00
Nicolas DuchonandGitHub 39db465e65 Merge pull request #2354 from SchoNie/Pytest-color 
Pytest color terminal output
 2023-12-22 15:21:49 +01:00
Nicolas DuchonandGitHub 4f85eefa46 Merge pull request #2349 from pini-gh/pini-support-docker-compose-v1 
Tests: support custom 'docker compose' command
 2023-12-20 10:04:07 +01:00
Nicolas DuchonandGitHub a8478d10da Merge pull request #2350 from pini-gh/pini-support-more-python-versions 
Fix test case assertion depending on python version
 2023-12-19 22:54:42 +01:00