Minor improvements.

VKambulov · VKambulov · commit e8f617c2b008 · 2024-04-07T18:24:22.000+03:00
diff --git a/README.md b/README.md
@@ -3,8 +3,7 @@ display_name: Laravel (PHP 8.3)
 description: Coder Template for Laravel (PHP 8.3)
 icon: https://laravel.com/img/logomark.min.svg
 maintainer_github: vkambulov
-verified: true
-tags: [docker, container, laravel, php]
+tags: [docker, laravel, php]
 ---
 
 # Remote Development for Laravel
@@ -21,7 +20,6 @@ Work in progress. There may be some errors.
 - MySQL 8.0
 - Cloning GitHub private repos with [Coder External Auth](https://coder.com/docs/v2/latest/admin/external-auth)
 - [JetBrains Gateway](https://registry.coder.com/modules/jetbrains-gateway), [VS Code Desktop](https://registry.coder.com/modules/vscode-desktop) and [VS Code in the browser](https://code-server.dev)
-- Sharing home directory between several projects
 - [File Browser](https://registry.coder.com/modules/filebrowser)
 
 ## TODO
diff --git a/main.tf b/main.tf
@@ -84,8 +84,7 @@ resource "coder_agent" "main" {
   arch           = data.coder_provisioner.me.arch
   os             = "linux"
   startup_script = "/usr/local/bin/start.sh"
-
-  dir = "/var/www/html"
+  dir            = "/var/www/html"
 
   env = {
     GIT_AUTHOR_NAME     = data.coder_workspace.me.owner
@@ -156,33 +155,6 @@ resource "coder_agent" "main" {
   }
 }
 
-resource "docker_volume" "workspaces" {
-  name = "coder-${data.coder_workspace.me.id}"
-  # 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
-  }
-}
-
 data "coder_parameter" "repo" {
   name         = "repo"
   display_name = "Repository (auto)"
@@ -212,37 +184,18 @@ data "coder_parameter" "custom_repo_url" {
   mutable      = true
 }
 
-data "coder_parameter" "home_volume" {
-  name         = "home_volume"
-  display_name = "Home folder volume"
-  order        = 3
-  description  = "Select how the Home folder volume will be used."
-  mutable      = true
-
-  option {
-    name        = "Local"
-    description = "The volume name will only be associated with this project"
-    value       = "${docker_volume.workspaces.name}-home"
-  }
-  option {
-    name        = "Global"
-    description = "The volume can be reused for other projects"
-    value       = "coder-home"
-  }
-}
-
 data "coder_parameter" "laravel_seed" {
   name         = "laravel_seed"
   display_name = "Run Laravel Seeder?"
-  order        = 4
+  order        = 3
   description  = "Run db:seed command after setting up project."
   type         = "bool"
   mutable      = true
   default      = false
 }
 
 resource "docker_image" "main" {
-  name = "coder-${data.coder_workspace.me.id}"
+  name = data.coder_workspace.me.name
 
   build {
     context = "./build"
@@ -258,14 +211,15 @@ resource "docker_image" "main" {
 }
 
 resource "docker_network" "private_network" {
-  name = "network-${data.coder_workspace.me.id}"
+  name = "coder-${data.coder_workspace.me.name}-network"
 }
 
 resource "docker_container" "dind" {
   image      = "docker:dind"
   privileged = true
-  name       = "dind-${data.coder_workspace.me.id}"
+  name       = "coder-${data.coder_workspace.me.name}-dind"
   entrypoint = ["dockerd", "-H", "tcp://0.0.0.0:2375"]
+
   networks_advanced {
     name = docker_network.private_network.name
   }
@@ -308,25 +262,25 @@ resource "docker_container" "workspace" {
 
   volumes {
     container_path = "/var/www/html"
-    volume_name    = docker_volume.workspaces.name
+    volume_name    = "coder-${data.coder_workspace.me.name}-project"
     read_only      = false
   }
 
   volumes {
     container_path = "/var/lib/mysql"
-    volume_name    = "${docker_volume.workspaces.name}-mysql"
+    volume_name    = "coder-${data.coder_workspace.me.name}-mysql"
     read_only      = false
   }
 
   volumes {
     container_path = "/var/lib/postgresql/data"
-    volume_name    = "${docker_volume.workspaces.name}-postgresql"
+    volume_name    = "coder-${data.coder_workspace.me.name}-postgresql"
     read_only      = false
   }
 
   volumes {
     container_path = "/home/coder"
-    volume_name    = data.coder_parameter.home_volume.value
+    volume_name    = "coder-${data.coder_workspace.me.name}-home"
     read_only      = false
   }
 
@@ -346,4 +300,13 @@ resource "docker_container" "workspace" {
     label = "coder.workspace_name"
     value = data.coder_workspace.me.name
   }
+
+  labels {
+    label = "coder.workspace_name_at_creation"
+    value = data.coder_workspace.me.name
+  }
+
+  lifecycle {
+    ignore_changes = all
+  }
 }
