chore: update lima example to use --with-terraform arg

johnstcn · johnstcn · commit 09e06e325e21 · 2023-01-10T15:54:55.000Z
diff --git a/examples/lima/coder.yaml b/examples/lima/coder.yaml
@@ -65,25 +65,16 @@ provision:
       # See: https://github.com/lima-vm/lima/issues/528
       chown ${LIMA_CIDATA_USER} /var/run/docker.sock
       chmod og+rwx /var/run/docker.sock
-  - mode: system
-    script: |
-      #!/bin/bash
-      set -eux -o pipefail
-      command -v terraform >/dev/null 2>&1 && exit 0
-      DEBIAN_FRONTEND=noninteractive apt-get install -qqy unzip
-      rm -fv /tmp/terraform.zip || true
-      wget -qO /tmp/terraform.zip "https://releases.hashicorp.com/terraform/1.3.0/terraform_1.3.0_linux_$(dpkg --print-architecture).zip"
-      unzip /tmp/terraform.zip -d /usr/local/bin/
-      chmod +x /usr/local/bin/terraform
-      rm -fv /tmp/terraform.zip || true
   - mode: system
     script: |
       #!/bin/bash
       set -eux -o pipefail
       command -v coder >/dev/null 2>&1 && exit 0
       export DEBIAN_FRONTEND=noninteractive
       export HOME=/root
-      curl -fsSL https://coder.com/install.sh | sh
+      # Install some dependencies
+      apt-get install -qqy unzip
+      curl -fsSL https://coder.com/install.sh | sh -s -- --with-terraform
       # Ensure Coder has permissions on /var/run/docker.socket
       usermod -aG docker coder
       # Ensure coder listens on all interfaces
@@ -93,10 +84,8 @@ provision:
       # Ensure coder starts on boot
       systemctl enable coder
       systemctl start coder
-      # Wait for Coder to have downloaded Terraform
-      timeout 60s bash -c 'until /var/cache/coder/terraform version >/dev/null 2>&1; do sleep 1; done'
-      # Coder restarts after downloading Terraform, wait for it to become available
-      timeout 60s bash -c 'until nc -z localhost 3000 > /dev/null 2>&1; do sleep 1; done'
+      # Wait for Terraform to be installed
+      timeout 60s bash -c 'until /usr/local/bin/terraform version >/dev/null 2>&1; do sleep 1; done'
   - mode: user
     script: |
       #!/bin/bash
@@ -137,14 +126,24 @@ probes:
       fi
     hint: |
       See "/var/log/cloud-init-output.log" in the guest.
+  - description: "terraform to be installed"
+    script: |
+      #!/bin/bash
+      set -eux -o pipefail
+      if ! timeout 30s bash -c "until command -v terraform >/dev/null 2>&1; do sleep 3; done"; then
+        echo >&2 "terraform is not installed yet"
+        exit 1
+      fi
+    hint: |
+      See "/var/log/cloud-init-output.log" in the guest.
 message: |
   All Done! Your Coder instance is accessible at http://localhost:3000
 
   Username: "admin@coder.com"
-  Password: Run `LIMA_INSTANCE=coder lima cat /home/${USER}.linux/.config/coderv2/password` 🤫
+  Password: Run `LIMA_INSTANCE={{.Instance.Name}} lima cat /home/${USER}.linux/.config/coderv2/password` 🤫
 
   Get started creating your own template now:
   ------
-  limactl shell coder
+  limactl shell {{.Instance.Name}}
   cd && coder templates init
   ------
