From 7c46834666f0aa6712cc0d4d2f9779e245ccfd8b Mon Sep 17 00:00:00 2001
From: Ben Potter <ben@coder.com>
Date: Thu, 20 Oct 2022 14:46:05 -0500
Subject: [PATCH 1/2] chore: add dogfood-with-ports

---
 dogfood/main.tf | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 0b757336b812c..9c3d302aeeb2b 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -29,9 +29,22 @@ resource "coder_agent" "dev" {
   startup_script = <<EOF
     #!/bin/sh
     set -x
+
     # install and start code-server
-    curl -fsSL https://code-server.dev/install.sh | sh
-    code-server --auth none --port 13337 &
+    mkdir /tmp/code-server
+    cd /tmp/code-server
+    # install node 16
+    sudo rm -R /usr/lib/node_modules
+    sudo apt-get remove -y nodejs
+    curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
+    sudo apt-get install -y nodejs
+    npm init -y
+    npm install --unsafe-perm @coder/code-server-pr@4.7.1-5673-3c17798eb377432f160f3aef7cad61bb2a26a83f
+    cd node_modules/@coder/code-server-pr/lib/vscode
+    npm install --legacy-peer-deps
+    cd /tmp/code-server
+    VSCODE_PROXY_URI=https://{{port}}--dev--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}--apps.dev.coder.com node ./node_modules/@coder/code-server-pr --port 13337 --auth none &
+
     sudo service docker start
     if [ -f ~/personalize ]; then ~/personalize 2>&1 | tee  ~/.personalize.log; fi
     EOF
@@ -48,7 +61,7 @@ resource "coder_app" "code-server" {
   healthcheck {
     url       = "http://localhost:13337/healthz"
     interval  = 3
-    threshold = 10
+    threshold = 20
   }
 }
 

From 54427ed9dc232bdaeef462bbcf1abf54226246e0 Mon Sep 17 00:00:00 2001
From: Ben <me@bpmct.net>
Date: Wed, 26 Oct 2022 19:07:51 +0000
Subject: [PATCH 2/2] use code-server release

---
 dogfood/main.tf | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/dogfood/main.tf b/dogfood/main.tf
index 9c3d302aeeb2b..a5e6ca91077b0 100644
--- a/dogfood/main.tf
+++ b/dogfood/main.tf
@@ -29,21 +29,12 @@ resource "coder_agent" "dev" {
   startup_script = <<EOF
     #!/bin/sh
     set -x
-
+    
     # install and start code-server
-    mkdir /tmp/code-server
-    cd /tmp/code-server
-    # install node 16
-    sudo rm -R /usr/lib/node_modules
-    sudo apt-get remove -y nodejs
-    curl -fsSL https://deb.nodesource.com/setup_16.x | sudo -E bash -
-    sudo apt-get install -y nodejs
-    npm init -y
-    npm install --unsafe-perm @coder/code-server-pr@4.7.1-5673-3c17798eb377432f160f3aef7cad61bb2a26a83f
-    cd node_modules/@coder/code-server-pr/lib/vscode
-    npm install --legacy-peer-deps
-    cd /tmp/code-server
-    VSCODE_PROXY_URI=https://{{port}}--dev--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}--apps.dev.coder.com node ./node_modules/@coder/code-server-pr --port 13337 --auth none &
+    curl -fsSL https://code-server.dev/install.sh | sh
+    
+    # use Coder wildcard apps as the port proxy
+    VSCODE_PROXY_URI=https://{{port}}--dev--${data.coder_workspace.me.name}--${data.coder_workspace.me.owner}--apps.dev.coder.com code-server --port 13337 --auth none &
 
     sudo service docker start
     if [ -f ~/personalize ]; then ~/personalize 2>&1 | tee  ~/.personalize.log; fi