fix this using deployer

rboyer · Oct 4, 2024 · db8a2f5 · db8a2f5
1 parent 29b0808
commit db8a2f5
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 3 deletions.
diff --git a/Dockerfile-cdp b/Dockerfile-cdp
@@ -1,5 +1,5 @@
 ARG DATAPLANE_IMAGE
-FROM busybox:latest
+FROM busybox:1.34
 FROM ${DATAPLANE_IMAGE}
 COPY --from=0 /bin/busybox /bin/busybox
 USER 0:0

diff --git a/app/tfgen/templates/container-pause.tf.tmpl b/app/tfgen/templates/container-pause.tf.tmpl
@@ -20,6 +20,7 @@ resource "docker_container" "{{.PodName}}" {
   }
 {{- end }}
 
+network_mode = "bridge"
 {{- range .Node.Addresses }}
 networks_advanced {
   name         = docker_network.devconsul-{{.Network}}.name

diff --git a/app/tfgen/templates/container-prometheus.tf b/app/tfgen/templates/container-prometheus.tf
@@ -20,6 +20,7 @@ resource "docker_container" "prometheus" {
     container_path = "/etc/prometheus/prometheus.yml"
     read_only      = true
   }
+  network_mode = "bridge"
   networks_advanced {
     name         = docker_network.devconsul-lan.name
     ipv4_address = "10.0.100.100"

diff --git a/app/tfgen/templates/container-vault.tf b/app/tfgen/templates/container-vault.tf
@@ -26,6 +26,7 @@ resource "docker_container" "vault" {
     read_only      = true
   }
 
+  network_mode = "bridge"
   networks_advanced {
     name         = docker_network.devconsul-lan.name
     ipv4_address = "10.0.100.111"

diff --git a/config/default_cdp.go b/config/default_cdp.go
@@ -1,3 +1,3 @@
 package config
 
-const DefaultDataplaneImage = "hashicorp/consul-dataplane:1.0.0"
+const DefaultDataplaneImage = "hashicorp/consul-dataplane:1.5.3"
diff --git a/versions.tf b/versions.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     docker = {
       source  = "kreuzwerker/docker"
-      version = "2.11.0"
+      version = "~> 2.0"
     }
   }
   required_version = ">= 0.13"