diff --git a/db/mariadb.tf b/db/mariadb.tf index de2a474..787f562 100644 --- a/db/mariadb.tf +++ b/db/mariadb.tf @@ -35,6 +35,8 @@ resource "docker_container" "mariadb" { command = [ "--version=${var.mariadb-version}-MariaDB", ] + + networks = ["${docker_network.mariadb.id}"] } resource "docker_image" "mariadb" { diff --git a/db/mongorocks.tf b/db/mongorocks.tf index 9de189b..5e17519 100644 --- a/db/mongorocks.tf +++ b/db/mongorocks.tf @@ -19,6 +19,8 @@ resource "docker_container" "mongorocks" { "--rest", "--master", ] + + networks = ["${docker_network.mongorocks.id}"] } resource "docker_image" "percona-mongodb-server" { diff --git a/db/network.tf b/db/network.tf new file mode 100644 index 0000000..414a775 --- /dev/null +++ b/db/network.tf @@ -0,0 +1,19 @@ +resource "docker_network" "mariadb" { + name = "mariadb" + driver = "bridge" + + ipam_config { + subnet = "172.19.0.0/28" + gateway = "172.19.0.1" + } +} + +resource "docker_network" "mongorocks" { + name = "mongorocks" + driver = "bridge" + + ipam_config { + subnet = "172.20.0.0/29" + gateway = "172.20.0.1" + } +} diff --git a/db/outputs.tf b/db/outputs.tf index ffeff05..12eb24f 100644 --- a/db/outputs.tf +++ b/db/outputs.tf @@ -2,6 +2,6 @@ output "names-mariadb" { value = "${docker_container.mariadb.name}" } -output "names-mongorocks" { - value = "${docker_container.mongorocks.name}" +output "networks-mongorocks" { + value = "${docker_network.mongorocks.name}" } diff --git a/docker/variables.tf b/docker/variables.tf index 76c5b22..0e0a339 100644 --- a/docker/variables.tf +++ b/docker/variables.tf @@ -52,4 +52,4 @@ variable "ips" { variable "links-mariadb" {} -variable "links-mongorocks" {} +variable "networks-mongorocks" {} diff --git a/docker/wiki.tf b/docker/wiki.tf index 09e9224..503bbee 100644 --- a/docker/wiki.tf +++ b/docker/wiki.tf @@ -43,7 +43,9 @@ resource "docker_container" "wiki" { "traefik.port", 9999, "traefik.frontend.headers.customResponseHeaders", "${var.xpoweredby}||Referrer-Policy:${var.refpolicy}||X-Frame-Options:${var.xfo_allow}", ))}" - links = ["${var.links-mongorocks}"] + networks = [ + "${var.networks-mongorocks}", + ] env = [ "WIKI_ADMIN_EMAIL=me@captnemo.in", "SESSION_SECRET=${var.wiki_session_secret}", diff --git a/main.tf b/main.tf index 7fb5415..7c5ca2d 100644 --- a/main.tf +++ b/main.tf @@ -21,7 +21,7 @@ module "docker" { cloudflare_email = "bb8@captnemo.in" wiki_session_secret = "${var.wiki_session_secret}" links-mariadb = "${module.db.names-mariadb}" - links-mongorocks = "${module.db.names-mongorocks}" + networks-mongorocks = "${module.db.networks-mongorocks}" ips = "${var.ips}" domain = "bb8.fun" } @@ -95,7 +95,7 @@ module "media" { links-emby = "${module.media.names-emby}" links-transmission = "${module.media.names-transmission}" links-mariadb = "${module.db.names-mariadb}" - links-mongorocks = "${module.db.names-mongorocks}" + links-mongorocks = "${module.db.networks-mongorocks}" traefik-labels = "${var.traefik-common-labels}" airsonic-smtp-password = "${var.airsonic-smtp-password}" airsonic-db-password = "${var.mysql_airsonic_password}"