update podman images

This commit is contained in:
Dmitriy Kholkin 2023-07-30 03:30:14 +03:00
parent d7396b9072
commit 25b07c55bb
12 changed files with 40 additions and 66 deletions

View File

@ -10,7 +10,7 @@ let
"127.0.0.1:389:3389/tcp" "127.0.0.1:636:6636/tcp" "127.0.0.1:389:3389/tcp" "127.0.0.1:636:6636/tcp"
]; ];
owner = "1000"; owner = "1000";
authentik-version = "2023.5.4"; authentik-version = "2023.6.1";
in { in {
services.nginx.virtualHosts."auth.ataraxiadev.com" = { services.nginx.virtualHosts."auth.ataraxiadev.com" = {
forceSSL = true; forceSSL = true;

View File

@ -28,7 +28,7 @@ in {
|| podman pod create -n ${pod-name} ${portsMapping} --dns ${pod-dns} || podman pod create -n ${pod-name} ${portsMapping} --dns ${pod-dns}
exit 0 exit 0
''; '';
in rec { in {
path = [ pkgs.coreutils config.virtualisation.podman.package ]; path = [ pkgs.coreutils config.virtualisation.podman.package ];
before = [ before = [
"${backend}-media-caddy.service" "${backend}-media-caddy.service"
@ -43,8 +43,6 @@ in {
"${backend}-recyclarr.service" "${backend}-recyclarr.service"
"${backend}-sonarr.service" "${backend}-sonarr.service"
]; ];
requiredBy = before;
partOf = before;
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = "yes"; RemainAfterExit = "yes";

View File

@ -12,7 +12,7 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "cr.hotio.dev/hotio/jackett:release-0.20.3546"; image = "cr.hotio.dev/hotio/jackett:release-0.21.541";
volumes = [ volumes = [
"${nas-path}/configs/jackett:/config" "${nas-path}/configs/jackett:/config"
]; ];

View File

@ -8,7 +8,7 @@ let
in { in {
virtualisation.oci-containers.containers.jellyfin = { virtualisation.oci-containers.containers.jellyfin = {
autoStart = true; autoStart = true;
image = "lscr.io/linuxserver/jellyfin:10.8.10"; image = "lscr.io/linuxserver/jellyfin:version-10.8.10-1";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -8,7 +8,7 @@ in {
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
kavita = { kavita = {
autoStart = true; autoStart = true;
image = "docker.io/ataraxiadev/kavita:latest"; image = "docker.io/kizaing/kavita:0.7.5";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";
@ -24,7 +24,7 @@ in {
}; };
kavitaemail = { kavitaemail = {
autoStart = true; autoStart = true;
image = "docker.io/kizaing/kavitaemail:latest"; image = "docker.io/kizaing/kavitaemail:0.1.20";
environment = { environment = {
SMTP_HOST = "https://mail.ataraxiadev.com"; SMTP_HOST = "https://mail.ataraxiadev.com";
SMTP_PORT = "587"; SMTP_PORT = "587";

View File

@ -9,46 +9,15 @@ in {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
scriptInterval = "15m";
enableAudioScript = "true";
enableVideoScript = "false";
# enableVideoScript = "true";
# videoDownloadTag = "video";
configureLidarrWithOptimalSettings = "true";
searchSort = "date";
audioFormat = "native";
audioBitrate = "lossless";
requireQuality = "true";
enableReplaygainTags = "true";
audioLyricType = "both";
# dlClientSource = "both";
dlClientSource = "tidal";
# arlToken = "Token_Goes_Here";
tidalCountryCode = "AR";
addDeezerTopArtists = "false";
addDeezerTopAlbumArtists = "false";
addDeezerTopTrackArtists = "false";
topLimit = "10";
addRelatedArtists = "false";
numberOfRelatedArtistsToAddPerArtist = "5";
lidarrSearchForMissing = "true";
addFeaturedVideoArtists = "false";
youtubeSubtitleLanguage = "en,ru";
# webHook = "";
enableQueueCleaner = "true";
matchDistance = "5";
enableBeetsTagging = "true";
beetsMatchPercentage = "90";
retryNotFound = "90";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "docker.io/randomninjaatk/lidarr-extended:latest"; image = "docker.io/linuxserver/lidarr:version-1.2.6.3313";
volumes = [ volumes = [
"${nas-path}/configs/lidarr:/config" "${nas-path}/configs/lidarr/config:/config"
"${nas-path}/torrents/music:/downloads" "${nas-path}/configs/lidarr/custom-services.d:/custom-services.d"
"${nas-path}/torrents/lidarr-extended-downloads:/downloads-lidarr-extended" "${nas-path}/configs/lidarr/custom-cont-init.d:/custom-cont-init.d"
"${nas-path}/media/music:/music" "${nas-path}:/data"
"${nas-path}/media/music-videos:/music-videos" # "${extended-config}:/config/extended.conf:ro"
]; ];
}; };
} }

View File

@ -5,7 +5,7 @@ let
in { in {
virtualisation.oci-containers.containers.medusa = { virtualisation.oci-containers.containers.medusa = {
autoStart = true; autoStart = true;
image = "docker.io/pymedusa/medusa"; image = "docker.io/linuxserver/medusa:version-v1.0.17";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";
@ -14,12 +14,9 @@ in {
# HTTPS_PROXY = "http://192.168.0.6:8888"; # HTTPS_PROXY = "http://192.168.0.6:8888";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
# ports = [ "127.0.0.1:8081:8081/tcp" ];
volumes = [ volumes = [
"${nas-path}/configs/medusa:/config" "${nas-path}/configs/medusa:/config"
"${nas-path}:/data" "${nas-path}:/data"
# "${nas-path}/torrents:/downloads"
# "${nas-path}/media/anime:/tv"
]; ];
}; };
} }

View File

@ -5,7 +5,7 @@ let
in { in {
virtualisation.oci-containers.containers.qbittorrent = { virtualisation.oci-containers.containers.qbittorrent = {
autoStart = true; autoStart = true;
image = "cr.hotio.dev/hotio/qbittorrent:release-4.5.2"; image = "cr.hotio.dev/hotio/qbittorrent:release-4.5.4";
environment = { environment = {
PUID = "1000"; PUID = "1000";
PGID = "100"; PGID = "100";

View File

@ -14,7 +14,7 @@ in {
HTTPS_PROXY = "http://192.168.0.6:8888"; HTTPS_PROXY = "http://192.168.0.6:8888";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "cr.hotio.dev/hotio/radarr:release-4.3.2.6857"; image = "cr.hotio.dev/hotio/radarr:testing-4.7.2.7686";
volumes = [ volumes = [
"${nas-path}/configs/radarr:/config" "${nas-path}/configs/radarr:/config"
"${nas-path}:/data" "${nas-path}:/data"

View File

@ -10,7 +10,7 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "ghcr.io/recyclarr/recyclarr:4.3.0"; image = "ghcr.io/recyclarr/recyclarr:5.1.1";
volumes = [ volumes = [
"${nas-path}/configs/recyclarr:/config" "${nas-path}/configs/recyclarr:/config"
]; ];

View File

@ -12,7 +12,7 @@ in {
TZ = "Europe/Moscow"; TZ = "Europe/Moscow";
}; };
extraOptions = [ "--pod=media-stack" ]; extraOptions = [ "--pod=media-stack" ];
image = "cr.hotio.dev/hotio/sonarr:v4-4.0.0.397"; image = "cr.hotio.dev/hotio/sonarr:v4-4.0.0.578";
volumes = [ volumes = [
"${nas-path}/configs/sonarr:/config" "${nas-path}/configs/sonarr:/config"
"${nas-path}:/data" "${nas-path}:/data"

View File

@ -4,6 +4,10 @@ let
nas-path = "/media/nas/seafile"; nas-path = "/media/nas/seafile";
pod-name = "seafile"; pod-name = "seafile";
open-ports = [ "127.0.0.1:8088:80" ]; open-ports = [ "127.0.0.1:8088:80" ];
seafile-ver = "10.0.1";
mariadb-ver = "10.11.4";
memcached-ver = "1.6.21";
caddy-ver = "1.1.0";
seahub-media-caddyfile = pkgs.writeText "Caddyfile" '' seahub-media-caddyfile = pkgs.writeText "Caddyfile" ''
{ {
admin off admin off
@ -25,20 +29,27 @@ let
lb_policy header X-Forwarded-For lb_policy header X-Forwarded-For
trusted_proxies private_ranges trusted_proxies private_ranges
} }
handle_path /seafhttp* {
uri strip_prefix seafhttp
reverse_proxy seafile-server:8082 {
trusted_proxies private_ranges
}
}
reverse_proxy /seafdav* seafile-server:8080 { reverse_proxy /seafdav* seafile-server:8080 {
header_up Destination https:// http:// header_up Destination https:// http://
trusted_proxies private_ranges trusted_proxies private_ranges
} }
handle_path /seafhttp* {
uri strip_prefix seafhttp
reverse_proxy seafile-server:8082 {
trusted_proxies private_ranges
}
}
handle_path /notification* {
uri strip_prefix notification
reverse_proxy seafile-server:8083 {
trusted_proxies private_ranges
}
}
reverse_proxy /media/* seahub-media:8098 { reverse_proxy /media/* seahub-media:8098 {
lb_policy header X-Forwarded-For lb_policy header X-Forwarded-For
trusted_proxies private_ranges trusted_proxies private_ranges
} }
rewrite /accounts/login* /oauth/login/?
} }
''; '';
in { in {
@ -59,7 +70,7 @@ in {
config.secrets.seafile-db-pass.decrypted config.secrets.seafile-db-pass.decrypted
]; ];
extraOptions = [ "--pod=seafile" ]; extraOptions = [ "--pod=seafile" ];
image = "docker.io/ggogel/seafile-server:9.0.10"; image = "docker.io/ggogel/seafile-server:${seafile-ver}";
volumes = [ "${nas-path}/server-data:/shared" ]; volumes = [ "${nas-path}/server-data:/shared" ];
}; };
@ -74,9 +85,8 @@ in {
]; ];
extraOptions = [ extraOptions = [
"--pod=seafile" "--pod=seafile"
# "--add-host=auth.ataraxiadev:192.168.0.10"
]; ];
image = "docker.io/ggogel/seahub:9.0.10"; image = "docker.io/ggogel/seahub:${seafile-ver}";
volumes = [ volumes = [
"${nas-path}/server-data:/shared" "${nas-path}/server-data:/shared"
]; ];
@ -86,7 +96,7 @@ in {
autoStart = true; autoStart = true;
dependsOn = [ "seafile-caddy" ]; dependsOn = [ "seafile-caddy" ];
extraOptions = [ "--pod=seafile" ]; extraOptions = [ "--pod=seafile" ];
image = "docker.io/ggogel/seahub-media:9.0.10"; image = "docker.io/ggogel/seahub-media:${seafile-ver}";
volumes = [ volumes = [
"${seahub-media-caddyfile}:/etc/caddy/Caddyfile" "${seahub-media-caddyfile}:/etc/caddy/Caddyfile"
"${nas-path}/server-data/seafile/seahub-data/avatars:/usr/share/caddy/media/avatars" "${nas-path}/server-data/seafile/seahub-data/avatars:/usr/share/caddy/media/avatars"
@ -103,7 +113,7 @@ in {
config.secrets.seafile-db-pass.decrypted config.secrets.seafile-db-pass.decrypted
]; ];
extraOptions = [ "--pod=seafile" ]; extraOptions = [ "--pod=seafile" ];
image = "docker.io/mariadb:10.7.8"; image = "docker.io/mariadb:${mariadb-ver}";
volumes = [ volumes = [
"${nas-path}/db:/var/lib/mysql" "${nas-path}/db:/var/lib/mysql"
]; ];
@ -113,13 +123,13 @@ in {
autoStart = true; autoStart = true;
cmd = [ "memcached" "-m 256" ]; cmd = [ "memcached" "-m 256" ];
extraOptions = [ "--pod=seafile" ]; extraOptions = [ "--pod=seafile" ];
image = "docker.io/memcached:1.6.18"; image = "docker.io/memcached:${memcached-ver}";
}; };
virtualisation.oci-containers.containers.seafile-caddy = { virtualisation.oci-containers.containers.seafile-caddy = {
autoStart = true; autoStart = true;
extraOptions = [ "--pod=seafile" ]; extraOptions = [ "--pod=seafile" ];
image = "docker.io/ggogel/seafile-caddy:1.0.8"; image = "docker.io/ggogel/seafile-caddy:${caddy-ver}";
volumes = [ "${seafile-caddy-caddyfile}:/etc/caddy/Caddyfile" ]; volumes = [ "${seafile-caddy-caddyfile}:/etc/caddy/Caddyfile" ];
}; };