diff --git a/modules/k3s/images/default.nix b/modules/k3s/images/default.nix index 481c94c..01536de 100644 --- a/modules/k3s/images/default.nix +++ b/modules/k3s/images/default.nix @@ -4,6 +4,5 @@ let ./rsshfs-client.nix ./rsshfs-server.nix ]; - imported = map ( n: import n args ) images; in - lib.foldl' lib.recursiveUpdate {} imported \ No newline at end of file + map (image: import image args ) images \ No newline at end of file diff --git a/modules/k3s/images/rsshfs-client.nix b/modules/k3s/images/rsshfs-client.nix index 595d498..768c3b9 100644 --- a/modules/k3s/images/rsshfs-client.nix +++ b/modules/k3s/images/rsshfs-client.nix @@ -120,53 +120,51 @@ let HostKey /tmp/ssh_host_ed25519_key ''; in -{ - pkgs.dockerTools.buildLayeredImage { - name = "rsshfs-server"; - tag = "latest"; - copyToRoot = pkgs.buildEnv { - name = "root"; - pathsToLink = [ "/bin" "/etc" "/libexec" ]; - paths = [ - pkgs.bashInteractive - pkgs.coreutils - pkgs.openssh - pkgs.tmux - sshdConfig - rsshfsCmd - rsshfsEntrypoint - ]; - }; - fakeRootCommands = '' - mkdir -p ./etc - - cat < /etc/passwd - root:x:0:0:root:/root:/bin/sh - dev:x:1000:1000:dev:/home/dev:/bin/bash - EOF - - cat < /etc/group - root:x:0: - dev:x:1000: - EOF - - cat < /etc/shadow - root:*:19000:0:99999:7::: - dev::19000:0:99999:7::: - EOF - - mkdir -p /var/run/sshd - chmod 755 /var/run/sshd - - mkdir -p /home/dev/.ssh - chown -R 1000:1000 /home/dev - ''; - Env = [ - "PATH=/bin" +pkgs.dockerTools.buildLayeredImage { + name = "rsshfs-server"; + tag = "latest"; + copyToRoot = pkgs.buildEnv { + name = "root"; + pathsToLink = [ "/bin" "/etc" "/libexec" ]; + paths = [ + pkgs.bashInteractive + pkgs.coreutils + pkgs.openssh + pkgs.tmux + sshdConfig + rsshfsCmd + rsshfsEntrypoint ]; - config = { - Entrypoint = [ "/bin/entrypoint" ]; - Cmd = [ "/bin/rsshfs" "rsshfs" "/" "/containers/tmp" ]; - }; - } + }; + fakeRootCommands = '' + mkdir -p ./etc + + cat < /etc/passwd + root:x:0:0:root:/root:/bin/sh + dev:x:1000:1000:dev:/home/dev:/bin/bash + EOF + + cat < /etc/group + root:x:0: + dev:x:1000: + EOF + + cat < /etc/shadow + root:*:19000:0:99999:7::: + dev::19000:0:99999:7::: + EOF + + mkdir -p /var/run/sshd + chmod 755 /var/run/sshd + + mkdir -p /home/dev/.ssh + chown -R 1000:1000 /home/dev + ''; + Env = [ + "PATH=/bin" + ]; + config = { + Entrypoint = [ "/bin/entrypoint" ]; + Cmd = [ "/bin/rsshfs" "rsshfs" "/" "/containers/tmp" ]; + }; } \ No newline at end of file diff --git a/modules/k3s/images/rsshfs-server.nix b/modules/k3s/images/rsshfs-server.nix index 541cc46..0ce63e4 100644 --- a/modules/k3s/images/rsshfs-server.nix +++ b/modules/k3s/images/rsshfs-server.nix @@ -36,57 +36,55 @@ let HostKey /tmp/ssh_host_ed25519_key ''; in -{ - pkgs.dockerTools.buildLayeredImage { - name = "rsshfs-client"; - tag = "latest"; - copyToRoot = pkgs.buildEnv { - name = "root"; - pathsToLink = [ "/bin" "/etc" "/libexec" ]; - paths = [ - pkgs.bashInteractive - pkgs.coreutils - pkgs.openssh - pkgs.tmux - pkgs.sshfs - sshdConfig - rsshfsEntrypoint - ]; - }; - fakeRootCommands = '' - mkdir -p ./etc - - cat < /etc/passwd - root:x:0:0:root:/root:/bin/sh - dev:x:1000:1000:dev:/home/dev:/bin/bash - EOF - - cat < /etc/group - root:x:0: - dev:x:1000: - EOF - - cat < /etc/shadow - root:*:19000:0:99999:7::: - dev::19000:0:99999:7::: - EOF - - mkdir -p /var/run/sshd - chmod 755 /var/run/sshd - - mkdir -p /home/dev/.ssh - chown -R 1000:1000 /home/dev - - mkdir -p /containers - chown -R 1000:1000 /containers - ''; - Env = [ - "PATH=/bin" +pkgs.dockerTools.buildLayeredImage { + name = "rsshfs-client"; + tag = "latest"; + copyToRoot = pkgs.buildEnv { + name = "root"; + pathsToLink = [ "/bin" "/etc" "/libexec" ]; + paths = [ + pkgs.bashInteractive + pkgs.coreutils + pkgs.openssh + pkgs.tmux + pkgs.sshfs + sshdConfig + rsshfsEntrypoint ]; - config = { - Entrypoint = [ "/bin/entrypoint" ]; - Cmd = [ "tail" "-f" "/dev/null" ]; - ExposedPorts = { "2222/tcp" = {}; }; - }; - } -} \ No newline at end of file + }; + fakeRootCommands = '' + mkdir -p ./etc + + cat < /etc/passwd + root:x:0:0:root:/root:/bin/sh + dev:x:1000:1000:dev:/home/dev:/bin/bash + EOF + + cat < /etc/group + root:x:0: + dev:x:1000: + EOF + + cat < /etc/shadow + root:*:19000:0:99999:7::: + dev::19000:0:99999:7::: + EOF + + mkdir -p /var/run/sshd + chmod 755 /var/run/sshd + + mkdir -p /home/dev/.ssh + chown -R 1000:1000 /home/dev + + mkdir -p /containers + chown -R 1000:1000 /containers + ''; + Env = [ + "PATH=/bin" + ]; + config = { + Entrypoint = [ "/bin/entrypoint" ]; + Cmd = [ "tail" "-f" "/dev/null" ]; + ExposedPorts = { "2222/tcp" = {}; }; + }; +}