Fix build stage

kylecarbs · kylecarbs · commit 7cfa73fd89be · 2023-08-17T17:21:30.000-05:00
diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml
@@ -28,7 +28,7 @@ jobs:
           github_access_token: ${{ secrets.GITHUB_TOKEN }}
           nix_path: nixpkgs=channel:nixos-unstable
 
-      - run: nix build .#devEnvironmentDocker && ./result | docker load
+      - run: nix build .#devEnvImage && ./result | docker load
 
       - name: Login to DockerHub
         uses: docker/login-action@v2
diff --git a/flake.nix b/flake.nix
@@ -101,8 +101,12 @@
           "GOPRIVATE=coder.com,cdr.dev,go.coder.com,github.com/cdr,github.com/coder"
           # Increase memory allocation to NodeJS
           "NODE_OPTIONS=--max_old_space_size=8192"
+          "TERM=xterm-256color"
         ];
-        # Builds a layered image with all the tools included!
+        # Builds our development environment image with all the tools included.
+        # Using Nix instead of Docker is **significantly** faster. This _build_
+        # doesn't really build anything, it just copies pre-built binaries into
+        # a container and adds them to the $PATH.
         devEnvImage = pkgs.dockerTools.streamLayeredImage {
           name = "codercom/oss-dogfood";
           tag = "testing";
@@ -128,6 +132,12 @@
                 session required pam_unix.so
               ''
             )
+            # The default Nix config!
+            (
+              pkgs.writeTextDir "etc/nix/nix.conf" ''
+                experimental-features = nix-command flakes
+              ''
+            )
             # This is the debian script for managing Docker with `sudo service docker ...`.
             (
               pkgs.writeTextFile {
