From e3f92b0a2bcebf83ca55f6b50101858bb795217b Mon Sep 17 00:00:00 2001 From: nyxerinys Date: Mon, 29 Jun 2026 12:16:21 -0500 Subject: [PATCH] update images --- modules/k3s/deployments/storage-combo.nix | 4 ++++ modules/k3s/images/rsshfs-client.nix | 5 +++-- modules/k3s/images/rsshfs-server.nix | 1 + 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/modules/k3s/deployments/storage-combo.nix b/modules/k3s/deployments/storage-combo.nix index baa5045..fbe0f14 100644 --- a/modules/k3s/deployments/storage-combo.nix +++ b/modules/k3s/deployments/storage-combo.nix @@ -15,6 +15,10 @@ labels.app = "storage-combo"; }; spec = { + securityContext = { + runAsUser = 1000; + runAsGroup = 1000; + }; containers = [ { name = "storage-combo"; diff --git a/modules/k3s/images/rsshfs-client.nix b/modules/k3s/images/rsshfs-client.nix index 6694e6e..5e728a9 100644 --- a/modules/k3s/images/rsshfs-client.nix +++ b/modules/k3s/images/rsshfs-client.nix @@ -5,7 +5,7 @@ let Host="$1" LFolder="$2" RFolder="$3" - SSHCMD="ssh -o \"StrictHostKeyChecking=no,UserKnownHostsFile=/dev/nul\" -q -S /tmp/sshfs.sock" + SSHCMD="ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -q -S /tmp/sshfs.sock" TmuxName="rsshfs" # SETUP @@ -76,7 +76,7 @@ let echo "[ Reverse port opened on $PORT ]" echo "[ Pushing local $LFolder to the remote $RFolder ]" $SSHCMD null "if [[ ! -d $RFolder ]]; then mkdir -p $RFolder; fi" - $SSHCMD null "sshfs -o \"StrictHostKeyChecking=no,UserKnownHostsFile=/dev/null\" -p $PORT localhost:$LFolder $RFolder" + $SSHCMD null "sshfs -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -p $PORT localhost:$LFolder $RFolder" pause @@ -135,6 +135,7 @@ pkgs.dockerTools.buildLayeredImage { fakeRootCommands = '' mkdir -p ./etc mkdir -p ./tmp + chmod 777 ./tmp cat < ./etc/passwd root:x:0:0:root:/root:/bin/sh diff --git a/modules/k3s/images/rsshfs-server.nix b/modules/k3s/images/rsshfs-server.nix index 3608aaf..08b1768 100644 --- a/modules/k3s/images/rsshfs-server.nix +++ b/modules/k3s/images/rsshfs-server.nix @@ -51,6 +51,7 @@ pkgs.dockerTools.buildLayeredImage { fakeRootCommands = '' mkdir -p ./etc mkdir -p ./tmp + chmod 777 ./tmp cat < ./etc/passwd root:x:0:0:root:/root:/bin/sh