From 64a85f0c880f1a61a523d8ee75ce3bba84ccfd89 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 30 May 2025 23:11:18 +0000 Subject: [PATCH 1/2] fix: rm duplicated envbuilder env vars --- examples/templates/kubernetes-devcontainer/main.tf | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/examples/templates/kubernetes-devcontainer/main.tf b/examples/templates/kubernetes-devcontainer/main.tf index 28a49ba2427b1..b5d4e57919aca 100644 --- a/examples/templates/kubernetes-devcontainer/main.tf +++ b/examples/templates/kubernetes-devcontainer/main.tf @@ -157,8 +157,6 @@ locals { envbuilder_env = { # ENVBUILDER_GIT_URL and ENVBUILDER_CACHE_REPO will be overridden by the provider # if the cache repo is enabled. - "ENVBUILDER_GIT_URL" : local.repo_url, - "ENVBUILDER_CACHE_REPO" : var.cache_repo, "CODER_AGENT_TOKEN" : coder_agent.main.token, # Use the docker gateway if the access URL is 127.0.0.1 "CODER_AGENT_URL" : replace(data.coder_workspace.me.access_url, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal"), @@ -166,8 +164,7 @@ locals { "ENVBUILDER_INIT_SCRIPT" : replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal"), "ENVBUILDER_FALLBACK_IMAGE" : data.coder_parameter.fallback_image.value, "ENVBUILDER_DOCKER_CONFIG_BASE64" : base64encode(try(data.kubernetes_secret.cache_repo_dockerconfig_secret[0].data[".dockerconfigjson"], "")), - "ENVBUILDER_PUSH_IMAGE" : var.cache_repo == "" ? "" : "true", - "ENVBUILDER_INSECURE" : "${var.insecure_cache_repo}", + "ENVBUILDER_PUSH_IMAGE" : var.cache_repo == "" ? "" : "true" # You may need to adjust this if you get an error regarding deleting files when building the workspace. # For example, when testing in KinD, it was necessary to set `/product_name` and `/product_uuid` in # addition to `/var/run`. From cc38629210a304e9be23b772c8901f37ad2fcc38 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 3 Jun 2025 13:11:48 +0000 Subject: [PATCH 2/2] set cache repo logic --- examples/templates/kubernetes-devcontainer/main.tf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/examples/templates/kubernetes-devcontainer/main.tf b/examples/templates/kubernetes-devcontainer/main.tf index b5d4e57919aca..8fc79fa25c57e 100644 --- a/examples/templates/kubernetes-devcontainer/main.tf +++ b/examples/templates/kubernetes-devcontainer/main.tf @@ -155,11 +155,12 @@ locals { repo_url = data.coder_parameter.repo.value # The envbuilder provider requires a key-value map of environment variables. envbuilder_env = { - # ENVBUILDER_GIT_URL and ENVBUILDER_CACHE_REPO will be overridden by the provider - # if the cache repo is enabled. "CODER_AGENT_TOKEN" : coder_agent.main.token, # Use the docker gateway if the access URL is 127.0.0.1 "CODER_AGENT_URL" : replace(data.coder_workspace.me.access_url, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal"), + # ENVBUILDER_GIT_URL and ENVBUILDER_CACHE_REPO will be overridden by the provider + # if the cache repo is enabled. + "ENVBUILDER_GIT_URL" : var.cache_repo == "" ? local.repo_url : "", # Use the docker gateway if the access URL is 127.0.0.1 "ENVBUILDER_INIT_SCRIPT" : replace(coder_agent.main.init_script, "/localhost|127\\.0\\.0\\.1/", "host.docker.internal"), "ENVBUILDER_FALLBACK_IMAGE" : data.coder_parameter.fallback_image.value,