Add docker_registry_image entries for tf files that did not have it

Move some images to disabled
This commit is contained in:
Marc Fokkert
2023-08-01 14:12:05 +02:00
parent adbbb205e1
commit cfe595cf66
12 changed files with 3907 additions and 887 deletions

1
.idea/misc.xml generated
View File

@@ -1,4 +1,3 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="JavaScriptSettings"> <component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" /> <option name="languageLevel" value="ES6" />

View File

@@ -1,7 +1,12 @@
resource "docker_image" "airsonic" { data "docker_registry_image" "airsonic" {
name = "airsonicadvanced/airsonic-advanced:latest" name = "airsonicadvanced/airsonic-advanced:latest"
} }
resource "docker_image" "airsonic" {
name = data.docker_registry_image.airsonic.name
pull_triggers = [data.docker_registry_image.airsonic.sha256_digest]
}
resource "docker_container" "airsonic" { resource "docker_container" "airsonic" {
image = docker_image.airsonic.image_id image = docker_image.airsonic.image_id
name = "airsonic" name = "airsonic"

View File

@@ -1,44 +1,37 @@
data "docker_registry_image" "freshrss" {
name = "freshrss/freshrss:latest"
}
resource "docker_image" "freshrss" {
name = data.docker_registry_image.freshrss.name
pull_triggers = [data.docker_registry_image.freshrss.sha256_digest]
}
resource "docker_container" "freshrss" {
resource "docker_image" "freshrss" { image = docker_image.freshrss.image_id
name = "freshrss/freshrss:latest" name = "freshrss"
restart = "always"
env = ["TZ=Europe/Paris", "CRON_MIN=1,31", "OIDC_ENABLED=0", "FRESHRSS_INSTALL=--api_enabled --base_url https://freshrss.xz1.nl --db-base freshrss --db-host 192.168.2.127 --db-password utquCzXEnrjFU2BbDqYT --db-type mysql --db-user freshrss --default_user admin --language en", "FRESHRSS_USER=--api_password CmZpTF3pUYz7rVtFrDTQ --email freshrss@xz1.nl --language en --password CmZpTF3pUYz7rVtFrDTQ --user admin"]
mounts {
target = "/var/www/FreshRSS/data"
source = "/share/appdata/freshrss/data"
type = "bind"
} }
resource "docker_container" "freshrss" { mounts {
image = docker_image.freshrss.image_id target = "/var/www/FreshRSS/extensions"
name = "freshrss" source = "/share/appdata/freshrss/extensions"
restart = "always" type = "bind"
env = [
"TZ=Europe/Paris",
"CRON_MIN=1,31",
"OIDC_ENABLED=0",
"FRESHRSS_INSTALL=--api_enabled --base_url https://freshrss.xz1.nl --db-base freshrss --db-host 192.168.2.127 --db-password utquCzXEnrjFU2BbDqYT --db-type mysql --db-user freshrss --default_user admin --language en",
"FRESHRSS_USER=--api_password CmZpTF3pUYz7rVtFrDTQ --email freshrss@xz1.nl --language en --password CmZpTF3pUYz7rVtFrDTQ --user admin"
]
mounts {
target = "/var/www/FreshRSS/data"
source = "/share/appdata/freshrss/data"
type = "bind"
}
mounts {
target = "/var/www/FreshRSS/extensions"
source = "/share/appdata/freshrss/extensions"
type = "bind"
}
lifecycle {
ignore_changes = [
ulimit,
log_opts
]
}
networks_advanced {
name = docker_network.bridge.name
ipv4_address = "192.168.2.129"
}
} }
lifecycle {
ignore_changes = [
ulimit,
log_opts
]
}
networks_advanced {
name = docker_network.bridge.name
ipv4_address = "192.168.2.129"
}
}

View File

@@ -1,7 +1,14 @@
resource "docker_image" "gitea" {
data "docker_registry_image" "gitea" {
name = "gitea/gitea:latest-rootless" name = "gitea/gitea:latest-rootless"
} }
resource "docker_image" "gitea" {
name = data.docker_registry_image.gitea.name
pull_triggers = [data.docker_registry_image.gitea.sha256_digest]
}
resource "docker_container" "gitea" { resource "docker_container" "gitea" {
image = docker_image.gitea.image_id image = docker_image.gitea.image_id
name = "gitea" name = "gitea"

View File

@@ -1,7 +1,12 @@
resource "docker_image" "grafana" { data "docker_registry_image" "grafana" {
name = "grafana/grafana:latest" name = "grafana/grafana:latest"
} }
resource "docker_image" "grafana" {
name = data.docker_registry_image.grafana.name
pull_triggers = [data.docker_registry_image.grafana.sha256_digest]
}
resource "docker_container" "grafana" { resource "docker_container" "grafana" {
image = docker_image.grafana.image_id image = docker_image.grafana.image_id
name = "grafana" name = "grafana"

View File

@@ -1,9 +1,14 @@
## Job scheduler for ofelia ## Job scheduler for ofelia
resource "docker_image" "ofelia" { data "docker_registry_image" "ofelia" {
name = "mcuadros/ofelia:latest" name = "mcuadros/ofelia:latest"
} }
resource "docker_image" "ofelia" {
name = data.docker_registry_image.ofelia.name
pull_triggers = [data.docker_registry_image.ofelia.sha256_digest]
}
resource "docker_container" "ofelia" { resource "docker_container" "ofelia" {
image = docker_image.ofelia.image_id image = docker_image.ofelia.image_id
name = "ofelia" name = "ofelia"

View File

@@ -1,7 +1,12 @@
resource "docker_image" "photoprism" { data "docker_registry_image" "photoprism" {
name = "photoprism/photoprism:latest" name = "photoprism/photoprism:latest"
} }
resource "docker_image" "photoprism" {
name = data.docker_registry_image.photoprism.name
pull_triggers = [data.docker_registry_image.photoprism.sha256_digest]
}
resource "docker_container" "photoprism" { resource "docker_container" "photoprism" {
image = docker_image.photoprism.image_id image = docker_image.photoprism.image_id
name = "photoprism" name = "photoprism"
@@ -10,7 +15,10 @@ resource "docker_container" "photoprism" {
env = [ env = [
"PHOTOPRISM_UPLOAD_NSFW=true", "PHOTOPRISM_UPLOAD_NSFW=true",
"PHOTOPRISM_ADMIN_PASSWORD=UAmpojHADcS5aB" "PHOTOPRISM_ADMIN_PASSWORD=UAmpojHADcS5aB",
"PHOTOPRISM_HTTP_HOSTNAME=photoprism.xz1.nl",
"PHOTOPRISM_HTTP_HOST=192.168.2.116",
"PHOTOPRISM_DISABLE_TLS=true"
] ]
mounts { mounts {

View File

@@ -1,9 +1,15 @@
## Job scheduler for pihole ## Job scheduler for pihole
resource "docker_image" "pihole" {
data "docker_registry_image" "pihole" {
name = "pihole/pihole:latest" name = "pihole/pihole:latest"
} }
resource "docker_image" "pihole" {
name = data.docker_registry_image.pihole.name
pull_triggers = [data.docker_registry_image.pihole.sha256_digest]
}
resource "docker_container" "pihole" { resource "docker_container" "pihole" {
image = docker_image.pihole.image_id image = docker_image.pihole.image_id
name = "pihole" name = "pihole"

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff