Merge remote-tracking branch 'origin/main' into stevenmasley/dotfiles_options

Emyrk · Emyrk · commit d03730cd656b · 2023-07-06T15:45:24.000-04:00
diff --git a/.github/actions/setup-node/action.yaml b/.github/actions/setup-node/action.yaml
@@ -6,7 +6,7 @@ runs:
   steps:
     - uses: buildjet/setup-node@v3
       with:
-        node-version: 16.16.0
+        node-version: 16.20.1
         # See https://github.com/actions/setup-node#caching-global-packages-data
         cache: "yarn"
         cache-dependency-path: "site/yarn.lock"
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -192,9 +192,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v3
 
-      - uses: buildjet/setup-node@v3
-        with:
-          node-version: 16.16.0
+      - uses: ./.github/actions/setup-node
 
       - uses: buildjet/setup-go@v4
         with:
diff --git a/examples/templates/fly-docker-image/main.tf b/examples/templates/fly-docker-image/main.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     fly = {
       source  = "fly-apps/fly"
-      version = "~>0.0.21"
+      version = "~>0.0.23"
     }
     coder = {
       source  = "coder/coder"
@@ -12,10 +12,7 @@ terraform {
 }
 
 provider "fly" {
-  useinternaltunnel    = true
-  internaltunnelorg    = var.fly_org
-  internaltunnelregion = data.coder_parameter.region.value
-  fly_api_token        = var.fly_api_token == "" ? null : var.fly_api_token
+  fly_api_token = var.fly_api_token == "" ? null : var.fly_api_token
 }
 
 provider "coder" {
@@ -27,11 +24,6 @@ resource "fly_app" "workspace" {
   org  = var.fly_org
 }
 
-# resource "fly_ip" "workspace-ip4" {
-#   app  = fly_app.workspace.name
-#   type = "v4"
-# }
-
 resource "fly_volume" "home-volume" {
   app    = fly_app.workspace.name
   name   = "coder_${data.coder_workspace.me.owner}_${lower(replace(data.coder_workspace.me.name, "-", "_"))}_home"
@@ -51,7 +43,6 @@ resource "fly_machine" "workspace" {
   env = {
     CODER_AGENT_TOKEN = "${coder_agent.main.token}"
   }
-  # entrypoint = ["sh", "-c", replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "${fly_ip.workspace-ip4.address}")] # replace localhost with the IP of the workspace
   entrypoint = ["sh", "-c", coder_agent.main.init_script]
   services = [
     {
