1
0
mirror of https://github.com/thib8956/nginx-proxy synced 2025-07-01 06:15:45 +00:00
Commit Graph

949 Commits

Author SHA1 Message Date
5aba125fb7 chore: do not copy useless files into the image
Move required files but 'nginx.tmpl' into a local 'app' folder and copy the
folder content into the image.

'nginx.tmpl' should be moved as well, but this is a breaking change for
configuration with a separate 'docker-gen' container.
2022-03-07 16:01:15 +01:00
3257177d80 fix: remove outdated comment from Dockerfiles 2022-03-07 14:14:16 +01:00
5ee6db5e3e ci: remove dev branch build, fix build on tags 2022-03-07 14:12:26 +01:00
46eed825f1 Merge pull request #1917 from nginx-proxy/dependabot/docker/golang-1.17.8
chore(deps): bump golang from 1.17.7 to 1.17.8
2022-03-07 10:06:46 +01:00
0ea8a08761 chore(deps): bump golang from 1.17.7 to 1.17.8
Bumps golang from 1.17.7 to 1.17.8.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-07 04:11:51 +00:00
993e5f8282 ci: publish the alpine image to ghcr.io too 2022-03-04 11:10:14 +01:00
5ab320d82a ci: publish Docker images to ghcr.io 2022-03-04 10:59:50 +01:00
fb8ddfd08c Merge pull request #1884 from nginx-proxy/dependabot/docker/golang-1.17.7
chore(deps): bump golang from 1.16.7 to 1.17.7
2022-02-24 16:48:24 +01:00
fee27ea712 docs: nginx badge 1.21.5 -> 1.21.6 2022-02-24 16:43:45 +01:00
061d129b1b chore(deps): bump golang from 1.16.7 to 1.17.7
Bumps golang from 1.16.7 to 1.17.7.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-02-24 15:39:59 +00:00
e85ff32f35 Merge pull request #1902 from nginx-proxy/dockergen-0.8.2
Bump docker-gen to 0.8.2
2022-02-24 16:39:15 +01:00
621e703fad build: docker-gen main -> 0.8.2 2022-02-24 16:21:10 +01:00
55651bba8b Merge pull request #1901 from nginx-proxy/dev
Path based routing (VIRTUAL_PATH)
2022-02-24 16:15:50 +01:00
0185a2971c tests: fix virtual path tests for new dhparam 2022-02-24 15:21:14 +01:00
b6b7133a2e fix: minor fixes on nginx template 2022-02-24 15:17:47 +01:00
01446472dd Revert "ci: use docker-gen main on dev branch tests"
This reverts commit b6e9cdc065.
2022-02-24 15:08:45 +01:00
08c9586346 fix: Handle VIRTUAL_PROTO on virtual path basis 2022-02-24 15:08:18 +01:00
7ede0fa4b9 test: fix: Rename new test files 2022-02-24 15:08:18 +01:00
2509fc1076 test: Add test cases for NETWORK_ACCESS=internal 2022-02-24 15:08:18 +01:00
28c74e8dae fix: Move NETWORK_ACCESS to location block 2022-02-24 15:08:18 +01:00
6a580ad664 test: Add test case for location config priority 2022-02-24 15:08:18 +01:00
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
e08b3487c9 test: Add test to cover SSL of path-based routing 2022-02-24 15:08:18 +01:00
12887a977b docs: update DEFAULT_ROOT documentation
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
2022-02-24 15:08:17 +01:00
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
c75622db87 docs: fix typo in README.md
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
2022-02-24 15:08:17 +01:00
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
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
9df330e51e feat: Add user customizable default root response 2022-02-24 15:08:15 +01:00
28c73e5b52 fix: non working https with virtual path 2022-02-24 15:07:49 +01:00
dad4a2d7bf docs: remove unnecessary word 2022-02-24 15:07:49 +01:00
9cd85f61d5 build: build and push the dev branch to Dockerhub 2022-02-24 15:07:47 +01:00
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
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
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
b6e9cdc065 ci: use docker-gen main on dev branch tests 2022-02-24 15:05:52 +01:00
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
18027fa71b Add container logs in case testcontainer exited unexpectedly 2022-02-20 15:10:05 +01:00
3670d39b71 docs: xip.io -> nip.io 2022-02-15 11:12:52 +01:00
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
15e33a3de5 docs: suggest alternatives to xip.io
Fixes #1887
2022-02-14 16:18:25 +01:00
098e551c35 Fix path to default.conf in README.md 2022-02-14 07:42:46 -05:00
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
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
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
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
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
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
42c8b0c4c9 CI: replace maintainer label w/ OCI authors label 2022-01-14 14:39:33 +01:00
0ff39b804c ci: use git describe for OCI image version label 2022-01-14 14:29:03 +01:00