More work on networks instead of links

This commit is contained in:
Nemo 2018-05-29 19:36:55 +05:30
parent 1a714d87b2
commit d9a6c5fdf1
7 changed files with 31 additions and 6 deletions

View File

@ -35,6 +35,8 @@ resource "docker_container" "mariadb" {
command = [
"--version=${var.mariadb-version}-MariaDB",
]
networks = ["${docker_network.mariadb.id}"]
}
resource "docker_image" "mariadb" {

View File

@ -19,6 +19,8 @@ resource "docker_container" "mongorocks" {
"--rest",
"--master",
]
networks = ["${docker_network.mongorocks.id}"]
}
resource "docker_image" "percona-mongodb-server" {

19
db/network.tf Normal file
View File

@ -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"
}
}

View File

@ -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}"
}

View File

@ -52,4 +52,4 @@ variable "ips" {
variable "links-mariadb" {}
variable "links-mongorocks" {}
variable "networks-mongorocks" {}

View File

@ -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}",

View File

@ -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}"