diff --git a/docker/lychee.tf b/docker/lychee.tf index 079dcc5..a2f0a9c 100644 --- a/docker/lychee.tf +++ b/docker/lychee.tf @@ -1,37 +1,31 @@ -resource "docker_container" "lychee" { - name = "lychee" - image = "${docker_image.lychee.latest}" +# resource "docker_container" "lychee" { +# name = "lychee" +# image = "${docker_image.lychee.latest}" +# restart = "unless-stopped" +# destroy_grace_seconds = 10 +# must_run = true +# volumes { +# host_path = "/mnt/xwing/config/lychee" +# container_path = "/config" +# } +# volumes { +# host_path = "/mnt/xwing/data/lychee" +# container_path = "/pictures" +# } +# upload { +# content = "${file("${path.module}/conf/lychee.php.ini")}" +# file = "/config/lychee/user.ini" +# } +# labels = "${merge( +# local.traefik_common_labels, +# map( +# "traefik.port", 80, +# "traefik.frontend.rule", "Host:pics.${var.domain}", +# ))}" +# env = [ +# "PUID=986", +# "PGID=984", +# ] +# # links = ["${var.links-mariadb}"] +# } - restart = "unless-stopped" - destroy_grace_seconds = 10 - must_run = true - - volumes { - host_path = "/mnt/xwing/config/lychee" - container_path = "/config" - } - - volumes { - host_path = "/mnt/xwing/data/lychee" - container_path = "/pictures" - } - - upload { - content = "${file("${path.module}/conf/lychee.php.ini")}" - file = "/config/lychee/user.ini" - } - - labels = "${merge( - local.traefik_common_labels, - map( - "traefik.port", 80, - "traefik.frontend.rule", "Host:pics.${var.domain}", - ))}" - - env = [ - "PUID=986", - "PGID=984", - ] - - # links = ["${var.links-mariadb}"] -} diff --git a/docker/outputs.tf b/docker/outputs.tf index d0fa477..99b17d9 100644 --- a/docker/outputs.tf +++ b/docker/outputs.tf @@ -1,6 +1,6 @@ -output "lychee-ip" { - value = "${docker_container.lychee.ip_address}" -} +# output "lychee-ip" { +# value = "${docker_container.lychee.ip_address}" +# } output "names-traefik" { value = "${docker_container.traefik.name}" diff --git a/stringer.tf b/stringer.tf index b61f4d2..081a96f 100644 --- a/stringer.tf +++ b/stringer.tf @@ -4,33 +4,39 @@ module "stringer-db" { password = "${data.pass_password.stringer-db-password.password}" } -module "stringer-container" { - name = "stringer" - source = "modules/container" - image = "mdswanson/stringer" +# module "stringer-container" { +# name = "stringer" +# source = "modules/container" +# image = "mdswanson/stringer" - resource { - memory = 256 - memory_swap = 256 - } - web { - expose = true - port = 8080 - host = "stringer.bb8.fun" - } +# resource { +# memory = 256 +# memory_swap = 256 +# } - networks = "${list( - data.docker_network.bridge.id, - module.docker.traefik-network-id, - module.db.postgres-network-id - )}" - env = [ - # "DATABASE_URL=postgres://stringer:${data.pass_password.stringer-db-password.password}@postgres:5432/stringer", - "DATABASE_URL=sqlite3:':memory:'", +# web { +# expose = true +# port = 8080 +# host = "stringer.bb8.fun" +# } + + +# networks = "${list( +# data.docker_network.bridge.id, +# module.docker.traefik-network-id, +# module.db.postgres-network-id +# )}" + + +# env = [ +# # "DATABASE_URL=postgres://stringer:${data.pass_password.stringer-db-password.password}@postgres:5432/stringer", +# "DATABASE_URL=sqlite3:':memory:'", + + +# "SECRET_TOKEN=${data.pass_password.stringer-secret-token.password}", +# "RACK_ENV=development", +# ] +# } - "SECRET_TOKEN=${data.pass_password.stringer-secret-token.password}", - "RACK_ENV=development", - ] -}