From d8ddce8628e7052fe3aaf6af5fab0c095010f924 Mon Sep 17 00:00:00 2001 From: Asher Date: Fri, 26 Jul 2024 13:53:17 -0800 Subject: [PATCH] chore: use latest code-server in examples (#14030) Instead, leave a comment describing how to pin the version. This negates the need to continually update the version in the examples. --- docs/templates/README.md | 11 ++++++----- docs/templates/tour.md | 7 +++++-- examples/parameters-dynamic-options/main.tf | 7 +++++-- examples/parameters/main.tf | 7 +++++-- examples/templates/aws-linux/main.tf | 7 +++++-- examples/templates/devcontainer-docker/main.tf | 7 +++++-- examples/templates/devcontainer-kubernetes/main.tf | 7 +++++-- examples/templates/docker/main.tf | 7 +++++-- examples/templates/envbox/main.tf | 8 ++++++-- examples/templates/gcp-linux/main.tf | 7 +++++-- examples/templates/gcp-vm-container/main.tf | 7 +++++-- examples/templates/kubernetes/main.tf | 7 +++++-- examples/workspace-tags/main.tf | 7 +++++-- 13 files changed, 67 insertions(+), 29 deletions(-) diff --git a/docs/templates/README.md b/docs/templates/README.md index 9df47f3d8d..253f58848f 100644 --- a/docs/templates/README.md +++ b/docs/templates/README.md @@ -159,11 +159,12 @@ resource "coder_agent" "coder" { startup_script = </tmp/code-server.log 2>&1 & EOT diff --git a/examples/parameters-dynamic-options/main.tf b/examples/parameters-dynamic-options/main.tf index 19304e3b37..39e156ab98 100644 --- a/examples/parameters-dynamic-options/main.tf +++ b/examples/parameters-dynamic-options/main.tf @@ -56,8 +56,11 @@ resource "coder_agent" "main" { os = "linux" startup_script = </tmp/code-server.log 2>&1 & EOT } diff --git a/examples/templates/aws-linux/main.tf b/examples/templates/aws-linux/main.tf index 51d2f16701..5f0f87420c 100644 --- a/examples/templates/aws-linux/main.tf +++ b/examples/templates/aws-linux/main.tf @@ -165,8 +165,11 @@ resource "coder_agent" "dev" { startup_script = <<-EOT set -e - # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.11.0 + # Install the latest code-server. + # Append "--version x.x.x" to install a specific version of code-server. + curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server + + # Start code-server in the background. /tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 & EOT diff --git a/examples/templates/devcontainer-docker/main.tf b/examples/templates/devcontainer-docker/main.tf index 59bf4a4d40..6e867ea1c1 100644 --- a/examples/templates/devcontainer-docker/main.tf +++ b/examples/templates/devcontainer-docker/main.tf @@ -196,8 +196,11 @@ resource "coder_agent" "main" { startup_script = <<-EOT set -e - # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.11.0 + # Install the latest code-server. + # Append "--version x.x.x" to install a specific version of code-server. + curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server + + # Start code-server in the background. /tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 & EOT dir = "/workspaces" diff --git a/examples/templates/devcontainer-kubernetes/main.tf b/examples/templates/devcontainer-kubernetes/main.tf index 9fac0755de..68564d3fd4 100644 --- a/examples/templates/devcontainer-kubernetes/main.tf +++ b/examples/templates/devcontainer-kubernetes/main.tf @@ -315,8 +315,11 @@ resource "coder_agent" "main" { startup_script = <<-EOT set -e - # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.11.0 + # Install the latest code-server. + # Append "--version x.x.x" to install a specific version of code-server. + curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server + + # Start code-server in the background. /tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 & EOT dir = "/workspaces" diff --git a/examples/templates/docker/main.tf b/examples/templates/docker/main.tf index 6cc5344334..8fbdd9091f 100644 --- a/examples/templates/docker/main.tf +++ b/examples/templates/docker/main.tf @@ -35,8 +35,11 @@ resource "coder_agent" "main" { touch ~/.init_done fi - # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.19.1 + # Install the latest code-server. + # Append "--version x.x.x" to install a specific version of code-server. + curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server + + # Start code-server in the background. /tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 & EOT diff --git a/examples/templates/envbox/main.tf b/examples/templates/envbox/main.tf index 14b39dffd1..b11a728182 100644 --- a/examples/templates/envbox/main.tf +++ b/examples/templates/envbox/main.tf @@ -102,8 +102,12 @@ resource "coder_agent" "main" { if [ ! -f ~/.bashrc ]; then cp /etc/skel/.bashrc $HOME fi - # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --version 4.8.3 | tee code-server-install.log + + # Install the latest code-server. + # Append "-s -- --version x.x.x" to `sh` to install a specific version of code-server. + curl -fsSL https://code-server.dev/install.sh | sh | tee code-server-install.log + + # Start code-server in the background. code-server --auth none --port 13337 | tee code-server-install.log & EOT } diff --git a/examples/templates/gcp-linux/main.tf b/examples/templates/gcp-linux/main.tf index 0caa01cd83..ed11b169da 100644 --- a/examples/templates/gcp-linux/main.tf +++ b/examples/templates/gcp-linux/main.tf @@ -80,8 +80,11 @@ resource "coder_agent" "main" { startup_script = <<-EOT set -e - # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.11.0 + # Install the latest code-server. + # Append "--version x.x.x" to install a specific version of code-server. + curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server + + # Start code-server in the background. /tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 & EOT diff --git a/examples/templates/gcp-vm-container/main.tf b/examples/templates/gcp-vm-container/main.tf index a7ab81b4d2..12b4077b71 100644 --- a/examples/templates/gcp-vm-container/main.tf +++ b/examples/templates/gcp-vm-container/main.tf @@ -70,8 +70,11 @@ resource "coder_agent" "main" { startup_script = <<-EOT set -e - # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.11.0 + # Install the latest code-server. + # Append "--version x.x.x" to install a specific version of code-server. + curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server + + # Start code-server in the background. /tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 & EOT } diff --git a/examples/templates/kubernetes/main.tf b/examples/templates/kubernetes/main.tf index 649cc94c40..87e62d5dc0 100644 --- a/examples/templates/kubernetes/main.tf +++ b/examples/templates/kubernetes/main.tf @@ -109,8 +109,11 @@ resource "coder_agent" "main" { startup_script = <<-EOT set -e - # install and start code-server - curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server --version 4.11.0 + # Install the latest code-server. + # Append "--version x.x.x" to install a specific version of code-server. + curl -fsSL https://code-server.dev/install.sh | sh -s -- --method=standalone --prefix=/tmp/code-server + + # Start code-server in the background. /tmp/code-server/bin/code-server --auth none --port 13337 >/tmp/code-server.log 2>&1 & EOT diff --git a/examples/workspace-tags/main.tf b/examples/workspace-tags/main.tf index 711fed8696..b7f0874a66 100644 --- a/examples/workspace-tags/main.tf +++ b/examples/workspace-tags/main.tf @@ -72,8 +72,11 @@ resource "coder_agent" "main" { os = "linux" startup_script = <