Various improvements.

Author: VKambulov

README.md

@@ -14,5 +14,6 @@ tags: [docker, container, laravel, php]
 ## TODO
 
 - [ ] Fix PHPMyAdmin work.
-- [ ] Fix Coder 80/443 ports proxy.
-- [ ] Download and unzip archive instead git clone for repositories.
+- [ ] Download and unzip archive instead git clone for some repositories.
+- [ ] Postgresql support
+- [ ] Support Docker inside Coder container

build/Dockerfile

@@ -29,7 +29,7 @@ RUN apt-get update \
        php8.3-ldap \
        php8.3-msgpack php8.3-igbinary php8.3-redis php8.3-swoole \
        php8.3-memcached php8.3-pcov php8.3-imagick php8.3-xdebug \
-       php8.3-fpm libapache2-mod-php8.3 \
+       php8.3-fpm libapache2-mod-php8.3 php8.3-mailparse \
     && curl -sLS https://getcomposer.org/installer | php -- --install-dir=/usr/bin/ --filename=composer \
     && curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg \
     && echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_VERSION.x nodistro main" > /etc/apt/sources.list.d/nodesource.list \

build/start.sh

@@ -7,6 +7,8 @@ cd $WORKDIR
 sudo chown -R $USER:$USER /var/www/html
 sudo chown -R $USER:$USER /home/$USER
 
+sudo rm -rf $WORKDIR/*
+
 if [ ! -z "$WWWUSER" ]; then
     sudo usermod -u $WWWUSER $USER
 fi
@@ -20,7 +22,7 @@ sudo service apache2 start
 sudo service apache2 reload
 
 # install and start code-server
-curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.22.1
+curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server
 /tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 &
 
 if [ -z "$(ls -A $WORKDIR)" ]; then
@@ -56,6 +58,10 @@ EOSQL
 
     /usr/bin/php8.3 artisan key:generate
     /usr/bin/php8.3 artisan migrate
+
+    if $SEED; then
+      /usr/bin/php8.3 artisan db:seed
+    fi
 fi
 
 sudo /usr/bin/supervisord -s -c /etc/supervisor/conf.d/supervisord.conf >/tmp/supervisor.log 2>&1 &

main.tf

@@ -26,16 +26,16 @@ module "filebrowser" {
   source   = "registry.coder.com/modules/filebrowser/coder"
   version  = "1.0.8"
   agent_id = coder_agent.main.id
-  folder   = "/var/www/html/project"
+  folder   = "/var/www/html"
 }
 
 module "jetbrains_gateway" {
   source         = "registry.coder.com/modules/jetbrains-gateway/coder"
   version        = "1.0.9"
   agent_id       = coder_agent.main.id
   agent_name     = "main"
-  folder         = "/var/www/html/project"
-  jetbrains_ides = ["GO", "WS", "IU", "PS"]
+  folder         = "/var/www/html"
+  jetbrains_ides = ["WS", "IU", "PS"]
   default        = "IU"
 }
 
@@ -63,17 +63,33 @@ resource "coder_app" "phpmyadmin" {
   subdomain     = false
 }
 
+resource "coder_app" "code-server" {
+  agent_id     = coder_agent.main.id
+  slug         = "code-server"
+  display_name = "VS Code Online"
+  url          = "http://localhost:13337/?folder=/var/www/html"
+  icon         = "/icon/code.svg"
+  subdomain    = false
+  share        = "owner"
+
+  healthcheck {
+    url       = "http://localhost:13337/healthz"
+    interval  = 5
+    threshold = 6
+  }
+}
+
 resource "coder_agent" "main" {
   arch           = data.coder_provisioner.me.arch
   os             = "linux"
   startup_script = "/usr/local/bin/start.sh"
 
-  # dir = "/var/www/html/project"
+  dir = "/var/www/html"
 
   env = {
-    GIT_AUTHOR_NAME     = coalesce(data.coder_workspace.me.owner_name, data.coder_workspace.me.owner)
+    GIT_AUTHOR_NAME     = data.coder_workspace.me.owner
     GIT_AUTHOR_EMAIL    = data.coder_workspace.me.owner_email
-    GIT_COMMITTER_NAME  = coalesce(data.coder_workspace.me.owner_name, data.coder_workspace.me.owner)
+    GIT_COMMITTER_NAME  = data.coder_workspace.me.owner
     GIT_COMMITTER_EMAIL = data.coder_workspace.me.owner_email
     GITHUB_TOKEN        = data.coder_external_auth.github.access_token
   }
@@ -121,7 +137,6 @@ resource "coder_agent" "main" {
   metadata {
     display_name = "Load Average (Host)"
     key          = "6_load_host"
-    # get load avg scaled by number of cores
     script   = <<EOT
       echo "`cat /proc/loadavg | awk '{ print $1 }'` `nproc`" | awk '{ printf "%0.2f", $1/$2 }'
     EOT
@@ -140,22 +155,6 @@ resource "coder_agent" "main" {
   }
 }
 
-resource "coder_app" "code-server" {
-  agent_id     = coder_agent.main.id
-  slug         = "code-server"
-  display_name = "code-server"
-  url          = "http://localhost:13337/?folder=/var/www/html"
-  icon         = "/icon/code.svg"
-  subdomain    = false
-  share        = "owner"
-
-  healthcheck {
-    url       = "http://localhost:13337/healthz"
-    interval  = 5
-    threshold = 6
-  }
-}
-
 resource "docker_volume" "workspaces" {
   name = "coder-${data.coder_workspace.me.id}"
   # Protect the volume from being deleted due to changes in attributes.
@@ -211,14 +210,52 @@ 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
+  description  = "Run db:seed command after setting up project."
+  type         = "bool"
+  mutable      = true
+  default      = false
+
+  option {
+    name        = "Yes"
+    value       = true
+  }
+  option {
+    name        = "No"
+    value       = false
+  }
+}
+
 resource "docker_image" "main" {
   name = "coder-${data.coder_workspace.me.id}"
 
   build {
     context = "./build"
     build_args = {
       USER = "coder"
-      WORKDIR = "/var/www/html/project"
+      WORKDIR = "/var/www/html"
     }
   }
 
@@ -230,10 +267,6 @@ resource "docker_image" "main" {
 resource "docker_container" "workspace" {
   count = data.coder_workspace.me.start_count
 
-  # Find the latest version here:
-  # https://github.com/coder/envbuilder/tags
-  # image = "ghcr.io/coder/envbuilder:0.2.8"
-
   image = docker_image.main.name
 
   # Uses lower() to avoid Docker restriction on container names.
@@ -250,7 +283,8 @@ resource "docker_container" "workspace" {
     "CODER_AGENT_URL=${replace(data.coder_workspace.me.access_url, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal")}",
     "INIT_SCRIPT=${replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal")}",
     "GIT_URL=${data.coder_parameter.repo.value == "custom" ? data.coder_parameter.custom_repo_url.value : data.coder_parameter.repo.value}",
-    "WORKDIR=/var/www/html/project"
+    "WORKDIR=/var/www/html",
+    "SEED=${data.coder_parameter.laravel_seed.value}"
   ]
 
   host {
@@ -259,7 +293,7 @@ resource "docker_container" "workspace" {
   }
 
   volumes {
-    container_path = "/var/www/html/project"
+    container_path = "/var/www/html"
     volume_name    = docker_volume.workspaces.name
     read_only      = false
   }
@@ -278,11 +312,10 @@ resource "docker_container" "workspace" {
 
   volumes {
     container_path = "/home/coder"
-    volume_name    = "${docker_volume.workspaces.name}-home"
+    volume_name    = data.coder_parameter.home_volume.value
     read_only      = false
   }
 
-  # Add labels in Docker to keep track of orphan resources.
   labels {
     label = "coder.owner"
     value = data.coder_workspace.me.owner