adjustments to main.tf and dockerfile in github web editor

ghuntley · ghuntley · commit 1b3e89cfef45 · 2022-12-12T18:55:31.000Z
diff --git a/dogfood/Dockerfile b/dogfood/Dockerfile
@@ -333,9 +333,6 @@ RUN tar -xf "nix-${NIX_VERSION}-x86_64-linux.tar.xz" \
   && bash "nix-${NIX_VERSION}-x86_64-linux/install" "--no-daemon" \
   && rm -rf "nix-${NIX_VERSION}-x86_64-linux.tar.xz"
 
-# Install Nix into our bash profile so `nix-shell`, `nix-build, and `nix` are available
-RUN echo '. /home/coder/.nix-profile/etc/profile.d/nix.sh' >> /home/coder/.bashrc
-
 # Enable installation of unfree software - https://nixos.wiki/wiki/FAQ/How_can_I_install_a_proprietary_or_unfree_package
 RUN mkdir -p /home/coder/.config/nixpkgs && echo '{ allowUnfree = true; }' >> /home/coder/.config/nixpkgs/config.nix
 
diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -40,6 +40,9 @@ resource "coder_agent" "dev" {
     code-server --auth none --port 13337 &
     sudo service docker start
     coder dotfiles -y 2>&1 | tee  ~/.personalize.log
+
+    # Install Nix into our bash profile so `nix-shell`, `nix-build, and `nix` are available
+    echo '. /home/coder/.nix-profile/etc/profile.d/nix.sh' >> /home/coder/.bashrc
     EOF
 }
 
@@ -86,6 +89,33 @@ resource "docker_volume" "home_volume" {
   }
 }
 
+resource "docker_volume" "nix_volume" {
+  name = "coder-${data.coder_workspace.me.id}-home"
+  # Protect the volume from being deleted due to changes in attributes.
+  lifecycle {
+    ignore_changes = all
+  }
+  # Add labels in Docker to keep track of orphan resources.
+  labels {
+    label = "coder.owner"
+    value = data.coder_workspace.me.owner
+  }
+  labels {
+    label = "coder.owner_id"
+    value = data.coder_workspace.me.owner_id
+  }
+  labels {
+    label = "coder.workspace_id"
+    value = data.coder_workspace.me.id
+  }
+  # This field becomes outdated if the workspace is renamed but can
+  # be useful for debugging or cleaning out dangling volumes.
+  labels {
+    label = "coder.workspace_name_at_creation"
+    value = data.coder_workspace.me.name
+  }
+}
+
 resource "coder_metadata" "home_info" {
   resource_id = docker_volume.home_volume.id
   item {
@@ -137,6 +167,11 @@ resource "docker_container" "workspace" {
     volume_name    = docker_volume.home_volume.name
     read_only      = false
   }
+  volumes {
+    container_path = "/nix"
+    volume_name    = docker_volume.nix_volume.name
+    read_only      = false
+  }
   # Add labels in Docker to keep track of orphan resources.
   labels {
     label = "coder.owner"
