diff --git a/container-vm/README.md b/container-vm/README.md index c32efee..0368cd1 100644 --- a/container-vm/README.md +++ b/container-vm/README.md @@ -36,4 +36,6 @@ module "container_vm" { } } } + +// Next, create VM instances from this template, route traffic to them via GCLB, etc. ``` diff --git a/container-vm/cloud-init.yaml.tftpl b/container-vm/cloud-init.yaml.tftpl index 119fc9e..fe7760d 100644 --- a/container-vm/cloud-init.yaml.tftpl +++ b/container-vm/cloud-init.yaml.tftpl @@ -29,8 +29,7 @@ write_files: ExecStartPre=-/usr/bin/docker rm ${name} # Configure docker credential helper for Artifact Registry - # TODO(jason): Set this for each requested registry region. - ExecStartPre=/usr/bin/docker-credential-gcr configure-docker --registries=us-east4-docker.pkg.dev + ExecStartPre=/usr/bin/docker-credential-gcr configure-docker --registries=${region}-docker.pkg.dev # Pull the image before starting. ExecStartPre=/usr/bin/docker pull ${container.image} diff --git a/container-vm/main.tf b/container-vm/main.tf index c2ad7f9..ccda342 100644 --- a/container-vm/main.tf +++ b/container-vm/main.tf @@ -10,6 +10,7 @@ locals { containers = var.containers, enable_logging = var.enable_logging, project_id = var.project_id, + region = var.region, }) }