-
Couldn't load subscription status.
- Fork 9
Add arm64 support
#45
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
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Good stuff!
Please see my comments inline. They are mostly of the sort "please add a comment here" or "what does this do?" Overall the changes look good and they certainly work, as we learned debugging the DNS problem.
| # Setup image with nginx if not installed and the corresponding version of | ||
| # the nginx-datadog module. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Nice addition. It's a little hard for me to parse, though. Maybe:
# Set up the nginx container image. Install nginx, if necessary, and install the nginx-datadog module.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
with wherever that line break wants to go.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 8473561
| nginx_modules_path=/usr/lib/nginx/modules | ||
| ;; | ||
| *) | ||
| >&2 echo 'Unsupported platform.' |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What does this exclude?
Also, consider stating in the error message that it's BASE_IMAGE (which might have come from nginx-version-info) that contains the unsupported value.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ditto. Maybe only doing the check in install_datadog.sh is enough. What's docker compose behavior if a service can't be built? What's your thought?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Oh, now I see. This is a little formatting and an added explicit "else" case, which previously was implicitly a no-op.
If docker compose is told to build an image, then failure to build is an error. If it's not told to build an image, than it will use an existing image if one exists, otherwise it's an error.
Adding this check is a good idea -- it probably makes for easier debugging if someone is trying different values for BASE_IMAGE. Consider this wording:
| >&2 echo 'Unsupported platform.' | |
| >&2 echo 'BASE_IMAGE value "%s" is invalid. See nginx-version-info.example for more information.' "$BASE_IMAGE" |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in 8473561
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
ah, my mistake, not yours :)
Please see my more recent comment.
Co-authored-by: David Goffredo <david.goffredo@datadoghq.com>
Co-authored-by: David Goffredo <david.goffredo@datadoghq.com>
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fix that echo typo of mine, and this is good to go. Great work.
Resolves #31