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

Add IPv6 support for local-resolvers substitution script #186

Merged
merged 1 commit into from
Feb 8, 2024

Conversation

alessfg
Copy link
Collaborator

@alessfg alessfg commented Feb 8, 2024

Proposed changes

This PR ports the latest updates made to the upstream https://github.com/nginxinc/docker-nginx image. It adds IPv6 support for the local-resolvers substitution script and fixes some shell linter warnings.

Checklist

Before creating a PR, run through this checklist and mark each as complete:

  • I have read the CONTRIBUTING document
  • I have run ./update.sh and ensured all entrypoint/Dockerfile template changes have been applied to the relevant image entrypoint scripts & Dockerfiles
  • I have tested that the NGINX Unprivileged Docker images build and run correctly on all supported architectures on an unprivileged environment (check out the README for more details)
  • I have updated any relevant documentation (README)

* And address Alpine bug and shell linter warnings
@alessfg alessfg merged commit 8fe0244 into main Feb 8, 2024
18 checks passed
@alessfg alessfg deleted the update-entrypoint-scripts branch February 8, 2024 16:27
@wanisfahmyDE
Copy link

hey @alessfg, is this PR fixed with the 1.25.4 release?
referring to this issue #114

@alessfg
Copy link
Collaborator Author

alessfg commented Feb 19, 2024

Not quite. That issue is caused by replacing the default.conf file with a different one before the script runs. This PR fixes an issue that led to IPv6 addresses not being correctly templated even when using the "default" default.conf.

@wanisfahmyDE
Copy link

ah got it, thanks!
yea I guess that's actually the same issue we're currently facing. This Dockerfile is doing the same with this nginx.conf and running in an IPv6 only environment causes an: invalid port in resolver "xx:xxxx:xxxx::a" in /etc/nginx/conf.d/default.conf

Do you maybe know if there is a workaround to solve this issue while still running on IPv6?

Thanks

@alessfg
Copy link
Collaborator Author

alessfg commented Feb 19, 2024

The issue you are describing should have been fixed by this PR (you seem to be missing the IPv6 square brackets, which this PR addresses).

@wanisfahmyDE
Copy link

Thanks for the hint, this is really helpful. Since devlake uses a custom script for startup https://github.com/apache/incubator-devlake/blob/main/config-ui/nginx.sh#L27, I will submit a PR there to match the changes from this PR.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants