From 9b78b43c7fd00fc4f33c48f0b21dc45f7af107bb Mon Sep 17 00:00:00 2001 From: Marc Fokkert Date: Fri, 21 Feb 2025 12:23:41 +0100 Subject: [PATCH] Use volume for datarr Disable rutorrent and esphome Updates --- esphome.tf => _disabled/esphome.tf | 0 ru-torrent.tf => _disabled/ru-torrent.tf | 0 audiobookshelf.tf | 6 - jellyfin.tf | 13 +- radarr.tf | 7 +- readarr.tf | 7 +- sabnzdb.tf | 7 +- sonarr.tf | 7 +- terraform.tfstate | 807 +++++------------------ terraform.tfstate.backup | 34 +- 10 files changed, 199 insertions(+), 689 deletions(-) rename esphome.tf => _disabled/esphome.tf (100%) rename ru-torrent.tf => _disabled/ru-torrent.tf (100%) diff --git a/esphome.tf b/_disabled/esphome.tf similarity index 100% rename from esphome.tf rename to _disabled/esphome.tf diff --git a/ru-torrent.tf b/_disabled/ru-torrent.tf similarity index 100% rename from ru-torrent.tf rename to _disabled/ru-torrent.tf diff --git a/audiobookshelf.tf b/audiobookshelf.tf index 38a00af..3a90b32 100644 --- a/audiobookshelf.tf +++ b/audiobookshelf.tf @@ -40,12 +40,6 @@ resource "docker_container" "audiobookshelf" { volume_name = "truenas-arr" } - # mounts { - # target = "/audiobooks" - # source = "/share/datarr/media/audiobooks" - # type = "bind" - # } - lifecycle { ignore_changes = [ ulimit, diff --git a/jellyfin.tf b/jellyfin.tf index c9e9677..22a207a 100644 --- a/jellyfin.tf +++ b/jellyfin.tf @@ -38,16 +38,9 @@ resource "docker_container" "jellyfin" { } # https://wiki.servarr.com/docker-guide#Consistent_and_well_planned_paths - mounts { - target = "/media" - source = "/share/datarr/media" - type = "bind" - } - - mounts { - target = "/media-hdd" - source = "/share/datarr-hdd/media" - type = "bind" + volumes { + container_path = "/datarr" + volume_name = "truenas-arr" } devices { diff --git a/radarr.tf b/radarr.tf index 23f212a..2686de1 100644 --- a/radarr.tf +++ b/radarr.tf @@ -31,10 +31,9 @@ resource "docker_container" "radarr" { type = "bind" } - mounts { - target = "/data" - source = "/share/datarr" - type = "bind" + volumes { + container_path = "/data" + volume_name = "truenas-arr" } lifecycle { diff --git a/readarr.tf b/readarr.tf index 8b39225..8ddb4b2 100644 --- a/readarr.tf +++ b/readarr.tf @@ -31,10 +31,9 @@ resource "docker_container" "readarr" { type = "bind" } - mounts { - target = "/data" - source = "/share/datarr" - type = "bind" + volumes { + container_path = "/data" + volume_name = "truenas-arr" } lifecycle { diff --git a/sabnzdb.tf b/sabnzdb.tf index cc4649a..57ef128 100644 --- a/sabnzdb.tf +++ b/sabnzdb.tf @@ -32,10 +32,9 @@ resource "docker_container" "sabnzdb" { type = "bind" } - mounts { - target = "/data/usenet" - source = "/share/datarr/usenet" - type = "bind" + volumes { + container_path = "/data" + volume_name = "truenas-arr" } lifecycle { diff --git a/sonarr.tf b/sonarr.tf index 27dfe4e..069eecf 100644 --- a/sonarr.tf +++ b/sonarr.tf @@ -31,10 +31,9 @@ resource "docker_container" "sonarr" { type = "bind" } - mounts { - target = "/data" - source = "/share/datarr" - type = "bind" + volumes { + container_path = "/data" + volume_name = "truenas-arr" } lifecycle { diff --git a/terraform.tfstate b/terraform.tfstate index 3c5ad90..7c3e75c 100644 --- a/terraform.tfstate +++ b/terraform.tfstate @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.5.5", - "serial": 4574, + "serial": 4596, "lineage": "fcc74498-a461-682e-d8e4-5bc8c6ea51ec", "outputs": {}, "resources": [ @@ -131,24 +131,6 @@ } ] }, - { - "mode": "data", - "type": "docker_registry_image", - "name": "esphome", - "provider": "provider[\"registry.terraform.io/kreuzwerker/docker\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "sha256:00ca3a161a5f59892435eff9f25f36739ab89e919352ba97a209c7da3495035e", - "insecure_skip_verify": false, - "name": "esphome/esphome", - "sha256_digest": "sha256:00ca3a161a5f59892435eff9f25f36739ab89e919352ba97a209c7da3495035e" - }, - "sensitive_attributes": [] - } - ] - }, { "mode": "data", "type": "docker_registry_image", @@ -446,10 +428,10 @@ { "schema_version": 0, "attributes": { - "id": "sha256:528e4044f67da14f3aecedda92f939c87b7b1e69fe67d09ac2b3e7fdc1f72515", + "id": "sha256:83af1529136e39802e819e303b190e40147ac44c3e050398e1a53de6c0c701dd", "insecure_skip_verify": false, "name": "pihole/pihole:latest", - "sha256_digest": "sha256:528e4044f67da14f3aecedda92f939c87b7b1e69fe67d09ac2b3e7fdc1f72515" + "sha256_digest": "sha256:83af1529136e39802e819e303b190e40147ac44c3e050398e1a53de6c0c701dd" }, "sensitive_attributes": [] } @@ -563,24 +545,6 @@ } ] }, - { - "mode": "data", - "type": "docker_registry_image", - "name": "ru-torrent", - "provider": "provider[\"registry.terraform.io/kreuzwerker/docker\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "id": "sha256:b3a878b9a1da2c3b29066f6c39949fc4b2a10c530668457d462b2692e5b73a04", - "insecure_skip_verify": false, - "name": "linuxserver/rutorrent", - "sha256_digest": "sha256:b3a878b9a1da2c3b29066f6c39949fc4b2a10c530668457d462b2692e5b73a04" - }, - "sensitive_attributes": [] - } - ] - }, { "mode": "data", "type": "docker_registry_image", @@ -954,9 +918,9 @@ "cpu_shares": 0, "destroy_grace_seconds": null, "devices": [], - "dns": null, - "dns_opts": null, - "dns_search": null, + "dns": [], + "dns_opts": [], + "dns_search": [], "domainname": "", "entrypoint": [ "tini", @@ -967,8 +931,8 @@ ], "exit_code": null, "gpus": null, - "group_add": null, - "healthcheck": null, + "group_add": [], + "healthcheck": [], "host": [], "hostname": "c1640b5ae290", "id": "c1640b5ae29093277bc6e56fd5f63d2fd633ccd624a00bd7ff73ac8f337fa761", @@ -977,7 +941,7 @@ "ipc_mode": "private", "labels": [], "log_driver": "local", - "log_opts": null, + "log_opts": {}, "logs": false, "max_retry_count": 0, "memory": 0, @@ -985,7 +949,7 @@ "mounts": [ { "bind_options": [], - "read_only": null, + "read_only": false, "source": "/share/appdata/audiobookshelf/config", "target": "/config", "tmpfs_options": [], @@ -994,7 +958,7 @@ }, { "bind_options": [], - "read_only": null, + "read_only": false, "source": "/share/appdata/audiobookshelf/metadata", "target": "/metadata", "tmpfs_options": [], @@ -1040,11 +1004,17 @@ "stdin_open": false, "stop_signal": "", "stop_timeout": 0, - "storage_opts": null, - "sysctls": null, - "tmpfs": null, + "storage_opts": {}, + "sysctls": {}, + "tmpfs": {}, "tty": false, - "ulimit": [], + "ulimit": [ + { + "hard": 65535, + "name": "nofile", + "soft": 65535 + } + ], "upload": [], "user": "", "userns_mode": "", @@ -1053,7 +1023,7 @@ "container_path": "/truenas-arr", "from_container": "", "host_path": "", - "read_only": null, + "read_only": false, "volume_name": "truenas-arr" } ], @@ -1064,6 +1034,7 @@ "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==", "dependencies": [ + "data.docker_registry_image.audiobookshelf", "docker_image.audiobookshelf", "docker_network.bridge" ] @@ -1617,7 +1588,7 @@ "healthcheck": null, "host": [], "hostname": "dozzle", - "id": "99c1820243302f11ddf3b1e4da4e1f7c9da875ef45aa772c394164abc4598705", + "id": "c2b182acdd1ed19d3c89ec78522533fcaf1c49838f4b2d5a17a947815549c771", "image": "sha256:9ceba54318cdeb63bbfa21d6176af1720f46a323c62aee80f43db15f47c9eceb", "init": false, "ipc_mode": "private", @@ -1649,7 +1620,7 @@ "ip_address": "192.168.2.144", "ip_prefix_length": 24, "ipv6_gateway": "", - "mac_address": "02:42:05:1e:42:67", + "mac_address": "02:42:ad:20:12:fb", "network_name": "qnet-static-eth0-48e715" } ], @@ -1699,150 +1670,6 @@ } ] }, - { - "mode": "managed", - "type": "docker_container", - "name": "esphome", - "provider": "provider[\"registry.terraform.io/kreuzwerker/docker\"]", - "instances": [ - { - "schema_version": 2, - "attributes": { - "attach": false, - "bridge": "", - "capabilities": [], - "cgroupns_mode": null, - "command": [ - "dashboard", - "/config" - ], - "container_logs": null, - "container_read_refresh_timeout_milliseconds": 15000, - "cpu_set": "", - "cpu_shares": 0, - "destroy_grace_seconds": null, - "devices": [], - "dns": [ - "172.20.0.0" - ], - "dns_opts": [], - "dns_search": [ - "internal" - ], - "domainname": "", - "entrypoint": [ - "/entrypoint.sh" - ], - "env": [], - "exit_code": null, - "gpus": null, - "group_add": [], - "healthcheck": [ - { - "interval": "30s", - "retries": 0, - "start_period": "0s", - "test": [ - "CMD-SHELL", - "curl --fail http://localhost:6052/version -A \"HealthCheck\" || exit 1" - ], - "timeout": "30s" - } - ], - "host": [], - "hostname": "aa72a510f3bd", - "id": "aa72a510f3bd4a367d29b81385124b62bfaac854b3abeb128316a2f9484d92f3", - "image": "sha256:6a2b23944a266ba1cd9fa72a7a4d172e589b825a4d201a12fb17bf5f7577908d", - "init": false, - "ipc_mode": "private", - "labels": [], - "log_driver": "json-file", - "log_opts": { - "max-file": "10", - "max-size": "10m" - }, - "logs": false, - "max_retry_count": 0, - "memory": 0, - "memory_swap": 0, - "mounts": [ - { - "bind_options": [], - "read_only": false, - "source": "/share/appdata/esphome", - "target": "/config", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] - } - ], - "must_run": true, - "name": "esphome", - "network_data": [ - { - "gateway": "192.168.2.1", - "global_ipv6_address": "", - "global_ipv6_prefix_length": 0, - "ip_address": "192.168.2.133", - "ip_prefix_length": 24, - "ipv6_gateway": "", - "mac_address": "02:42:2a:3a:23:90", - "network_name": "qnet-static-eth0-48e715" - } - ], - "network_mode": "default", - "networks_advanced": [ - { - "aliases": [], - "ipv4_address": "192.168.2.133", - "ipv6_address": "", - "name": "qnet-static-eth0-48e715" - } - ], - "pid_mode": "", - "ports": [], - "privileged": false, - "publish_all_ports": false, - "read_only": false, - "remove_volumes": true, - "restart": "always", - "rm": false, - "runtime": "runc", - "security_opts": [], - "shm_size": 64, - "start": true, - "stdin_open": false, - "stop_signal": "", - "stop_timeout": 0, - "storage_opts": {}, - "sysctls": {}, - "tmpfs": {}, - "tty": false, - "ulimit": [ - { - "hard": 65535, - "name": "nofile", - "soft": 65535 - } - ], - "upload": [], - "user": "", - "userns_mode": "", - "volumes": [], - "wait": false, - "wait_timeout": 60, - "working_dir": "/config" - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==", - "dependencies": [ - "data.docker_registry_image.esphome", - "docker_image.esphome", - "docker_network.bridge" - ] - } - ] - }, { "mode": "managed", "type": "docker_container", @@ -2974,9 +2801,9 @@ "permissions": "rwm" } ], - "dns": [], - "dns_opts": [], - "dns_search": [], + "dns": null, + "dns_opts": null, + "dns_search": null, "domainname": "", "entrypoint": [ "/jellyfin/jellyfin" @@ -2988,7 +2815,7 @@ ], "exit_code": null, "gpus": null, - "group_add": [], + "group_add": null, "healthcheck": [ { "interval": "30s", @@ -3002,14 +2829,14 @@ } ], "host": [], - "hostname": "05ad3d21c55e", - "id": "05ad3d21c55e78a226e7b3ba8ce5f960b9b05f24c99202b7340e5cf66e2123b0", + "hostname": "f9b9ccc70bd4", + "id": "f9b9ccc70bd4c49d3111d5eb9c4491c47483c8c6fef800f3c8e55e8d2ebb678a", "image": "sha256:42a8cddb771c4ba286f4bba20484cbaf8a8905212334f761210cd1b90ede210f", "init": false, "ipc_mode": "private", "labels": [], "log_driver": "local", - "log_opts": {}, + "log_opts": null, "logs": false, "max_retry_count": 0, "memory": 0, @@ -3017,7 +2844,7 @@ "mounts": [ { "bind_options": [], - "read_only": false, + "read_only": null, "source": "/share/appdata/jellyfin/cache", "target": "/cache", "tmpfs_options": [], @@ -3026,30 +2853,12 @@ }, { "bind_options": [], - "read_only": false, + "read_only": null, "source": "/share/appdata/jellyfin/config", "target": "/config", "tmpfs_options": [], "type": "bind", "volume_options": [] - }, - { - "bind_options": [], - "read_only": false, - "source": "/share/datarr-hdd/media", - "target": "/media-hdd", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] - }, - { - "bind_options": [], - "read_only": false, - "source": "/share/datarr/media", - "target": "/media", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] } ], "must_run": true, @@ -3062,7 +2871,7 @@ "ip_address": "192.168.2.134", "ip_prefix_length": 24, "ipv6_gateway": "", - "mac_address": "02:42:76:fb:94:0b", + "mac_address": "02:42:8b:6d:11:1d", "network_name": "qnet-static-eth0-48e715" } ], @@ -3090,21 +2899,23 @@ "stdin_open": false, "stop_signal": "", "stop_timeout": 0, - "storage_opts": {}, - "sysctls": {}, - "tmpfs": {}, + "storage_opts": null, + "sysctls": null, + "tmpfs": null, "tty": false, - "ulimit": [ - { - "hard": 65535, - "name": "nofile", - "soft": 65535 - } - ], + "ulimit": [], "upload": [], "user": "", "userns_mode": "", - "volumes": [], + "volumes": [ + { + "container_path": "/datarr", + "from_container": "", + "host_path": "", + "read_only": null, + "volume_name": "truenas-arr" + } + ], "wait": false, "wait_timeout": 60, "working_dir": "" @@ -3112,7 +2923,6 @@ "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==", "dependencies": [ - "data.docker_registry_image.jellyfin", "docker_image.jellyfin", "docker_network.bridge" ] @@ -4274,9 +4084,9 @@ "cpu_shares": 0, "destroy_grace_seconds": null, "devices": [], - "dns": [], - "dns_opts": [], - "dns_search": [], + "dns": null, + "dns_opts": null, + "dns_search": null, "domainname": "", "entrypoint": [ "start.sh" @@ -4284,7 +4094,7 @@ "env": [], "exit_code": null, "gpus": null, - "group_add": [], + "group_add": null, "healthcheck": [ { "interval": "0s", @@ -4298,9 +4108,9 @@ } ], "host": [], - "hostname": "e4b158cce5c5", - "id": "e4b158cce5c5973fd38247c32c53f30e5334e50f44fdfcb52f6173e60f3abf45", - "image": "sha256:2cfd24401bf6514de7798821e54155622902c3caf93ae440f72637aac2f6ee93", + "hostname": "b0b83f97afe6", + "id": "b0b83f97afe63cc1113dd1995d09d63a9d55320fe78db530225a3efd69fb0a8c", + "image": "sha256:eac55952cd67e187b6f4ddbca6cf37b708f21cb039b38c9bd73396760e95b2ed", "init": false, "ipc_mode": "private", "labels": [], @@ -4316,7 +4126,7 @@ "mounts": [ { "bind_options": [], - "read_only": false, + "read_only": null, "source": "/share/appdata/pi-hole", "target": "/etc-pihole", "tmpfs_options": [], @@ -4334,7 +4144,7 @@ "ip_address": "192.168.2.114", "ip_prefix_length": 24, "ipv6_gateway": "", - "mac_address": "02:42:e3:85:7c:3e", + "mac_address": "02:42:79:31:a8:a1", "network_name": "qnet-static-eth0-48e715" } ], @@ -4362,17 +4172,11 @@ "stdin_open": false, "stop_signal": "", "stop_timeout": 0, - "storage_opts": {}, - "sysctls": {}, - "tmpfs": {}, + "storage_opts": null, + "sysctls": null, + "tmpfs": null, "tty": false, - "ulimit": [ - { - "hard": 65535, - "name": "nofile", - "soft": 65535 - } - ], + "ulimit": [], "upload": [], "user": "", "userns_mode": "", @@ -4680,9 +4484,9 @@ "cpu_shares": 0, "destroy_grace_seconds": null, "devices": [], - "dns": [], - "dns_opts": [], - "dns_search": [], + "dns": null, + "dns_opts": null, + "dns_search": null, "domainname": "", "entrypoint": [ "/init" @@ -4694,17 +4498,17 @@ ], "exit_code": null, "gpus": null, - "group_add": [], - "healthcheck": [], + "group_add": null, + "healthcheck": null, "host": [], - "hostname": "5be9b5c0e3ee", - "id": "5be9b5c0e3eea81775c2d1c687dacb678594a206c4be640eb2da368ceb45f1d5", + "hostname": "9fa80b9a2199", + "id": "9fa80b9a21998636d9fc3b96f8cc7a64f1ec270b10bc3d1f815728d5404f05db", "image": "sha256:ba6421b2cb829d289324dd1b8472fd29f25f4cc3aad7f9e40163d2e833b1e9a8", "init": false, "ipc_mode": "private", "labels": [], "log_driver": "local", - "log_opts": {}, + "log_opts": null, "logs": false, "max_retry_count": 0, "memory": 0, @@ -4712,21 +4516,12 @@ "mounts": [ { "bind_options": [], - "read_only": false, + "read_only": null, "source": "/share/appdata/radarr", "target": "/config", "tmpfs_options": [], "type": "bind", "volume_options": [] - }, - { - "bind_options": [], - "read_only": false, - "source": "/share/datarr", - "target": "/data", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] } ], "must_run": true, @@ -4739,7 +4534,7 @@ "ip_address": "192.168.2.138", "ip_prefix_length": 24, "ipv6_gateway": "", - "mac_address": "02:42:4b:9b:93:e8", + "mac_address": "02:42:2c:40:e2:f3", "network_name": "qnet-static-eth0-48e715" } ], @@ -4767,21 +4562,23 @@ "stdin_open": false, "stop_signal": "", "stop_timeout": 0, - "storage_opts": {}, - "sysctls": {}, - "tmpfs": {}, + "storage_opts": null, + "sysctls": null, + "tmpfs": null, "tty": false, - "ulimit": [ - { - "hard": 65535, - "name": "nofile", - "soft": 65535 - } - ], + "ulimit": [], "upload": [], "user": "", "userns_mode": "", - "volumes": [], + "volumes": [ + { + "container_path": "/data", + "from_container": "", + "host_path": "", + "read_only": null, + "volume_name": "truenas-arr" + } + ], "wait": false, "wait_timeout": 60, "working_dir": "/" @@ -4789,7 +4586,6 @@ "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==", "dependencies": [ - "data.docker_registry_image.radarr", "docker_image.radarr", "docker_network.bridge" ] @@ -4816,9 +4612,9 @@ "cpu_shares": 0, "destroy_grace_seconds": null, "devices": [], - "dns": [], - "dns_opts": [], - "dns_search": [], + "dns": null, + "dns_opts": null, + "dns_search": null, "domainname": "", "entrypoint": [ "/init" @@ -4830,17 +4626,17 @@ ], "exit_code": null, "gpus": null, - "group_add": [], - "healthcheck": [], + "group_add": null, + "healthcheck": null, "host": [], - "hostname": "2b2e621767ae", - "id": "2b2e621767ae75bd3c291bc251908d378ecac7354cbb2ff3f8d5570d8a818a08", + "hostname": "503bbb9bddaa", + "id": "503bbb9bddaaddd7f544bacfa4175ea2c921f1e6e81312da107121f1feb166de", "image": "sha256:e8650470e9533cd8ac6c041f070a83b24e48680ad7b08d553b44ed20c1fc6cac", "init": false, "ipc_mode": "private", "labels": [], "log_driver": "local", - "log_opts": {}, + "log_opts": null, "logs": false, "max_retry_count": 0, "memory": 0, @@ -4848,21 +4644,12 @@ "mounts": [ { "bind_options": [], - "read_only": false, + "read_only": null, "source": "/share/appdata/readarr", "target": "/config", "tmpfs_options": [], "type": "bind", "volume_options": [] - }, - { - "bind_options": [], - "read_only": false, - "source": "/share/datarr", - "target": "/data", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] } ], "must_run": true, @@ -4875,7 +4662,7 @@ "ip_address": "192.168.2.147", "ip_prefix_length": 24, "ipv6_gateway": "", - "mac_address": "02:42:c8:39:47:93", + "mac_address": "02:42:12:cd:ca:a9", "network_name": "qnet-static-eth0-48e715" } ], @@ -4903,21 +4690,23 @@ "stdin_open": false, "stop_signal": "", "stop_timeout": 0, - "storage_opts": {}, - "sysctls": {}, - "tmpfs": {}, + "storage_opts": null, + "sysctls": null, + "tmpfs": null, "tty": false, - "ulimit": [ - { - "hard": 65535, - "name": "nofile", - "soft": 65535 - } - ], + "ulimit": [], "upload": [], "user": "", "userns_mode": "", - "volumes": [], + "volumes": [ + { + "container_path": "/data", + "from_container": "", + "host_path": "", + "read_only": null, + "volume_name": "truenas-arr" + } + ], "wait": false, "wait_timeout": 60, "working_dir": "/" @@ -4925,7 +4714,6 @@ "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==", "dependencies": [ - "data.docker_registry_image.readarr", "docker_image.readarr", "docker_network.bridge" ] @@ -5332,155 +5120,6 @@ } ] }, - { - "mode": "managed", - "type": "docker_container", - "name": "ru-torrent", - "provider": "provider[\"registry.terraform.io/kreuzwerker/docker\"]", - "instances": [ - { - "schema_version": 2, - "attributes": { - "attach": false, - "bridge": "", - "capabilities": [], - "cgroupns_mode": null, - "command": [], - "container_logs": null, - "container_read_refresh_timeout_milliseconds": 15000, - "cpu_set": "", - "cpu_shares": 0, - "destroy_grace_seconds": null, - "devices": [], - "dns": [], - "dns_opts": [], - "dns_search": [], - "domainname": "", - "entrypoint": [ - "/init" - ], - "env": [ - "PGID=321", - "PUID=777", - "TZ=Europe/Amsterdam", - "UMASK=002" - ], - "exit_code": null, - "gpus": null, - "group_add": [], - "healthcheck": [], - "host": [], - "hostname": "45fa1a7dd38a", - "id": "45fa1a7dd38a18185dcab71503d8e46c2dc2529c3498fce8752b3529a0743856", - "image": "sha256:8895d6ebcd94e4482b74abebf2724873cb59cc1f5d9c854ce2b946d798ff1c43", - "init": false, - "ipc_mode": "private", - "labels": [], - "log_driver": "json-file", - "log_opts": { - "max-file": "10", - "max-size": "10m" - }, - "logs": false, - "max_retry_count": 0, - "memory": 0, - "memory_swap": 0, - "mounts": [ - { - "bind_options": [], - "read_only": false, - "source": "/share/Download", - "target": "/downloads", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] - }, - { - "bind_options": [], - "read_only": false, - "source": "/share/appdata/ru-torrent", - "target": "/config", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] - }, - { - "bind_options": [], - "read_only": false, - "source": "/share/datarr/torrents", - "target": "/data/torrents", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] - } - ], - "must_run": true, - "name": "ru-torrent", - "network_data": [ - { - "gateway": "192.168.2.1", - "global_ipv6_address": "", - "global_ipv6_prefix_length": 0, - "ip_address": "192.168.2.121", - "ip_prefix_length": 24, - "ipv6_gateway": "", - "mac_address": "02:42:59:52:28:2b", - "network_name": "qnet-static-eth0-48e715" - } - ], - "network_mode": "default", - "networks_advanced": [ - { - "aliases": [], - "ipv4_address": "192.168.2.121", - "ipv6_address": "", - "name": "qnet-static-eth0-48e715" - } - ], - "pid_mode": "", - "ports": [], - "privileged": false, - "publish_all_ports": false, - "read_only": false, - "remove_volumes": true, - "restart": "always", - "rm": false, - "runtime": "runc", - "security_opts": [], - "shm_size": 64, - "start": true, - "stdin_open": false, - "stop_signal": "", - "stop_timeout": 0, - "storage_opts": {}, - "sysctls": {}, - "tmpfs": {}, - "tty": false, - "ulimit": [ - { - "hard": 65535, - "name": "nofile", - "soft": 65535 - } - ], - "upload": [], - "user": "", - "userns_mode": "", - "volumes": [], - "wait": false, - "wait_timeout": 60, - "working_dir": "" - }, - "sensitive_attributes": [], - "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==", - "dependencies": [ - "data.docker_registry_image.ru-torrent", - "docker_image.ru-torrent", - "docker_network.bridge" - ] - } - ] - }, { "mode": "managed", "type": "docker_container", @@ -5501,9 +5140,9 @@ "cpu_shares": 0, "destroy_grace_seconds": null, "devices": [], - "dns": [], - "dns_opts": [], - "dns_search": [], + "dns": null, + "dns_opts": null, + "dns_search": null, "domainname": "", "entrypoint": [ "/init" @@ -5515,17 +5154,17 @@ ], "exit_code": null, "gpus": null, - "group_add": [], - "healthcheck": [], + "group_add": null, + "healthcheck": null, "host": [], - "hostname": "dc7d3d03970f", - "id": "dc7d3d03970f1ce3ce6313bb00fa9b7ec0d731c224cdeedf1500d89b4a36c852", + "hostname": "87907f6d34fb", + "id": "87907f6d34fbff75b1a7ba93409b3f0e10ddcd0d5c7eed3d5f490abff6eabb50", "image": "sha256:bd28662e3b654fe670dc0703479f8d836cb82a1411db1daf0b9beb8acc4a07ec", "init": false, "ipc_mode": "private", "labels": [], "log_driver": "local", - "log_opts": {}, + "log_opts": null, "logs": false, "max_retry_count": 0, "memory": 0, @@ -5533,21 +5172,12 @@ "mounts": [ { "bind_options": [], - "read_only": false, + "read_only": null, "source": "/share/appdata/sabnzdb", "target": "/config", "tmpfs_options": [], "type": "bind", "volume_options": [] - }, - { - "bind_options": [], - "read_only": false, - "source": "/share/datarr/usenet", - "target": "/data/usenet", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] } ], "must_run": true, @@ -5560,7 +5190,7 @@ "ip_address": "192.168.2.140", "ip_prefix_length": 24, "ipv6_gateway": "", - "mac_address": "02:42:b6:0f:96:e7", + "mac_address": "02:42:35:f6:23:f9", "network_name": "qnet-static-eth0-48e715" } ], @@ -5588,21 +5218,23 @@ "stdin_open": false, "stop_signal": "", "stop_timeout": 0, - "storage_opts": {}, - "sysctls": {}, - "tmpfs": {}, + "storage_opts": null, + "sysctls": null, + "tmpfs": null, "tty": false, - "ulimit": [ - { - "hard": 65535, - "name": "nofile", - "soft": 65535 - } - ], + "ulimit": [], "upload": [], "user": "", "userns_mode": "", - "volumes": [], + "volumes": [ + { + "container_path": "/data", + "from_container": "", + "host_path": "", + "read_only": null, + "volume_name": "truenas-arr" + } + ], "wait": false, "wait_timeout": 60, "working_dir": "/" @@ -5610,7 +5242,6 @@ "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==", "dependencies": [ - "data.docker_registry_image.sabnzdb", "docker_image.sabnzdb", "docker_network.bridge" ] @@ -5776,9 +5407,9 @@ "cpu_shares": 0, "destroy_grace_seconds": null, "devices": [], - "dns": [], - "dns_opts": [], - "dns_search": [], + "dns": null, + "dns_opts": null, + "dns_search": null, "domainname": "", "entrypoint": [ "/init" @@ -5790,17 +5421,17 @@ ], "exit_code": null, "gpus": null, - "group_add": [], - "healthcheck": [], + "group_add": null, + "healthcheck": null, "host": [], - "hostname": "5a118c69ee7a", - "id": "5a118c69ee7a2ba44f96abdf0bbeab9dc0ccbd29f99c11011f5d832551f11b17", + "hostname": "d753eae292a7", + "id": "d753eae292a7323ba938e1b00649267d159abbf04abc564ea264739c35bf3342", "image": "sha256:6f7658d11bc6fb6cb81a2577672258f7bb8eaaaae51357879b4496151dd17b80", "init": false, "ipc_mode": "private", "labels": [], "log_driver": "local", - "log_opts": {}, + "log_opts": null, "logs": false, "max_retry_count": 0, "memory": 0, @@ -5808,21 +5439,12 @@ "mounts": [ { "bind_options": [], - "read_only": false, + "read_only": null, "source": "/share/appdata/sonarr", "target": "/config", "tmpfs_options": [], "type": "bind", "volume_options": [] - }, - { - "bind_options": [], - "read_only": false, - "source": "/share/datarr", - "target": "/data", - "tmpfs_options": [], - "type": "bind", - "volume_options": [] } ], "must_run": true, @@ -5835,7 +5457,7 @@ "ip_address": "192.168.2.136", "ip_prefix_length": 24, "ipv6_gateway": "", - "mac_address": "02:42:dc:5e:51:be", + "mac_address": "02:42:38:3a:a0:73", "network_name": "qnet-static-eth0-48e715" } ], @@ -5863,21 +5485,23 @@ "stdin_open": false, "stop_signal": "", "stop_timeout": 0, - "storage_opts": {}, - "sysctls": {}, - "tmpfs": {}, + "storage_opts": null, + "sysctls": null, + "tmpfs": null, "tty": false, - "ulimit": [ - { - "hard": 65535, - "name": "nofile", - "soft": 65535 - } - ], + "ulimit": [], "upload": [], "user": "", "userns_mode": "", - "volumes": [], + "volumes": [ + { + "container_path": "/data", + "from_container": "", + "host_path": "", + "read_only": null, + "volume_name": "truenas-arr" + } + ], "wait": false, "wait_timeout": 60, "working_dir": "/" @@ -5885,7 +5509,6 @@ "sensitive_attributes": [], "private": "eyJzY2hlbWFfdmVyc2lvbiI6IjIifQ==", "dependencies": [ - "data.docker_registry_image.sonarr", "docker_image.sonarr", "docker_network.bridge" ] @@ -6096,16 +5719,6 @@ "must_run": true, "name": "traccar", "network_data": [ - { - "gateway": "192.168.2.1", - "global_ipv6_address": "", - "global_ipv6_prefix_length": 0, - "ip_address": "192.168.2.113", - "ip_prefix_length": 24, - "ipv6_gateway": "", - "mac_address": "02:42:e1:d7:ce:9c", - "network_name": "qnet-static-eth0-48e715" - }, { "gateway": "172.29.0.1", "global_ipv6_address": "", @@ -6115,6 +5728,16 @@ "ipv6_gateway": "", "mac_address": "02:42:ac:1d:00:02", "network_name": "mariadb" + }, + { + "gateway": "192.168.2.1", + "global_ipv6_address": "", + "global_ipv6_prefix_length": 0, + "ip_address": "192.168.2.113", + "ip_prefix_length": 24, + "ipv6_gateway": "", + "mac_address": "02:42:e1:d7:ce:9c", + "network_name": "qnet-static-eth0-48e715" } ], "network_mode": "default", @@ -6952,36 +6575,6 @@ } ] }, - { - "mode": "managed", - "type": "docker_image", - "name": "esphome", - "provider": "provider[\"registry.terraform.io/kreuzwerker/docker\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "build": [], - "force_remove": null, - "id": "sha256:6a2b23944a266ba1cd9fa72a7a4d172e589b825a4d201a12fb17bf5f7577908desphome/esphome", - "image_id": "sha256:6a2b23944a266ba1cd9fa72a7a4d172e589b825a4d201a12fb17bf5f7577908d", - "keep_locally": null, - "name": "esphome/esphome", - "platform": null, - "pull_triggers": [ - "sha256:00ca3a161a5f59892435eff9f25f36739ab89e919352ba97a209c7da3495035e" - ], - "repo_digest": "esphome/esphome@sha256:00ca3a161a5f59892435eff9f25f36739ab89e919352ba97a209c7da3495035e", - "triggers": null - }, - "sensitive_attributes": [], - "private": "bnVsbA==", - "dependencies": [ - "data.docker_registry_image.esphome" - ] - } - ] - }, { "mode": "managed", "type": "docker_image", @@ -7473,15 +7066,15 @@ "attributes": { "build": [], "force_remove": null, - "id": "sha256:2cfd24401bf6514de7798821e54155622902c3caf93ae440f72637aac2f6ee93pihole/pihole:latest", - "image_id": "sha256:2cfd24401bf6514de7798821e54155622902c3caf93ae440f72637aac2f6ee93", + "id": "sha256:eac55952cd67e187b6f4ddbca6cf37b708f21cb039b38c9bd73396760e95b2edpihole/pihole:latest", + "image_id": "sha256:eac55952cd67e187b6f4ddbca6cf37b708f21cb039b38c9bd73396760e95b2ed", "keep_locally": null, "name": "pihole/pihole:latest", "platform": null, "pull_triggers": [ - "sha256:528e4044f67da14f3aecedda92f939c87b7b1e69fe67d09ac2b3e7fdc1f72515" + "sha256:83af1529136e39802e819e303b190e40147ac44c3e050398e1a53de6c0c701dd" ], - "repo_digest": "pihole/pihole@sha256:528e4044f67da14f3aecedda92f939c87b7b1e69fe67d09ac2b3e7fdc1f72515", + "repo_digest": "pihole/pihole@sha256:83af1529136e39802e819e303b190e40147ac44c3e050398e1a53de6c0c701dd", "triggers": null }, "sensitive_attributes": [], @@ -7697,36 +7290,6 @@ } ] }, - { - "mode": "managed", - "type": "docker_image", - "name": "ru-torrent", - "provider": "provider[\"registry.terraform.io/kreuzwerker/docker\"]", - "instances": [ - { - "schema_version": 0, - "attributes": { - "build": [], - "force_remove": null, - "id": "sha256:8895d6ebcd94e4482b74abebf2724873cb59cc1f5d9c854ce2b946d798ff1c43linuxserver/rutorrent", - "image_id": "sha256:8895d6ebcd94e4482b74abebf2724873cb59cc1f5d9c854ce2b946d798ff1c43", - "keep_locally": null, - "name": "linuxserver/rutorrent", - "platform": null, - "pull_triggers": [ - "sha256:b3a878b9a1da2c3b29066f6c39949fc4b2a10c530668457d462b2692e5b73a04" - ], - "repo_digest": "linuxserver/rutorrent@sha256:b3a878b9a1da2c3b29066f6c39949fc4b2a10c530668457d462b2692e5b73a04", - "triggers": null - }, - "sensitive_attributes": [], - "private": "bnVsbA==", - "dependencies": [ - "data.docker_registry_image.ru-torrent" - ] - } - ] - }, { "mode": "managed", "type": "docker_image", @@ -8282,42 +7845,6 @@ } ] }, - { - "mode": "managed", - "type": "docker_network", - "name": "ru-torrent", - "provider": "provider[\"registry.terraform.io/kreuzwerker/docker\"]", - "instances": [ - { - "schema_version": 1, - "attributes": { - "attachable": false, - "check_duplicate": null, - "driver": "bridge", - "id": "ce3a3f44f66df89d137bd172cacab54b21ba4efd588904abac3da0b8a276a633", - "ingress": false, - "internal": false, - "ipam_config": [ - { - "aux_address": {}, - "gateway": "172.29.24.1", - "ip_range": "", - "subnet": "172.29.24.0/22" - } - ], - "ipam_driver": "default", - "ipam_options": {}, - "ipv6": false, - "labels": [], - "name": "ru-torrent", - "options": {}, - "scope": "local" - }, - "sensitive_attributes": [], - "private": "bnVsbA==" - } - ] - }, { "mode": "managed", "type": "docker_network", diff --git a/terraform.tfstate.backup b/terraform.tfstate.backup index c7b8164..3c5ad90 100644 --- a/terraform.tfstate.backup +++ b/terraform.tfstate.backup @@ -1,7 +1,7 @@ { "version": 4, "terraform_version": "1.5.5", - "serial": 4569, + "serial": 4574, "lineage": "fcc74498-a461-682e-d8e4-5bc8c6ea51ec", "outputs": {}, "resources": [ @@ -970,8 +970,8 @@ "group_add": null, "healthcheck": null, "host": [], - "hostname": "275155c84ed6", - "id": "275155c84ed66b0740cde4ce20f543c03d030db169f0070d6643abb039dc8641", + "hostname": "c1640b5ae290", + "id": "c1640b5ae29093277bc6e56fd5f63d2fd633ccd624a00bd7ff73ac8f337fa761", "image": "sha256:249288fd3bed321b1d2cddcd7c5cbe831b9b44cd93dcc51f08207032dbe50cf2", "init": false, "ipc_mode": "private", @@ -1012,7 +1012,7 @@ "ip_address": "192.168.2.146", "ip_prefix_length": 24, "ipv6_gateway": "", - "mac_address": "02:42:73:4b:d4:84", + "mac_address": "02:42:ee:53:4d:f7", "network_name": "qnet-static-eth0-48e715" } ], @@ -1050,7 +1050,7 @@ "userns_mode": "", "volumes": [ { - "container_path": "/audiobooks", + "container_path": "/truenas-arr", "from_container": "", "host_path": "", "read_only": null, @@ -1617,7 +1617,7 @@ "healthcheck": null, "host": [], "hostname": "dozzle", - "id": "d8dce4efc56780f340a2c6652619dfc9316c71ba51247bde787417c4044ca729", + "id": "99c1820243302f11ddf3b1e4da4e1f7c9da875ef45aa772c394164abc4598705", "image": "sha256:9ceba54318cdeb63bbfa21d6176af1720f46a323c62aee80f43db15f47c9eceb", "init": false, "ipc_mode": "private", @@ -1649,7 +1649,7 @@ "ip_address": "192.168.2.144", "ip_prefix_length": 24, "ipv6_gateway": "", - "mac_address": "02:42:82:00:8f:c1", + "mac_address": "02:42:05:1e:42:67", "network_name": "qnet-static-eth0-48e715" } ], @@ -6096,16 +6096,6 @@ "must_run": true, "name": "traccar", "network_data": [ - { - "gateway": "172.29.0.1", - "global_ipv6_address": "", - "global_ipv6_prefix_length": 0, - "ip_address": "172.29.0.2", - "ip_prefix_length": 22, - "ipv6_gateway": "", - "mac_address": "02:42:ac:1d:00:02", - "network_name": "mariadb" - }, { "gateway": "192.168.2.1", "global_ipv6_address": "", @@ -6115,6 +6105,16 @@ "ipv6_gateway": "", "mac_address": "02:42:e1:d7:ce:9c", "network_name": "qnet-static-eth0-48e715" + }, + { + "gateway": "172.29.0.1", + "global_ipv6_address": "", + "global_ipv6_prefix_length": 0, + "ip_address": "172.29.0.2", + "ip_prefix_length": 22, + "ipv6_gateway": "", + "mac_address": "02:42:ac:1d:00:02", + "network_name": "mariadb" } ], "network_mode": "default",