Fixes #171 #172
Closed
Fixes #171 #172
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This change adds support for building JSDoc docs using nodejs. It also improves the JSDoc annotations used in the njs source code.
4141done
reviewed
Sep 14, 2023
| @@ -35,7 +35,7 @@ if [ -z ${DNS_RESOLVERS+x} ]; then | |||
| resolvers="" | |||
| for ip in $(grep nameserver /etc/resolv.conf | cut -d' ' -f2 | xargs) | |||
| do | |||
| if echo "${ip}" | grep -q ':'; then | |||
| if echo "${ip}" | sed '/^[[:blank:]]*#/d;s/#.*//' | grep -q ':'; then | |||
There was a problem hiding this comment.
Per the comment on the issue, did you look at https://github.com/nginxinc/docker-nginx/blob/master/entrypoint/15-local-resolvers.envsh for handling this?
It seems that in the case where DNS_RESOLVERS is not specified, we could potentially set it equal to the value of the env var exported by this script which I think should already have been run by this point?
There was a problem hiding this comment.
Oh, dang, I branched from the wrong commit. I'm going to redo this commit.
4141done
requested changes
Sep 14, 2023
|
Closing in favor of #176 which does the same thing |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fix should strip comments from
resolv.conffiles before they are parsed by grep. This change assumes that grep and sed are the GNU variants.