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.

Sign up for GitHub

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

Jump to bottom

Fixes #22666: Update docker scripts for 7.2 #4770

Draft
wants to merge 1 commit into
base: branches/rudder/7.2
Choose a base branch
from
Draft

Fixes #22666: Update docker scripts for 7.2 #4770

wants to merge 1 commit into from

Conversation

amousset
Copy link
Member

@amousset amousset requested a review from Fdall April 21, 2023 10:12
@amousset amousset marked this pull request as draft April 21, 2023 10:12
matya
matya reviewed Apr 25, 2023
View reviewed changes
docker/rudder-relay/rudder-relay.sh
@@ -24,8 +35,9 @@ fi

if [ -n "$RUDDER_RELAY_SERVER" ]; then
echo "$RUDDER_RELAY_SERVER" > "${PPKEYS}/policy_server.dat"
elif [ ! -f "${PPKEYS}/policy_server.dat" ]; then
echo "rudder" > "${PPKEYS}/policy_server.dat"
elif [ ! -f "$RUDDER_RELAY_SERVER" ]; then
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this codepath will never be reached, since anything that would be a valid file from the var RUDDER_RELAY_SERVER (checked here by -f) is already a valid string one above (at -n).

It's probably better to switch the logic: If the value of the string is set and is a valid file, copy it to the dest, otherwise write it to the file.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@matya matya matya left review comments

@Fdall Fdall Awaiting requested review from Fdall

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@amousset @matya