Skip to content

fix(docker-postgres): use system sg binary with SUID for group switching #797

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

Merged
shunkakinoki merged 1 commit into from
Feb 13, 2026
Merged

fix(docker-postgres): use system sg binary with SUID for group switching #797

Show file tree
Hide file tree
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
20 changes: 19 additions & 1 deletion home-manager/services/cliproxyapi/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,26 @@ let
aws = "${pkgs.awscli2}/bin/aws";
};

# Smart wrapper that handles both NixOS and non-NixOS Linux
# On NixOS: docker group is properly inherited, or use /run/wrappers/bin/sg
# On non-NixOS: systemd user session may lack docker group, use /usr/bin/sg
dockerStartScript = pkgs.writeShellScript "cliproxyapi-docker-start" ''
exec ${pkgs.shadow}/bin/sg docker -c "${pkgs.bash}/bin/bash ${startScript}"
SCRIPT="${pkgs.bash}/bin/bash ${startScript}"

# Try docker directly first (works on NixOS or when user has docker group)
if ${pkgs.docker}/bin/docker info >/dev/null 2>&1; then
exec $SCRIPT
fi

# Docker not accessible directly, try sg to switch group
if [ -x /run/wrappers/bin/sg ]; then
exec /run/wrappers/bin/sg docker -c "$SCRIPT"
elif [ -x /usr/bin/sg ]; then
exec /usr/bin/sg docker -c "$SCRIPT"
else
echo "ERROR: Cannot access Docker. User not in docker group and no sg binary found." >&2
exit 1
fi
'';

wrapperScript = pkgs.replaceVars ./scripts/wrapper.sh {
Expand Down
24 changes: 23 additions & 1 deletion home-manager/services/docker-postgres/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,30 @@
{ pkgs, ... }:
let
inherit (pkgs) lib;
startScript = ./start-postgres.sh;

# Smart wrapper that handles both NixOS and non-NixOS Linux
# On NixOS: docker group is properly inherited, or use /run/wrappers/bin/sg
# On non-NixOS: systemd user session may lack docker group, use /usr/bin/sg
startPostgresWrapper = pkgs.writeShellScript "start-postgres-wrapper" ''
exec ${pkgs.shadow}/bin/sg docker -c "${pkgs.bash}/bin/bash ${./start-postgres.sh}"
SCRIPT="${pkgs.bash}/bin/bash ${startScript}"

# Try docker directly first (works on NixOS or when user has docker group)
if ${pkgs.docker}/bin/docker info >/dev/null 2>&1; then
exec $SCRIPT
fi

# Docker not accessible directly, try sg to switch group
# NixOS: /run/wrappers/bin/sg (SUID wrapper)
# Non-NixOS: /usr/bin/sg (system binary with SUID)
if [ -x /run/wrappers/bin/sg ]; then
exec /run/wrappers/bin/sg docker -c "$SCRIPT"
elif [ -x /usr/bin/sg ]; then
exec /usr/bin/sg docker -c "$SCRIPT"
else
echo "ERROR: Cannot access Docker. User not in docker group and no sg binary found." >&2
exit 1
fi
'';
in
{
Expand Down
Loading