mirror of
https://github.com/foo-dogsquared/nixos-config.git
synced 2025-01-30 22:57:55 +00:00
devcontainers: update to use custom buildEnv step
This commit is contained in:
parent
2273aa0f7f
commit
f0d59f6c97
@ -1,13 +1,20 @@
|
||||
{ dockerTools, buildEnv, nodejs, bun, pnpm }:
|
||||
{ dockerTools, foodogsquaredLib, nodejs, bun, pnpm }:
|
||||
|
||||
dockerTools.buildImage {
|
||||
name = "js-backend";
|
||||
name = "fds-js-backend";
|
||||
|
||||
copyToRoot = buildEnv {
|
||||
name = "js-backend-root";
|
||||
copyToRoot = foodogsquaredLib.buildFDSEnv {
|
||||
name = "fds-js-backend-root";
|
||||
paths = [ nodejs bun pnpm ];
|
||||
pathsToLink = [ "/bin" "/share" "/etc" "/lib" ];
|
||||
};
|
||||
|
||||
config.Cmd = [ "/bin/bash" ];
|
||||
runAsRoot = ''
|
||||
mkdir -p /data
|
||||
'';
|
||||
|
||||
config = {
|
||||
Cmd = [ "/bin/bash" ];
|
||||
WorkingDir = "/data";
|
||||
Volumes."/data" = { };
|
||||
};
|
||||
}
|
||||
|
@ -1,23 +1,12 @@
|
||||
{ dockerTools, buildEnv, rustc, cargo, rust-bindgen, rust-analyzer, nodejs, bash
|
||||
, meson, ninja, pkg-config }:
|
||||
{ dockerTools, foodogsquaredLib, rustc, cargo, rust-bindgen, rust-analyzer
|
||||
, nodejs }:
|
||||
|
||||
dockerTools.buildImage {
|
||||
name = "rust-backend";
|
||||
name = "fds-rust-backend";
|
||||
|
||||
copyToRoot = buildEnv {
|
||||
name = "rust-backend-root";
|
||||
paths = [
|
||||
bash
|
||||
cargo
|
||||
rust-bindgen
|
||||
rust-analyzer
|
||||
rustc
|
||||
nodejs
|
||||
meson
|
||||
ninja
|
||||
pkg-config
|
||||
];
|
||||
pathsToLink = [ "/bin" "/etc" "/lib" "/share" ];
|
||||
copyToRoot = foodogsquaredLib.buildFDSEnv {
|
||||
name = "fds-rust-backend-root";
|
||||
paths = [ cargo rust-bindgen rust-analyzer rustc nodejs ];
|
||||
};
|
||||
|
||||
runAsRoot = ''
|
||||
|
Loading…
Reference in New Issue
Block a user