mirror/nginx-proxy
1
0
Fork 0
mirror of https://github.com/nginx-proxy/nginx-proxy synced 2024-09-16 17:01:51 +02:00
Code Issues
1,318 Commits 10 Branches 32 Tags 24 MiB
main
Commit Graph

1318 Commits

This Branch
This Branch
All Branches
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
Nicolas Duchon
8e2642909e
Merge pull request #2445 from pini-gh/pini-disambiguate 
build: disambiguate base image names
 2024-05-08 21:17:59 +02:00
Gilles Filippini
5b1491f464 build: disambiguate base image names 
to build with podman / buildah.
 2024-05-08 19:54:59 +02:00
Nicolas Duchon
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
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
Nicolas Duchon
ec405f31d7
Merge pull request #2078 from KagurazakaNyaa/main 
Support TCP and UDP proxy
 2024-05-08 13:41:31 +02:00
KagurazakaNyaa
12c4f0c7c2 Support TCP and UDP proxy 2024-05-06 18:55:35 +02:00
Nicolas Duchon
be319e6629
docs: typo 
Co-authored-by: Niek <100143256+SchoNie@users.noreply.github.com>
 2024-05-06 15:34:51 +02:00
Nicolas Duchon
99645f104d
docs: typo 2024-05-06 14:40:32 +02:00
Nicolas Duchon
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
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
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
Gilles Filippini
87e5b58b77
feat: multiports support using yaml syntax 
(See nginx-proxy/nginx-proxy#1504)

Using variable VIRTUAL_HOST_MULTIPORTS as a dictionnary:

key: hostname
value: dictionnary:
  key: path
  value: struct
    port
    dest

When the dictionnary associated with a hostname is empty, default values
apply:
  path = "/"
  port = default port
  dest = ""

For each path entry, port and dest are optionnal and are assigned default
values when missing.

Example:
      VIRTUAL_HOST_MULTIPORTS: |
        host1.example.org:
          "/":
            port: 8000
          "/somewhere":
            port: 9000
            dest: "/elsewhere"
        host2.example.org:
        host3.example.org:
          "/inner/path":
 2024-05-05 16:15:26 +02:00
Nicolas Duchon
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
dependabot[bot]
340f6b0c08
build: bump nginxproxy/docker-gen from 0.12.1-debian to 0.13.0-debian 
Bumps nginxproxy/docker-gen from 0.12.1-debian to 0.13.0-debian.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-05 14:02:17 +00:00
Nicolas Duchon
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 Duchon
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
dependabot[bot]
08f563888d
build: bump nginxproxy/docker-gen from 0.12.0-debian to 0.12.1-debian 
Bumps nginxproxy/docker-gen from 0.12.0-debian to 0.12.1-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>
 2024-05-03 10:49:23 +00: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
Nicolas Duchon
e46e62e660
Merge pull request #2433 from SchoNie/docs-urls 
docs: url fixes
 2024-05-03 11:32:25 +02:00
Niek
877f243ce2 docs: url fixes 
Fix 404 to docker-entrypoint.sh
Add hyperlink to nginx.tmpl reference.
 2024-05-03 11:19:07 +02:00
Nicolas Duchon
43b8ab82a9
Merge pull request #2432 from SchoNie/webserver-syntaxwarning-fix 
fix: tests webserver syntaxwarning
 2024-05-03 11:08:46 +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
Nicolas Duchon
1e55d9883f
Merge pull request #2429 from nginx-proxy/docs-qol 
docs: redordering, grouping and navigation
 2024-05-02 17:51:05 +02:00
Nicolas Duchon
2ac4540a0d
docs: redordering, grouping and navigation 2024-05-02 15:28:24 +02:00
Nicolas Duchon
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
dependabot[bot]
559c43e75e build: bump nginx from 1.25.4 to 1.26.0 
Bumps nginx from 1.25.4 to 1.26.0.

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

Signed-off-by: dependabot[bot] <support@github.com>
 2024-05-01 13:38:32 +02:00
Nicolas Duchon
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
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
Nicolas Duchon
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 Duchon
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 Duchon
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