Merge pull request 'apply host gateway' (#158) from feature/notifiarr-fixes into main
Reviewed-on: #158
This commit was merged in pull request #158.
This commit is contained in:
@@ -12,8 +12,6 @@ let
|
|||||||
in
|
in
|
||||||
{
|
{
|
||||||
"${ctype}__POSTGRES__HOST" = "host.docker.internal";
|
"${ctype}__POSTGRES__HOST" = "host.docker.internal";
|
||||||
"${ctype}__POSTGRES__USER" = "SOPS_ONLY";
|
|
||||||
"${ctype}__POSTGRES__PASSWORD" = "SOPS_ONLY";
|
|
||||||
"${ctype}__POSTGRES__PORT" = toString config.services.postgresql.settings.port;
|
"${ctype}__POSTGRES__PORT" = toString config.services.postgresql.settings.port;
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
@@ -57,8 +55,6 @@ in
|
|||||||
PGID = "100";
|
PGID = "100";
|
||||||
TZ = "America/New_York";
|
TZ = "America/New_York";
|
||||||
POSTGRES_HOST = "host.docker.internal";
|
POSTGRES_HOST = "host.docker.internal";
|
||||||
POSTGRES_USER = "SOPS_ONLY";
|
|
||||||
POSTGRES_PASSWORD = "SOPS_ONLY";
|
|
||||||
POSTGRES_PORT = toString config.services.postgresql.settings.port;
|
POSTGRES_PORT = toString config.services.postgresql.settings.port;
|
||||||
};
|
};
|
||||||
environmentFiles = [
|
environmentFiles = [
|
||||||
@@ -88,7 +84,11 @@ in
|
|||||||
environmentFiles = [
|
environmentFiles = [
|
||||||
config.sops.secrets."docker/prowlarr".path
|
config.sops.secrets."docker/prowlarr".path
|
||||||
];
|
];
|
||||||
extraOptions = [ "--network=arrnet" ];
|
extraOptions = [
|
||||||
|
"--network=arrnet"
|
||||||
|
|
||||||
|
"--add-host=host.docker.internal:host-gateway"
|
||||||
|
];
|
||||||
volumes = [ "${vars.primary_docker}/prowlarr:/config" ];
|
volumes = [ "${vars.primary_docker}/prowlarr:/config" ];
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
};
|
};
|
||||||
@@ -110,7 +110,10 @@ in
|
|||||||
"${vars.primary_docker}/radarr:/config"
|
"${vars.primary_docker}/radarr:/config"
|
||||||
"${vars.primary_plex_storage}/data:/data"
|
"${vars.primary_plex_storage}/data:/data"
|
||||||
];
|
];
|
||||||
extraOptions = [ "--network=arrnet" ];
|
extraOptions = [
|
||||||
|
"--network=arrnet"
|
||||||
|
"--add-host=host.docker.internal:host-gateway"
|
||||||
|
];
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
};
|
};
|
||||||
sonarr = {
|
sonarr = {
|
||||||
@@ -131,7 +134,10 @@ in
|
|||||||
"${vars.primary_docker}/sonarr:/config"
|
"${vars.primary_docker}/sonarr:/config"
|
||||||
"${vars.primary_plex_storage}/data:/data"
|
"${vars.primary_plex_storage}/data:/data"
|
||||||
];
|
];
|
||||||
extraOptions = [ "--network=arrnet" ];
|
extraOptions = [
|
||||||
|
"--network=arrnet"
|
||||||
|
"--add-host=host.docker.internal:host-gateway"
|
||||||
|
];
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
};
|
};
|
||||||
lidarr = {
|
lidarr = {
|
||||||
@@ -152,7 +158,11 @@ in
|
|||||||
"${vars.primary_docker}/lidarr:/config"
|
"${vars.primary_docker}/lidarr:/config"
|
||||||
"${vars.primary_plex_storage}/data:/data"
|
"${vars.primary_plex_storage}/data:/data"
|
||||||
];
|
];
|
||||||
extraOptions = [ "--network=arrnet" ];
|
extraOptions = [
|
||||||
|
"--network=arrnet"
|
||||||
|
"--add-host=host.docker.internal:host-gateway"
|
||||||
|
|
||||||
|
];
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
};
|
};
|
||||||
unpackerr = {
|
unpackerr = {
|
||||||
@@ -198,8 +208,6 @@ in
|
|||||||
DB_TYPE = "postgres";
|
DB_TYPE = "postgres";
|
||||||
DB_HOST = "host.docker.internal";
|
DB_HOST = "host.docker.internal";
|
||||||
DB_PORT = toString config.services.postgresql.settings.port;
|
DB_PORT = toString config.services.postgresql.settings.port;
|
||||||
DB_USER = "SOPS_ONLY";
|
|
||||||
DB_PASS = "SOPS_ONLY";
|
|
||||||
};
|
};
|
||||||
environmentFiles = [
|
environmentFiles = [
|
||||||
config.sops.secrets."docker/jellyseerr".path
|
config.sops.secrets."docker/jellyseerr".path
|
||||||
@@ -209,6 +217,7 @@ in
|
|||||||
extraOptions = [
|
extraOptions = [
|
||||||
"--network=arrnet"
|
"--network=arrnet"
|
||||||
"--network=haproxy-net"
|
"--network=haproxy-net"
|
||||||
|
"--add-host=host.docker.internal:host-gateway"
|
||||||
# "--health-cmd \"wget --no-verbose --tries 1 --spider http://localhost:5055/api/v1/status || exit 1\""
|
# "--health-cmd \"wget --no-verbose --tries 1 --spider http://localhost:5055/api/v1/status || exit 1\""
|
||||||
# "--health-start-period 20s"
|
# "--health-start-period 20s"
|
||||||
# "--health-timeout 3s"
|
# "--health-timeout 3s"
|
||||||
|
|||||||
@@ -33,6 +33,9 @@
|
|||||||
8686
|
8686
|
||||||
8787
|
8787
|
||||||
5055
|
5055
|
||||||
|
|
||||||
|
# temp postgres
|
||||||
|
5432
|
||||||
];
|
];
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user