From b78f8cdf20cb352555f779f40e2af872682fa12e Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 25 Sep 2024 14:45:00 +0100 Subject: [PATCH 1/2] fix(envbuilder-dogfood): configure provider and add variable to point to docker config JSON path on provisioner --- envbuilder-dogfood/main.tf | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/envbuilder-dogfood/main.tf b/envbuilder-dogfood/main.tf index dcf6446fef184..c566bf4a7193b 100644 --- a/envbuilder-dogfood/main.tf +++ b/envbuilder-dogfood/main.tf @@ -80,8 +80,19 @@ data "coder_parameter" "region" { } } +# This file is mounted as a Kubernetes secret on provisioner pods. +# It contains the required credentials for the envbuilder cache repo. +variable "envbuilder_cache_dockerconfigjson_path" { + type = string + sensitive = true +} + provider "docker" { host = lookup(local.docker_host, data.coder_parameter.region.value) + registry_auth { + address = "us-central1-docker.pkg.dev" + config_file = pathexpand(var.envbuilder_cache_dockerconfigjson_path) + } } provider "coder" {} @@ -326,7 +337,7 @@ resource "docker_volume" "workspaces" { # This file is mounted as a Kubernetes secret on provisioner pods. # It contains the required credentials for the envbuilder cache repo. data "local_sensitive_file" "envbuilder_cache_dockerconfigjson" { - filename = "/home/coder/envbuilder-cache-dockerconfig.json" + filename = var.envbuilder_cache_dockerconfigjson_path } data "docker_registry_image" "envbuilder" { From 84a98d8d97073816b9d3e4cc9042f93307e5d0f0 Mon Sep 17 00:00:00 2001 From: Cian Johnston Date: Wed, 25 Sep 2024 14:50:35 +0100 Subject: [PATCH 2/2] make fmt --- envbuilder-dogfood/main.tf | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/envbuilder-dogfood/main.tf b/envbuilder-dogfood/main.tf index c566bf4a7193b..1d4771ff0c48f 100644 --- a/envbuilder-dogfood/main.tf +++ b/envbuilder-dogfood/main.tf @@ -83,14 +83,14 @@ data "coder_parameter" "region" { # This file is mounted as a Kubernetes secret on provisioner pods. # It contains the required credentials for the envbuilder cache repo. variable "envbuilder_cache_dockerconfigjson_path" { - type = string + type = string sensitive = true } provider "docker" { host = lookup(local.docker_host, data.coder_parameter.region.value) registry_auth { - address = "us-central1-docker.pkg.dev" + address = "us-central1-docker.pkg.dev" config_file = pathexpand(var.envbuilder_cache_dockerconfigjson_path) } }