Fix images

hashicorp · Oct 11, 2023 · 6c16141 · 6c16141
1 parent c76447f
commit 6c16141
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/examples/locality-aware-routing/variables.tf b/examples/locality-aware-routing/variables.tf
@@ -26,7 +26,7 @@ variable "lb_ingress_ip" {
 variable "consul_ecs_image" {
   description = "Consul ECS image to use in all tasks."
   type        = string
-  default     = "hashicorppreview/consul-ecs:0.7.0-rc1"
+  default     = "hashicorp/consul-ecs:0.7.0-rc1"
 }
 
 variable "consul_server_startup_timeout" {
@@ -38,5 +38,5 @@ variable "consul_server_startup_timeout" {
 variable "consul_image" {
   description = "Consul Docker image."
   type        = string
-  default     = "hashicorppreview/consul-enterprise:1.17-dev"
+  default     = "hashicorp/consul-enterprise:1.17.0-rc1-ent"
 }
diff --git a/modules/dev-server/consul_1_14_compat.tf b/modules/dev-server/consul_1_14_compat.tf
@@ -3,6 +3,6 @@
 
 locals {
   // parse the consul version from the provided image: ["1", "12", "2"]
-  # consul_image_version_parts = regex(":.*(\\d+)[.](\\d+)[.](\\d+)", var.consul_image)
-  is_consul_1_14_plus = true //tonumber(local.consul_image_version_parts[1]) >= 14
+  consul_image_version_parts = regex(":.*(\\d+)[.](\\d+)[.](\\d+)", var.consul_image)
+  is_consul_1_14_plus = tonumber(local.consul_image_version_parts[1]) >= 14
 }