NyxErinys/Nix-Config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix import syntax

Browse source
This commit is contained in:
nyxerinys 2026-06-29 11:03:05 -05:00
parent 9291374d2e
commit 5bc9477bfc
3 changed files with 98 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/k3s/images/default.nix
View file

@ -4,6 +4,5 @@ let
./rsshfs-client.nix ./rsshfs-client.nix
./rsshfs-server.nix ./rsshfs-server.nix
]; ];
imported = map ( n: import n args ) images;
in in
lib.foldl' lib.recursiveUpdate {} imported map (image: import image args ) images

94
modules/k3s/images/rsshfs-client.nix
View file

@ -120,53 +120,51 @@ let
HostKey /tmp/ssh_host_ed25519_key HostKey /tmp/ssh_host_ed25519_key
''; '';
in in
{ pkgs.dockerTools.buildLayeredImage {
pkgs.dockerTools.buildLayeredImage { name = "rsshfs-server";
name = "rsshfs-server"; tag = "latest";
tag = "latest"; copyToRoot = pkgs.buildEnv {
copyToRoot = pkgs.buildEnv { name = "root";
name = "root"; pathsToLink = [ "/bin" "/etc" "/libexec" ];
pathsToLink = [ "/bin" "/etc" "/libexec" ]; paths = [
paths = [ pkgs.bashInteractive
pkgs.bashInteractive pkgs.coreutils
pkgs.coreutils pkgs.openssh
pkgs.openssh pkgs.tmux
pkgs.tmux sshdConfig
sshdConfig rsshfsCmd
rsshfsCmd rsshfsEntrypoint
rsshfsEntrypoint
];
};
fakeRootCommands = ''
mkdir -p ./etc
cat <<EOF > /etc/passwd
root:x:0:0:root:/root:/bin/sh
dev:x:1000:1000:dev:/home/dev:/bin/bash
EOF
cat <<EOF > /etc/group
root:x:0:
dev:x:1000:
EOF
cat <<EOF > /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" ]; fakeRootCommands = ''
Cmd = [ "/bin/rsshfs" "rsshfs" "/" "/containers/tmp" ]; mkdir -p ./etc
};
} cat <<EOF > /etc/passwd
root:x:0:0:root:/root:/bin/sh
dev:x:1000:1000:dev:/home/dev:/bin/bash
EOF
cat <<EOF > /etc/group
root:x:0:
dev:x:1000:
EOF
cat <<EOF > /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" ];
};
} }

104
modules/k3s/images/rsshfs-server.nix
View file

@ -36,57 +36,55 @@ let
HostKey /tmp/ssh_host_ed25519_key HostKey /tmp/ssh_host_ed25519_key
''; '';
in in
{ pkgs.dockerTools.buildLayeredImage {
pkgs.dockerTools.buildLayeredImage { name = "rsshfs-client";
name = "rsshfs-client"; tag = "latest";
tag = "latest"; copyToRoot = pkgs.buildEnv {
copyToRoot = pkgs.buildEnv { name = "root";
name = "root"; pathsToLink = [ "/bin" "/etc" "/libexec" ];
pathsToLink = [ "/bin" "/etc" "/libexec" ]; paths = [
paths = [ pkgs.bashInteractive
pkgs.bashInteractive pkgs.coreutils
pkgs.coreutils pkgs.openssh
pkgs.openssh pkgs.tmux
pkgs.tmux pkgs.sshfs
pkgs.sshfs sshdConfig
sshdConfig rsshfsEntrypoint
rsshfsEntrypoint
];
};
fakeRootCommands = ''
mkdir -p ./etc
cat <<EOF > /etc/passwd
root:x:0:0:root:/root:/bin/sh
dev:x:1000:1000:dev:/home/dev:/bin/bash
EOF
cat <<EOF > /etc/group
root:x:0:
dev:x:1000:
EOF
cat <<EOF > /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" ]; fakeRootCommands = ''
Cmd = [ "tail" "-f" "/dev/null" ]; mkdir -p ./etc
ExposedPorts = { "2222/tcp" = {}; };
}; cat <<EOF > /etc/passwd
} root:x:0:0:root:/root:/bin/sh
} dev:x:1000:1000:dev:/home/dev:/bin/bash
EOF
cat <<EOF > /etc/group
root:x:0:
dev:x:1000:
EOF
cat <<EOF > /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" = {}; };
};
}