From cbd36ca1e73469ef3eb553fb7f06537bdcef0149 Mon Sep 17 00:00:00 2001
From: Nemo <me@captnemo.in>
Date: Tue, 21 Aug 2018 08:30:17 +0530
Subject: [PATCH] Adds support for single volumes
---
media/jackett.tf | 34 +++++++++++++++-------------------
modules/container/main.tf | 2 ++
modules/container/vars.tf | 5 +++++
3 files changed, 18 insertions(+), 23 deletions(-)
diff --git a/media/jackett.tf b/media/jackett.tf
index 4ebd32d..1e72f7d 100644
--- a/media/jackett.tf
+++ a/media/jackett.tf
@@ -1,32 +1,20 @@
-data "docker_registry_image" "jackett" {
- name = "linuxserver/jackett:latest"
-}
-
-resource "docker_image" "jackett" {
- name = "${data.docker_registry_image.jackett.name}"
- pull_triggers = ["${data.docker_registry_image.jackett.sha256_digest}"]
-}
-
-resource "docker_container" "jackett" {
- name = "jackett"
- image = "${docker_image.jackett.latest}"
-
- labels = "${merge(
- var.traefik-labels, map(
- "traefik.port", 9117,
- "traefik.frontend.rule","Host:jackett.${var.domain}"
- ))}"
+module "jackett" {
+ name = "jackett"
+ source = "../modules/container"
+ image = "linuxserver/jackett:latest"
+
+ web {
+ expose = true
+ port = 9117
+ host = "jackett.${var.domain}"
+ }
- restart = "unless-stopped"
- destroy_grace_seconds = 10
- must_run = true
+ networks = ["${docker_network.media.id}", "${var.traefik-network-id}"]
volumes {
host_path = "/mnt/xwing/config/jackett"
container_path = "/config"
}
-
- networks = ["${docker_network.media.id}", "${var.traefik-network-id}"]
env = [
"PUID=1004",
diff --git a/modules/container/main.tf b/modules/container/main.tf
index 9ef703c..1e37603 100644
--- a/modules/container/main.tf
+++ a/modules/container/main.tf
@@ -20,6 +20,8 @@
memory = "${local.resource["memory"]}"
+ volumes = ["${var.volumes}"]
+
# Look at this monstrosity
# And then https://github.com/hashicorp/terraform/issues/12453#issuecomment-365569618
# for why this is needed
diff --git a/modules/container/vars.tf b/modules/container/vars.tf
index b3ff5fb..6fb586f 100644
--- a/modules/container/vars.tf
+++ a/modules/container/vars.tf
@@ -82,3 +82,8 @@
default = {}
}
+
+variable "volumes" {
+ description = "volumes"
+ default = {}
+}
--
rgit 0.1.5