From 93af05052365c516ca00616c33b429738b9ed776 Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Sun, 20 Jan 2019 03:46:18 +0530
Subject: [PATCH] [docker] Dealing from the aftermath of docker provider
 release

- It stops adding the bridge network by default so it causes issues
---
 db/postgres.tf              | 6 +++++-
 modules/container/locals.tf | 3 ++-
 modules/container/main.tf   | 5 +++--
 monitoring/prometheus.tf    | 5 +++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/db/postgres.tf b/db/postgres.tf
index ef905f8..f56cb20 100644
--- a/db/postgres.tf
+++ b/db/postgres.tf
@@ -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"
+}
diff --git a/modules/container/locals.tf b/modules/container/locals.tf
index c97f35f..8d96c2e 100644
--- a/modules/container/locals.tf
+++ b/modules/container/locals.tf
@@ -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 {
diff --git a/modules/container/main.tf b/modules/container/main.tf
index b6b8aca..2c9d59c 100644
--- a/modules/container/main.tf
+++ b/modules/container/main.tf
@@ -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}"]
 
diff --git a/monitoring/prometheus.tf b/monitoring/prometheus.tf
index 6647ecc..80d83ba 100644
--- a/monitoring/prometheus.tf
+++ b/monitoring/prometheus.tf
@@ -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"
+}