Commit Graph
1472 Commits
Author SHA1 Message Date
Nicolas DuchonandGitHub 515c736d5a Merge pull request #2077 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.2.0
chore(deps): bump pytest from 7.1.2 to 7.2.0 in /test/requirements
2022-12-01 13:00:08 +01:00
Nicolas DuchonandGitHub 14ccabf45a Merge pull request #2072 from nginx-proxy/dependabot/docker/nginx-1.23.2
chore(deps): bump nginx from 1.21.6 to 1.23.2
2022-12-01 12:50:00 +01:00
dependabot[bot]andGitHub d23a746833 chore(deps): bump pytest from 7.1.2 to 7.2.0 in /test/requirements
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.2 to 7.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/7.1.2...7.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>
2022-10-26 04:21:21 +00:00
dependabot[bot]andGitHub 0fbd71362b chore(deps): bump nginx from 1.21.6 to 1.23.2
Bumps nginx from 1.21.6 to 1.23.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-10-20 04:07:57 +00:00
Valère BRONandGitHub 9218caef71 Simple mistake in DEFAULT_ROOT variable name
`DEFAUL_ROOT` should be `DEFAULT_ROOT`
2022-08-23 12:45:45 +02:00
SilverFire - Dmitry Naumenko 510d376f00 Make sure networks order is the same 2022-05-11 12:56:18 +00:00
Nicolas DuchonandGitHub c4ad18fecc Merge pull request #1971 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.1.2
chore(deps): bump pytest from 7.1.1 to 7.1.2 in /test/requirements
2022-04-26 07:55:46 +02:00
dependabot[bot]andGitHub 20e76ac7a6 chore(deps): bump pytest from 7.1.1 to 7.1.2 in /test/requirements
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.1 to 7.1.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/7.1.1...7.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-25 04:22:00 +00:00
Nicolas DuchonandGitHub 70d33d976b Merge pull request #1939 from ntnj/main
chore: indent location, upstream in template
2022-04-18 16:16:00 +02:00
Nicolas DuchonandGitHub 705b29c14f Merge pull request #1960 from nginx-proxy/dependabot/docker/golang-1.18.1
chore(deps): bump golang from 1.18.0 to 1.18.1
2022-04-18 15:52:55 +02:00
Nitin Jain 998d56c473 chore: indent location, upstream in template 2022-04-14 13:32:58 +05:30
dependabot[bot]andGitHub ae0faa43cd chore(deps): bump golang from 1.18.0 to 1.18.1
Bumps golang from 1.18.0 to 1.18.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-14 04:10:10 +00:00
Nicolas DuchonandGitHub 2f82265891 Merge pull request #1940 from nginx-proxy/dockergen-0.9.0
Bump docker-gen from 0.8.4 to 0.9.0
2022-04-10 13:35:44 +02:00
Nicolas Duchon 2e1da37f9a build: bump docker-gen from 0.8.4 to 0.9.0 2022-04-10 13:15:02 +02:00
Nicolas DuchonandGitHub 576ccc7009 Merge pull request #1933 from nginx-proxy/dockergen-0.8.4
Bump docker-gen from 0.8.2 to 0.8.4
2022-04-10 12:58:42 +02:00
Nicolas Duchon 6a0a1f6782 build: bump docker-gen from 0.8.2 to 0.8.4 2022-03-25 11:05:17 +01:00
Nicolas DuchonandGitHub 0442ed9b72 Merge pull request #1929 from nginx-proxy/dependabot/pip/test/requirements/pytest-7.1.1
chore(deps): bump pytest from 7.0.1 to 7.1.1 in /test/requirements
2022-03-23 16:38:10 +01:00
Nicolas DuchonandGitHub d851908c67 Merge pull request #1931 from rhansen/http-port
Fix IPv6 HTTP listen port
2022-03-23 16:37:47 +01:00
Richard Hansen 55d913255d Fix IPv6 HTTP listen port 2022-03-20 18:54:07 -04:00
dependabot[bot]andGitHub 1cc3bbf5ce chore(deps): bump pytest from 7.0.1 to 7.1.1 in /test/requirements
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.0.1 to 7.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/7.0.1...7.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-03-18 04:16:58 +00:00
Nicolas Duchon 4ea3437dfa chore: include license into the Docker images 2022-03-09 12:05:56 +01:00
Nicolas DuchonandGitHub 6b48e11e5c Merge pull request #1444 from pini-gh/app-folder
Do not copy useless files into the image
2022-03-07 16:22:39 +01:00
Nicolas Duchon fea6cc7537 chore: update .dockerignore 2022-03-07 16:01:15 +01:00
Gilles FilippiniandNicolas Duchon 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
Nicolas Duchon 3257177d80 fix: remove outdated comment from Dockerfiles 2022-03-07 14:14:16 +01:00
Nicolas Duchon 5ee6db5e3e ci: remove dev branch build, fix build on tags 2022-03-07 14:12:26 +01:00
Nicolas DuchonandGitHub 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
dependabot[bot]andGitHub 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
Nicolas DuchonandGitHub 993e5f8282 ci: publish the alpine image to ghcr.io too 2022-03-04 11:10:14 +01:00
Nicolas DuchonandGitHub 5ab320d82a ci: publish Docker images to ghcr.io 2022-03-04 10:59:50 +01:00
Nicolas DuchonandGitHub 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
Nicolas DuchonandGitHub fee27ea712 docs: nginx badge 1.21.5 -> 1.21.6 2022-02-24 16:43:45 +01:00
dependabot[bot]andGitHub 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
Nicolas DuchonandGitHub 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
Nicolas Duchon 621e703fad build: docker-gen main -> 0.8.2 2022-02-24 16:21:10 +01:00
Nicolas DuchonandGitHub 55651bba8b Merge pull request #1901 from nginx-proxy/dev
Path based routing (VIRTUAL_PATH)
2022-02-24 16:15:50 +01:00
Nicolas Duchon 0185a2971c tests: fix virtual path tests for new dhparam 2022-02-24 15:21:14 +01:00
Nicolas Duchon b6b7133a2e fix: minor fixes on nginx template 2022-02-24 15:17:47 +01:00
Nicolas Duchon 01446472dd Revert "ci: use docker-gen main on dev branch tests"
This reverts commit b6e9cdc065.
2022-02-24 15:08:45 +01:00
Alexander LieretandNicolas Duchon 08c9586346 fix: Handle VIRTUAL_PROTO on virtual path basis 2022-02-24 15:08:18 +01:00
Alexander LieretandNicolas Duchon 7ede0fa4b9 test: fix: Rename new test files 2022-02-24 15:08:18 +01:00
Alexander LieretandNicolas Duchon 2509fc1076 test: Add test cases for NETWORK_ACCESS=internal 2022-02-24 15:08:18 +01:00
Alexander LieretandNicolas Duchon 28c74e8dae fix: Move NETWORK_ACCESS to location block 2022-02-24 15:08:18 +01:00
Alexander LieretandNicolas Duchon 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
Alexander LieretandNicolas Duchon e08b3487c9 test: Add test to cover SSL of path-based routing 2022-02-24 15:08:18 +01:00
Nicolas DuchonandJonathan Underwood 12887a977b docs: update DEFAULT_ROOT documentation
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
2022-02-24 15:08:17 +01:00
Nicolas DuchonandJonathan Underwood 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
Nicolas DuchonandJonathan Underwood c75622db87 docs: fix typo in README.md
Co-authored-by: Jonathan Underwood <junderwood@bitcoinbank.co.jp>
2022-02-24 15:08:17 +01:00
Alexander LieretandNicolas Duchon 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