From 82350d174f75864ce8da0ba660c1df9fc713c513 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Thu, 26 Sep 2024 22:03:21 +0200 Subject: [PATCH] upgrade --- scripts/deployservice | 8 ++++---- services/authentik/docker-compose.yml | 2 +- services/immich/.env.template | 2 +- services/paperless/docker-compose.yml | 2 +- services/traefik/docker-compose.yml | 4 +++- 5 files changed, 10 insertions(+), 8 deletions(-) diff --git a/scripts/deployservice b/scripts/deployservice index 64305f2..b61ee1e 100755 --- a/scripts/deployservice +++ b/scripts/deployservice @@ -6,7 +6,6 @@ from pathlib import Path from typing import Any from typing import Self -from python_on_whales import docker from python_on_whales import DockerClient PROJECT_ROOT_DIRECTORY = Path(__file__).parent.parent.resolve() @@ -75,8 +74,8 @@ class ServicesConfig: return cls(servers=servers) -def _get_service_context(service_name: str, config: ServicesConfig) -> str: - context_names = [ctx.name for ctx in docker.context.list()] +def _get_service_context(service_name: str, config: ServicesConfig, docker_client: DockerClient) -> str: + context_names = [ctx.name for ctx in docker_client.context.list()] server_config = config.search_service(service_name) if server_config.context not in context_names: @@ -86,7 +85,8 @@ def _get_service_context(service_name: str, config: ServicesConfig) -> str: def deploy_service(service_name: str, config: ServicesConfig): - context = _get_service_context(service_name, config) + _tmp_client = DockerClient() + context = _get_service_context(service_name, config, _tmp_client) service_dir = SERVICES_DIRECTORY / service_name docker = DockerClient(context=context) diff --git a/services/authentik/docker-compose.yml b/services/authentik/docker-compose.yml index 3e04818..21222ab 100644 --- a/services/authentik/docker-compose.yml +++ b/services/authentik/docker-compose.yml @@ -16,7 +16,7 @@ volumes: name: authentik-certs x-authentik: &x-authentik - image: ghcr.io/goauthentik/server:2024.6.3 + image: ghcr.io/goauthentik/server:2024.8 restart: unless-stopped env_file: - .env diff --git a/services/immich/.env.template b/services/immich/.env.template index 29fb079..02a7019 100644 --- a/services/immich/.env.template +++ b/services/immich/.env.template @@ -9,4 +9,4 @@ DB_DATABASE_NAME=immich REDIS_HOSTNAME=redis EXTERNAL_HOST=immich.togetherdays.cz -IMMICH_VERSION=v1.113.0 +IMMICH_VERSION=v1.116.0 diff --git a/services/paperless/docker-compose.yml b/services/paperless/docker-compose.yml index 6bf657f..409a5cc 100644 --- a/services/paperless/docker-compose.yml +++ b/services/paperless/docker-compose.yml @@ -30,7 +30,7 @@ services: POSTGRES_PASSWORD: ${PAPERLESS_DBPASS} paperless: - image: ghcr.io/paperless-ngx/paperless-ngx:latest + image: ghcr.io/paperless-ngx/paperless-ngx:2.12 depends_on: - db - redis diff --git a/services/traefik/docker-compose.yml b/services/traefik/docker-compose.yml index 5e5bdd0..7a2793d 100644 --- a/services/traefik/docker-compose.yml +++ b/services/traefik/docker-compose.yml @@ -1,6 +1,8 @@ networks: traefik-net: + driver: overlay name: traefik-net + attachable: true volumes: traefik-certs: @@ -34,7 +36,7 @@ services: - /var/run/docker.sock:/var/run/docker.sock:ro - traefik-certs:/letsencrypt networks: - traefik-net: + - traefik-net deploy: placement: constraints: