[docker] Dealing from the aftermath of docker provider release

- It stops adding the bridge network by default so it causes issues
This commit is contained in:
Nemo 2019-01-20 03:46:18 +05:30
parent d1d3506e7b
commit 93af050523
4 changed files with 15 additions and 4 deletions

View File

@ -32,7 +32,7 @@ resource "docker_container" "postgres" {
"POSTGRES_PASSWORD=${var.postgres-root-password}",
]
networks = ["${docker_network.postgres.id}"]
networks = ["${docker_network.postgres.id}", "${data.docker_network.bridge.id}"]
}
resource "docker_image" "postgres" {
@ -43,3 +43,7 @@ resource "docker_image" "postgres" {
data "docker_registry_image" "postgres" {
name = "postgres:${var.postgres-version}"
}
data "docker_network" "bridge" {
name = "bridge"
}

View File

@ -10,7 +10,8 @@ locals {
}
resource {
"memory" = "${lookup(var.resource, "memory", 64)}"
memory = "${lookup(var.resource, "memory", 64)}"
memory_swap = "${lookup(var.resource, "memory_swap", 128)}"
}
traefik_common_labels {

View File

@ -16,7 +16,7 @@ resource "docker_container" "container" {
image = "${docker_image.image.latest}"
ports = "${var.ports}"
restart = "${var.restart}"
env = "${var.env}"
env = ["${var.env}"]
command = "${var.command}"
entrypoint = "${var.entrypoint}"
user = "${var.user}"
@ -27,7 +27,8 @@ resource "docker_container" "container" {
// service is exposed to the web
networks = ["${concat(var.networks,compact(split(",",lookup(var.web, "expose", "false") == "false" ? "" :"${data.docker_network.traefik.id}")))}"]
memory = "${local.resource["memory"]}"
memory = "${local.resource["memory"]}"
memory_swap = "${local.resource["memory_swap"]}"
volumes = ["${var.volumes}"]

View File

@ -30,6 +30,7 @@ resource "docker_container" "prometheus" {
}
networks = [
"${data.docker_network.bridge.id}",
"${docker_network.monitoring.id}",
]
@ -37,3 +38,7 @@ resource "docker_container" "prometheus" {
destroy_grace_seconds = 10
must_run = true
}
data "docker_network" "bridge" {
name = "bridge"
}