Skip to content

fix: runs entrypoint-wrapper.sh when possible #26

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

Open
jwnx wants to merge 1 commit into
base: flyio-2.6.0
Choose a base branch
from
Open

fix: runs entrypoint-wrapper.sh when possible #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 8 additions & 1 deletion internal/patroni/reconcile.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,14 @@ func InstancePod(ctx context.Context,
}
}

container.Command = []string{"patroni", configDirectory}
// Use entrypoint wrapper if available (indicated by version file), otherwise run patroni directly.
// The wrapper starts the OOM adjuster and shared memory cleanup before exec'ing to patroni.
// Ref: https://github.com/superfly/mpg-postgres-image/pull/3
container.Command = []string{
"sh", "-c",
`[ -f /usr/local/bin/.entrypoint-wrapper-version ] && exec /usr/local/bin/entrypoint-wrapper.sh "$@" || exec "$@"`,
"--", "patroni", configDirectory,
}

container.Env = append(container.Env,
instanceEnvironment(inCluster, inClusterPodService, inPatroniLeaderService,
Expand Down
Loading