Commit graph

845 commits

Author SHA1 Message Date
Robin Windey
17f6d0ab6f
Merge pull request #22 from seitenwerke/dependabot/docker/golang-1.18.3
chore(deps): bump golang from 1.18.2 to 1.18.3
2022-06-03 09:24:08 +02:00
dependabot[bot]
566b79685b
chore(deps): bump golang from 1.18.2 to 1.18.3
Bumps golang from 1.18.2 to 1.18.3.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-06-02 17:29:37 +00:00
Robin Windey
b5216d48a5
Merge pull request #21 from seitenwerke/dependabot/docker/golang-1.18.2
chore(deps): bump golang from 1.18.1 to 1.18.2
2022-05-12 21:10:01 +02:00
dependabot[bot]
51249e1da3
chore(deps): bump golang from 1.18.1 to 1.18.2
Bumps golang from 1.18.1 to 1.18.2.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-05-12 17:31:17 +00:00
Robin Windey
4cdb69e1dd
Merge pull request #20 from seitenwerke/dependabot/pip/test/requirements/backoff-2.0.1
chore(deps): bump backoff from 1.11.1 to 2.0.1 in /test/requirements
2022-04-27 20:13:40 +02:00
Robin Windey
6e4fbe110b
Merge pull request #18 from seitenwerke/dependabot/pip/test/requirements/pytest-7.1.2
chore(deps): bump pytest from 7.0.1 to 7.1.2 in /test/requirements
2022-04-27 20:13:11 +02:00
Robin Windey
85cd6c44bb
Merge pull request #17 from seitenwerke/dependabot/docker/golang-1.18.1
chore(deps): bump golang from 1.17.8 to 1.18.1
2022-04-27 20:12:26 +02:00
dependabot[bot]
1cc8632f49
chore(deps): bump backoff from 1.11.1 to 2.0.1 in /test/requirements
Bumps [backoff](https://github.com/litl/backoff) from 1.11.1 to 2.0.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.0.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-04-27 17:31:51 +00:00
dependabot[bot]
5d3144488e
chore(deps): bump pytest from 7.0.1 to 7.1.2 in /test/requirements
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.0.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.0.1...7.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-26 17:42:24 +00:00
dependabot[bot]
850ea009cc
chore(deps): bump golang from 1.17.8 to 1.18.1
Bumps golang from 1.17.8 to 1.18.1.

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-04-13 17:35:42 +00:00
Robin Windey
825b777817
Merge pull request #13 from seitenwerke/dependabot/docker/golang-1.17.8
chore(deps): bump golang from 1.17.7 to 1.17.8
2022-03-07 19:52:06 +01:00
dependabot[bot]
1a333d62da
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 17:42:18 +00:00
Robin Windey
b4018cbe73
Update docker push action to v2 2022-03-05 11:19:23 +01:00
Robin Windey
bd8969b915
Merge pull request #11 from seitenwerke/dependabot/docker/golang-1.17.7
chore(deps): bump golang from 1.16.7 to 1.17.7
2022-02-20 15:37:31 +01:00
dependabot[bot]
511aa33356
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-20 14:19:56 +00:00
Robin Windey
394a2ef35b
Merge pull request #10 from seitenwerke/feature/add-container-logs
Add container logs in case testcontainer exited unexpectedly
2022-02-20 15:18:11 +01:00
Robin Windey
dd45595311
Merge pull request #9 from seitenwerke/merge_upstream
Merge upstream
2022-02-20 15:16:09 +01:00
Robin Windey
18027fa71b
Add container logs in case testcontainer exited unexpectedly 2022-02-20 15:10:05 +01:00
Robin Windey
926b56766d
Fix tests after merge with upstream
* Don't mount dh params as read only because that lets container fail in startup
* Use pytest.sh from upstream to ensure correct container name
* Remove renamed dh param test
* Fix www redirect in case of wildcard host
2022-02-20 15:03:17 +01:00
Robin Windey
ffa8553bac
Test workflow from upstream 2022-02-20 13:03:33 +01:00
Robin Windey
28c4a0d80a
Merge remote-tracking branch 'upstream/main' into merge_upstream 2022-02-20 12:17:29 +01:00
Nicolas Duchon
3670d39b71
docs: xip.io -> nip.io 2022-02-15 11:12:52 +01:00
Nicolas Duchon
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
Nicolas Duchon
15e33a3de5
docs: suggest alternatives to xip.io
Fixes #1887
2022-02-14 16:18:25 +01:00
Nathan Weeks
098e551c35
Fix path to default.conf in README.md 2022-02-14 07:42:46 -05:00
Nicolas Duchon
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
dependabot[bot]
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
Nicolas Duchon
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
dependabot[bot]
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
Nicolas Duchon
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
dependabot[bot]
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
Nicolas Duchon
42c8b0c4c9
CI: replace maintainer label w/ OCI authors label 2022-01-14 14:39:33 +01:00
Nicolas Duchon
0ff39b804c
ci: use git describe for OCI image version label 2022-01-14 14:29:03 +01:00
Nicolas Duchon
2daa09ff21
ci: upgrade to docker/metadata-action@v3 2022-01-14 14:17:21 +01:00
Nicolas Duchon
b411a84a59
docs: update issue template 2022-01-14 13:38:23 +01:00
Nicolas Duchon
54dd5d1ef0
Merge pull request #1865 from nginx-proxy/container-version
Add and display nginx-proxy version
2022-01-13 12:22:08 +01:00
Nicolas Duchon
dbca945a8f
ci: add nginx-proxy version to image on build 2022-01-12 11:26:20 +01:00
Nicolas Duchon
e22ae4a6fd
tests: display container version 2022-01-12 10:17:49 +01:00
Nicolas Duchon
fbf37456d0
feat: display container version 2022-01-11 22:38:30 +01:00
Nicolas Duchon
fde0e809e4
chore: jwilder/docker-gen > nginx-proxy/docker-gen 2022-01-11 19:55:29 +01:00
Nicolas Duchon
679c971a19
docs: update maintainers list on license 2022-01-11 19:46:42 +01:00
Nicolas Duchon
53ef90a2f6
docs: nginx badge 1.21.4 -> 1.21.5 2022-01-06 17:12:36 +01:00
Nicolas Duchon
ed7b17d9d7
Merge pull request #1856 from polarathene/tests/fix-container-networking
tests: Fix pytest container networking issues
2022-01-06 10:32:40 +01:00
Nicolas Duchon
6260c0265e
Merge pull request #1858 from nginx-proxy/dependabot/pip/test/requirements/requests-2.27.1
chore(deps): bump requests from 2.26.0 to 2.27.1 in /test/requirements
2022-01-06 10:24:17 +01:00
dependabot[bot]
b9ac4b936e
chore(deps): bump requests from 2.26.0 to 2.27.1 in /test/requirements
Bumps [requests](https://github.com/psf/requests) from 2.26.0 to 2.27.1.
- [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.26.0...v2.27.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
2022-01-06 04:21:32 +00:00
Nicolas Duchon
780744f231
Merge pull request #1853 from nginx-proxy/dependabot/docker/nginx-1.21.5
chore(deps): bump nginx from 1.21.4 to 1.21.5
2021-12-31 13:58:44 +01:00
polarathene
6b3ee66783 chore: white-space housekeeping
Noticed some trailing white-space. Removed for consistency with the rest of the file.
2022-01-01 01:39:51 +13:00
polarathene
115461744b fix: Skip IPv6 when forced but not available + avoid none network
A test on raw IP addresses doesn't reach the existing IPv6 skip logic, added that to avoid a test failing when only IPv4 is available (eg: standard docker container networks).

Additionally some other tests set the `none` network and connecting to this fails as it's not allowed? Preventing that from happening resolves the final failing tests within containerized pytest.
2022-01-01 01:38:13 +13:00
Nicolas Duchon
a96135b74d
Merge pull request #1848 from polarathene/tests/dhparam-followup
tests: Revise DH param tests
2021-12-31 13:27:50 +01:00
polarathene
04b0181980 fix: Ensure networks are actually connected to pytest container
The `network` object would never be in a list of network names (strings), and without `greedy=True` arg as the `docker-py` API docs note, the containers will not be part of the results, thus always returning an empty list which was not intended..

Now the network will properly match the current networks for pytest container, avoiding duplicate connect attempts, and the network list result will actually have containers to count when filtering by length.
2021-12-31 22:30:49 +13:00