Fix Post Install Script Issues #739
Merged
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
spencerugbo
requested review from
oliveromahony,
dhurley,
craigell,
olli-holmala and
aphralG
olli-holmala
reviewed
Jul 9, 2024
scripts/packages/postinstall.sh
Outdated
| @@ -39,7 +40,18 @@ detect_nginx_users() { | |||
|
|
|||
| if [ -z "${nginx_user}" ]; then | |||
| printf "PostInstall: Reading NGINX process information to determine NGINX user\n" | |||
| nginx_user=$(ps aux | grep "nginx: master process" | grep -v grep | head -1 | awk '{print $1}') | |||
| nginx_pid="" | |||
| for pid in $(ls /proc | grep -E '^[0-9]+$'); do | |||
There was a problem hiding this comment.
Remember to install the Shellcheck extension for VS Code: https://marketplace.visualstudio.com/items?itemName=timonwong.shellcheck
My Shellcheck is complaining about this ls command, here's the error it refers to: https://www.shellcheck.net/wiki/SC2010
github-actions
bot
added
chore
|
@spencerugbo Looks like you need to merge the main into your branch. |
…when detecting users
…when detecting users
spencerugbo
force-pushed
the
fix-post-install-script-issues
branch
from
1538290
to
e5bd519
Compare
scripts/packages/postinstall.sh
Outdated
| @@ -141,7 +168,7 @@ create_run_dir() { | |||
|
|
|||
| update_unit_file() { | |||
| # Fill in data to unit file that's acquired post install | |||
| if command -V systemctl >/dev/null 2>&1; then | |||
| if command -v systemctl && [ "$(cat /proc/1/comm)" == "systemd" ]; then | |||
There was a problem hiding this comment.
Probably should keep the uppercase -V.
scripts/packages/postinstall.sh
Outdated
| @@ -20,7 +21,7 @@ WORKER_USER="" | |||
| AGENT_GROUP="nginx-agent" | |||
|
|
|||
| detect_nginx_users() { | |||
| if command -V systemctl >/dev/null 2>&1; then | |||
| if command -v systemctl && [ "$(cat /proc/1/comm)" == "systemd" ]; then | |||
There was a problem hiding this comment.
Probably should keep the uppercase -V.
Suggested change
| if command -v systemctl && [ "$(cat /proc/1/comm)" == "systemd" ]; then | |
| if command -V systemctl && [ "$(cat /proc/1/comm)" == "systemd" ]; then |
Unless there was a reason for the change?
olli-holmala
approved these changes
Jul 24, 2024
dhurley
approved these changes
Jul 24, 2024
aphralG
approved these changes
Aug 6, 2024
oliveromahony
approved these changes
Aug 6, 2024
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.
Proposed changes
This PR aims to prevent silent fails when agent is installed in a Debian docker image. PostInstall.sh no longer uses the ps command to detect nginx users.
Checklist
Before creating a PR, run through this checklist and mark each as complete.
CONTRIBUTINGdocumentmake install-toolsand have attached any dependency changes to this pull requestREADME.md)