steveej/infra
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

nix/pkgs/posh: remove hardcoded pull argument

Browse source
This commit is contained in:
steveej 2019-12-04 19:27:31 +01:00
parent 8b278d2f80
commit 3ecf7f4771
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nix/overlay.nix
View file

@ -82,18 +82,18 @@ in {
test -S "$SSH_AUTH_SOCK" && ssh="-v $SSH_AUTH_SOCK:$SSH_AUTH_SOCK -e SSH_AUTH_SOCK" test -S "$SSH_AUTH_SOCK" && ssh="-v $SSH_AUTH_SOCK:$SSH_AUTH_SOCK -e SSH_AUTH_SOCK"
tty -s && tty="-t" || quiet="-q" tty -s && tty="-t" || quiet="-q"
# define these as variables so we can override them at runtime
POSH_IMAGE=${image} POSH_IMAGE=${image}
POSH_PULL=${pull} POSH_PULL=${pull}
if [ "$1" == "-c" ]; then if [ "$1" == "-c" ]; then
# we've most likely been spawned by sshd # We've most likely been spawned by sshd and are interested in $2 whitch contains the command string
# $2 contains the command string
shift shift
# TODO: make the variables overridable via the command_string # TODO parse the beginning of the command for POSH_* overrides
fi fi
exec ${self.podman}/bin/podman \ exec ${self.podman}/bin/podman \
${global_args} run --rm -i $tty $ssh -v ~/:/root -w /root --pull=always --network host --pull=''${POSH_PULL} \ ${global_args} run --rm -i $tty $ssh -v ~/:/root -w /root --network host --pull=''${POSH_PULL} \
${run_args} ''${POSH_IMAGE} $@ ${run_args} ''${POSH_IMAGE} $@
'') '')
.overrideAttrs(attrs: attrs // { .overrideAttrs(attrs: attrs // {