Commit graph

891 commits

Author SHA1 Message Date
Hannes
df6ebf88a2
Merge branch 'master' into dependabot/pip/test/requirements/pytest-7.2.2 2024-02-06 21:09:23 +01:00
Hannes
e0e52cfa29
Merge pull request #57 from shiz0/dependabot/docker/nginx-1.23.3-alpine
chore(deps): bump nginx from 1.21.6-alpine to 1.23.3-alpine
2024-02-06 21:08:03 +01:00
Hannes
a7357a6bd3
Merge pull request #56 from shiz0/dependabot/docker/golang-1.20.1-alpine
chore(deps): bump golang from 1.18.1-alpine to 1.20.1-alpine
2024-02-06 21:07:53 +01:00
Hannes
f44fdbd7b6
Merge pull request #52 from shiz0/dependabot/pip/test/requirements/requests-2.28.2
chore(deps): bump requests from 2.27.1 to 2.28.2 in /test/requirements
2024-02-06 21:07:42 +01:00
Hannes
bbe2c63b43
Merge pull request #48 from shiz0/dependabot/pip/test/requirements/docker-6.0.1
chore(deps): bump docker from 5.0.3 to 6.0.1 in /test/requirements
2024-02-06 21:07:29 +01:00
Hannes
ce39b9a516
Merge pull request #44 from shiz0/dependabot/pip/test/requirements/backoff-2.2.1
chore(deps): bump backoff from 1.11.1 to 2.2.1 in /test/requirements
2024-02-06 21:07:08 +01:00
dependabot[bot]
35d71c1adb
chore(deps): bump pytest from 7.1.2 to 7.2.2 in /test/requirements
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.1.2 to 7.2.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.2...7.2.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-03-06 02:10:34 +00:00
dependabot[bot]
bf19949265
chore(deps): bump nginx from 1.21.6-alpine to 1.23.3-alpine
Bumps nginx from 1.21.6-alpine to 1.23.3-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-27 02:47:03 +00:00
dependabot[bot]
69d3c06fe7
chore(deps): bump golang from 1.18.1-alpine to 1.20.1-alpine
Bumps golang from 1.18.1-alpine to 1.20.1-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-02-27 02:46:54 +00:00
dependabot[bot]
722fc2d93b
chore(deps): bump requests from 2.27.1 to 2.28.2 in /test/requirements
Bumps [requests](https://github.com/psf/requests) from 2.27.1 to 2.28.2.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](https://github.com/psf/requests/compare/v2.27.1...v2.28.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2023-01-13 01:37:54 +00:00
dependabot[bot]
661abe6e43
chore(deps): bump docker from 5.0.3 to 6.0.1 in /test/requirements
Bumps [docker](https://github.com/docker/docker-py) from 5.0.3 to 6.0.1.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](https://github.com/docker/docker-py/compare/5.0.3...6.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-29 11:16:01 +00:00
dependabot[bot]
db8a888923
chore(deps): bump backoff from 1.11.1 to 2.2.1 in /test/requirements
Bumps [backoff](https://github.com/litl/backoff) from 1.11.1 to 2.2.1.
- [Release notes](https://github.com/litl/backoff/releases)
- [Changelog](https://github.com/litl/backoff/blob/master/CHANGELOG.md)
- [Commits](https://github.com/litl/backoff/compare/v1.11.1...v2.2.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-11-29 11:15:55 +00:00
Hannes Happle
dbf596efdf
Merge branch 'nginx-proxy:main' into master 2022-11-29 12:15:12 +01:00
Nicolas Duchon
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]
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 Duchon
70d33d976b
Merge pull request #1939 from ntnj/main
chore: indent location, upstream in template
2022-04-18 16:16:00 +02:00
Nicolas Duchon
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]
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 Duchon
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 Duchon
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 Duchon
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 Duchon
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]
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 Duchon
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 Filippini
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 Duchon
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]
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 Duchon
993e5f8282
ci: publish the alpine image to ghcr.io too 2022-03-04 11:10:14 +01:00
Nicolas Duchon
5ab320d82a
ci: publish Docker images to ghcr.io 2022-03-04 10:59:50 +01:00
Nicolas Duchon
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 Duchon
fee27ea712
docs: nginx badge 1.21.5 -> 1.21.6 2022-02-24 16:43:45 +01:00
dependabot[bot]
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 Duchon
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 Duchon
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 Lieret
08c9586346
fix: Handle VIRTUAL_PROTO on virtual path basis 2022-02-24 15:08:18 +01:00
Alexander Lieret
7ede0fa4b9
test: fix: Rename new test files 2022-02-24 15:08:18 +01:00
Alexander Lieret
2509fc1076
test: Add test cases for NETWORK_ACCESS=internal 2022-02-24 15:08:18 +01:00
Alexander Lieret
28c74e8dae
fix: Move NETWORK_ACCESS to location block 2022-02-24 15:08:18 +01:00