Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge-upstream #2275

Closed
wants to merge 115 commits into from
Closed

Merge-upstream #2275

wants to merge 115 commits into from

Conversation

R0Wi
Copy link
Contributor

@R0Wi R0Wi commented Jul 13, 2023

  • Applying changes from 9ee3d31
  • Adjusted to new template from upstream

R0Wi and others added 30 commits October 10, 2020 09:19
* www to non-www redirect + tests

* Github actions fix syntax

* Github actions TTY problem

* Fix docker version github actions

* Revert "Fix docker version github actions"

This reverts commit c5f703a.

* Docker version set explicitly
* Docker push action; sync forc manually

* Run on push

* Update README badges

* Remove test
Co-authored-by: lemker <lehelmk@gmail.com>
Co-authored-by: Jason Wilder <jwilder@users.noreply.github.com>
Sync manually from fork upstream
Make merge PR for not having diff between fork and 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
Add container logs in case testcontainer exited unexpectedly
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>
chore(deps): bump golang from 1.16.7 to 1.17.7
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>
chore(deps): bump golang from 1.17.7 to 1.17.8
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>
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](pytest-dev/pytest@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>
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](litl/backoff@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>
chore(deps): bump golang from 1.17.8 to 1.18.1
…nts/pytest-7.1.2

chore(deps): bump pytest from 7.0.1 to 7.1.2 in /test/requirements
…nts/backoff-2.0.1

chore(deps): bump backoff from 1.11.1 to 2.0.1 in /test/requirements
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>
R0Wi and others added 25 commits April 17, 2023 20:28
…nts/pytest-7.3.1

chore(deps): bump pytest from 7.3.0 to 7.3.1 in /test/requirements
Bumps [requests](https://github.com/psf/requests) from 2.28.2 to 2.29.0.
- [Release notes](https://github.com/psf/requests/releases)
- [Changelog](https://github.com/psf/requests/blob/main/HISTORY.md)
- [Commits](psf/requests@v2.28.2...v2.29.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
…nts/requests-2.29.0

chore(deps): bump requests from 2.28.2 to 2.29.0 in /test/requirements
Bumps golang from 1.20.3-alpine to 1.20.4-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
….4-alpine

chore(deps): bump golang from 1.20.3-alpine to 1.20.4-alpine
Bumps [docker](https://github.com/docker/docker-py) from 6.0.1 to 6.1.0.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](docker/docker-py@6.0.1...6.1.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
…nts/docker-6.1.0

chore(deps): bump docker from 6.0.1 to 6.1.0 in /test/requirements
Bumps [docker](https://github.com/docker/docker-py) from 6.1.0 to 6.1.1.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](docker/docker-py@6.1.0...6.1.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
…nts/docker-6.1.1

chore(deps): bump docker from 6.1.0 to 6.1.1 in /test/requirements
Bumps [docker](https://github.com/docker/docker-py) from 6.1.1 to 6.1.2.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](docker/docker-py@6.1.1...6.1.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
…nts/docker-6.1.2

chore(deps): bump docker from 6.1.1 to 6.1.2 in /test/requirements
Bumps nginx from 1.23.4-alpine to 1.25.0-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
…0-alpine

chore(deps): bump nginx from 1.23.4-alpine to 1.25.0-alpine
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.1 to 7.3.2.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@7.3.1...7.3.2)

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

Signed-off-by: dependabot[bot] <support@github.com>
…nts/pytest-7.3.2

chore(deps): bump pytest from 7.3.1 to 7.3.2 in /test/requirements
Bumps nginx from 1.25.0-alpine to 1.25.1-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
…1-alpine

chore(deps): bump nginx from 1.25.0-alpine to 1.25.1-alpine
Bumps [pytest](https://github.com/pytest-dev/pytest) from 7.3.2 to 7.4.0.
- [Release notes](https://github.com/pytest-dev/pytest/releases)
- [Changelog](https://github.com/pytest-dev/pytest/blob/main/CHANGELOG.rst)
- [Commits](pytest-dev/pytest@7.3.2...7.4.0)

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

Signed-off-by: dependabot[bot] <support@github.com>
…nts/pytest-7.4.0

chore(deps): bump pytest from 7.3.2 to 7.4.0 in /test/requirements
Bumps [docker](https://github.com/docker/docker-py) from 6.1.2 to 6.1.3.
- [Release notes](https://github.com/docker/docker-py/releases)
- [Commits](docker/docker-py@6.1.2...6.1.3)

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

Signed-off-by: dependabot[bot] <support@github.com>
…nts/docker-6.1.3

chore(deps): bump docker from 6.1.2 to 6.1.3 in /test/requirements
Bumps golang from 1.20.4-alpine to 1.20.6-alpine.

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

Signed-off-by: dependabot[bot] <support@github.com>
….6-alpine

chore(deps): bump golang from 1.20.4-alpine to 1.20.6-alpine
* Applying changes from 9ee3d31
* Adjusted to new template from upstream
@buchdag buchdag added the type/feat PR for a new feature label Jul 13, 2023
@buchdag
Copy link
Member

buchdag commented Jul 13, 2023

@R0Wi thank for the work to bring #1563 to a mergeable state, but it seems like there was a git misfire at some point here.

Don't touch this PR yet, I think I might be able to take a look a it and clean things up.

@buchdag buchdag added the scope/host-aliases Issue or PR related to alias redirection label Jul 13, 2023
@R0Wi
Copy link
Contributor Author

R0Wi commented Jul 13, 2023

Sorry it was my mistake. I wanted to merge things to my fork first for testing and them come back with a rebased approach. Will open a new PR for that soon.

@R0Wi R0Wi closed this Jul 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
scope/host-aliases Issue or PR related to alias redirection type/feat PR for a new feature
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants