diff --git a/Dockerfile-cdp b/Dockerfile-cdp index 5cdb478..c9a7fda 100644 --- 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 index dcc723c..fb3e83b 100644 --- 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 index ba2bcb4..99fba6d 100644 --- 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 index 88e2126..277ead2 100644 --- 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 index 8114b60..c118ab9 100644 --- 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 index 30bcd51..b88d84f 100644 --- 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"