From abe84f0ec7562155a4e00ff2736ca87216cd3cad Mon Sep 17 00:00:00 2001
From: Gabriel Arazas <foodogsquared@foodogsquared.one>
Date: Sat, 15 Mar 2025 19:44:32 +0800
Subject: [PATCH] devcontainers: use custom Docker builder

---
 devcontainers/js-backend.nix    | 20 +++-----------------
 devcontainers/ruby-on-rails.nix | 21 +++------------------
 devcontainers/rust-backend.nix  | 20 +++-----------------
 3 files changed, 9 insertions(+), 52 deletions(-)

diff --git a/devcontainers/js-backend.nix b/devcontainers/js-backend.nix
index f375a971..464b56f6 100644
--- a/devcontainers/js-backend.nix
+++ b/devcontainers/js-backend.nix
@@ -1,20 +1,6 @@
 { dockerTools, foodogsquaredLib, nodejs, bun, pnpm }:
 
-dockerTools.buildImage {
-  name = "fds-js-backend";
-
-  copyToRoot = foodogsquaredLib.buildFDSEnv {
-    name = "fds-js-backend-root";
-    paths = [ nodejs bun pnpm ];
-  };
-
-  runAsRoot = ''
-    mkdir -p /data
-  '';
-
-  config = {
-    Cmd = [ "/bin/bash" ];
-    WorkingDir = "/data";
-    Volumes."/data" = { };
-  };
+foodogsquaredLib.buildDockerImage {
+  name = "js-backend";
+  contents = [ nodejs bun pnpm ];
 }
diff --git a/devcontainers/ruby-on-rails.nix b/devcontainers/ruby-on-rails.nix
index 314ae365..62c4da8a 100644
--- a/devcontainers/ruby-on-rails.nix
+++ b/devcontainers/ruby-on-rails.nix
@@ -1,21 +1,6 @@
 { dockerTools, ruby, bundix, mruby, rails-new, foodogsquaredLib }:
 
-let name = s: "fds-ruby-on-rails-${ruby.version}${s}";
-in dockerTools.buildImage {
-  name = name "";
-
-  copyToRoot = foodogsquaredLib.buildFDSEnv {
-    name = name "-root";
-    paths = [ ruby bundix mruby rails-new ];
-  };
-
-  runAsRoot = ''
-    mkdir -p /data
-  '';
-
-  config = {
-    Cmd = [ "/bin/bash" ];
-    WorkingDir = "/data";
-    Volumes."/data" = { };
-  };
+foodogsquaredLib.buildDockerImage {
+  name = "ruby-on-rails";
+  contents = [ ruby bundix mruby rails-new ];
 }
diff --git a/devcontainers/rust-backend.nix b/devcontainers/rust-backend.nix
index 0934acc8..1791c9d8 100644
--- a/devcontainers/rust-backend.nix
+++ b/devcontainers/rust-backend.nix
@@ -1,21 +1,7 @@
 { dockerTools, foodogsquaredLib, rustc, cargo, rust-bindgen, rust-analyzer
 , nodejs }:
 
-dockerTools.buildImage {
-  name = "fds-rust-backend";
-
-  copyToRoot = foodogsquaredLib.buildFDSEnv {
-    name = "fds-rust-backend-root";
-    paths = [ cargo rust-bindgen rust-analyzer rustc nodejs ];
-  };
-
-  runAsRoot = ''
-    mkdir -p /data
-  '';
-
-  config = {
-    Cmd = [ "/bin/bash" ];
-    WorkingDir = "/data";
-    Volumes."/data" = { };
-  };
+foodogsquaredLib.buildDockerImage {
+  name = "rust-backend";
+  contents = [ cargo rust-bindgen rust-analyzer rustc nodejs ];
 }