From 57393c933c9f2520bf13ec3706fef082a65b88fc Mon Sep 17 00:00:00 2001 From: rudolf1 Date: Wed, 5 Aug 2026 21:26:07 +0200 Subject: [PATCH] hermes (#83) * hermes --- backend/configs/brencher.py | 10 ++--- backend/configs/brencher2.py | 10 ++--- backend/configs/hermes.py | 59 ++++++++++++++++++++++++++ backend/configs/hermes_infra.py | 73 +++++++++++++++++++++++++++++++++ backend/configs/immich.py | 10 ++--- backend/steps/docker.py | 4 +- docker-compose.yml | 2 +- 7 files changed, 150 insertions(+), 18 deletions(-) create mode 100644 backend/configs/hermes.py create mode 100644 backend/configs/hermes_infra.py diff --git a/backend/configs/brencher.py b/backend/configs/brencher.py index ac5f3e3..aa584b9 100644 --- a/backend/configs/brencher.py +++ b/backend/configs/brencher.py @@ -45,10 +45,10 @@ deployDocker = DockerSwarmDeploy( docker_compose_path="docker-compose.yml", ) -checkPing = UrlCheck( - url="https://brencher.rudolf.keenetic.link/state", - expected=checkPingF, -) +#checkPing = UrlCheck( +# url="https://brencher.rudolf.keenetic.link/state", +# expected=checkPingF, +#) logUrls = SimpleLog(message={ "userLinks": { "App": "https://brencher.rudolf.keenetic.link/", @@ -68,7 +68,7 @@ brencher = Environment( dockerSwarmCheck, unmerge, deployDocker, - checkPing, +# checkPing, logUrls ] ) diff --git a/backend/configs/brencher2.py b/backend/configs/brencher2.py index 4f90cdc..de32044 100644 --- a/backend/configs/brencher2.py +++ b/backend/configs/brencher2.py @@ -72,10 +72,10 @@ deployDocker = DockerSwarmDeploy( docker_compose_path="docker-compose.yml", ) -checkPing = UrlCheck( - url="https://brencher.rudolf.keenetic.link/state", - expected=checkPingF, -) +#checkPing = UrlCheck( +# url="https://brencher.rudolf.keenetic.link/state", +# expected=checkPingF, +#) logUrls = SimpleLog(message={ "userLinks": { "App": "https://brencher.rudolf.keenetic.link/", @@ -98,7 +98,7 @@ brencher2 = Environment( dockerSwarmCheck, unmerge, deployDocker, - checkPing, +# checkPing, logUrls ], ) diff --git a/backend/configs/hermes.py b/backend/configs/hermes.py new file mode 100644 index 0000000..817ab28 --- /dev/null +++ b/backend/configs/hermes.py @@ -0,0 +1,59 @@ +from enironment import Environment +from steps.checks import SimpleLog, UrlCheck +from steps.docker import DockerSwarmCheck, DockerSwarmDeploy +from steps.git import GitClone, CheckoutMerged, GitUnmerge +from steps.shared_state import SharedStateHolderInMemory + +clone = GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible") + +dockerSwarmCheck = DockerSwarmCheck( + stack_name="hermes", +) +unmerge = GitUnmerge(clone, dockerSwarmCheck) + +state = SharedStateHolderInMemory(unmerge=unmerge) + +checkoutMerged = CheckoutMerged(clone, + desired_branches=state, + push=False, + git_user_email="rudolfss13@gmail.com", + git_user_name="brencher_bot" + ) + +deployDocker = DockerSwarmDeploy( + wd=clone, + buildDocker=None, + stackChecker=dockerSwarmCheck, + envs=lambda: { + "version": "auto-" + checkoutMerged.progress().version, + }, + stack_name="hermes", + docker_compose_path="poc/hermes/stack-compose.yml", +) + +checkPing1 = UrlCheck( + url="http://100.70.193.97:8087/api/status", + expected=lambda obj: obj['gateway_running'] == 'true' and obj['auth_required'] == 'true', +) +logUrls = SimpleLog(message={ + "userLinks": { + "App": "https://hermes.rudolf.keenetic.link", + } +}) + + +__all__ = ["hermes"] +hermes = Environment( + id="hermes", + state=state, + pipeline=[ + clone, + state, + checkoutMerged, + dockerSwarmCheck, + unmerge, + deployDocker, + checkPing1, + logUrls + ] +) diff --git a/backend/configs/hermes_infra.py b/backend/configs/hermes_infra.py new file mode 100644 index 0000000..852ba9f --- /dev/null +++ b/backend/configs/hermes_infra.py @@ -0,0 +1,73 @@ +from enironment import Environment +from steps.checks import SimpleLog, UrlCheck +from steps.docker import DockerComposeBuild, DockerSwarmCheck, DockerSwarmDeploy +from steps.git import GitClone, CheckoutMerged, GitUnmerge +from steps.shared_state import SharedStateHolderInMemory + +clone = GitClone(url="https://github.com/rudolf1/uber_backup.git", branchNamePrefix="ansible") + +dockerSwarmCheck = DockerSwarmCheck( + stack_name="hermes_infra", +) +unmerge = GitUnmerge(clone, dockerSwarmCheck) + +state = SharedStateHolderInMemory(unmerge=None) + +checkoutMerged = CheckoutMerged(clone, + desired_branches=state, + push=False, + git_user_email="rudolfss13@gmail.com", + git_user_name="brencher_bot" + ) + +buildDocker = DockerComposeBuild(clone, + docker_repo_username="", + docker_repo_password="", + docker_compose_path="hermes_squid/stack-compose.yml", + docker_repo_url="https://registry.rudolf.keenetic.link", + publish=False, + build_cache = True, + envs=lambda: { + "version": "auto-" + checkoutMerged.progress().version, + # "user_group": "1000:137" + }, + ) + + +deployDocker = DockerSwarmDeploy( + wd=clone, + buildDocker=buildDocker, + stackChecker=dockerSwarmCheck, + envs=lambda: { + "version": "auto-" + checkoutMerged.progress().version, + }, + stack_name="hermes_infra", + docker_compose_path="hermes_squid/stack-compose.yml", +) + +# checkPing1 = UrlCheck( +# url="http://100.70.193.97:8088/api/status", +# expected=lambda obj: obj['gateway_running'] == 'true' and obj['auth_required'] == 'true', +# ) +logUrls = SimpleLog(message={ + "userLinks": { + "App": "https://hermes.rudolf.keenetic.link", + } +}) + + +__all__ = ["hermes_infra"] +hermes_infra = Environment( + id="hermes_infra", + state=state, + pipeline=[ + clone, + state, + checkoutMerged, + dockerSwarmCheck, + unmerge, + deployDocker, + # checkPing1, + logUrls + ] +) diff --git a/backend/configs/immich.py b/backend/configs/immich.py index 661b415..43bf5b7 100644 --- a/backend/configs/immich.py +++ b/backend/configs/immich.py @@ -31,10 +31,10 @@ deployDocker = DockerSwarmDeploy( docker_compose_path="poc/immich/stack-compose.yml", ) -checkPing = UrlCheck( - url="https://immich.rudolf.keenetic.link/api/server/ping", - expected={"res": "pong"}, -) +#checkPing = UrlCheck( +# url="https://immich.rudolf.keenetic.link/api/server/ping", +# expected={"res": "pong"}, +#) logUrls = SimpleLog(message={ "userLinks": { "App": "https://immich.rudolf.keenetic.link", @@ -52,7 +52,7 @@ immich = Environment( dockerSwarmCheck, unmerge, deployDocker, - checkPing, +# checkPing, logUrls ] ) diff --git a/backend/steps/docker.py b/backend/steps/docker.py index 3cdedaa..e9587c7 100644 --- a/backend/steps/docker.py +++ b/backend/steps/docker.py @@ -279,8 +279,8 @@ class DockerSwarmDeploy(AbstractStep[str]): swarmEnv = {k: v for k, v in dotenv_values(os.path.join(os.path.dirname(tmp_compose_path), ".env")).items() if v is not None} # merge_dicts(swarmEnv, env) - result = subprocess.run(cmd, capture_output=True, text=True) - # , cwd=os.path.dirname(tmp_compose_path), env=swarmEnv) + result = subprocess.run(cmd, capture_output=True, text=True, cwd=os.path.dirname(tmp_compose_path)) + #, env=swarmEnv) os.remove(tmp_compose_path) if result.returncode != 0: logger.error(f"Stack deploy failed: {result.stderr}") diff --git a/docker-compose.yml b/docker-compose.yml index 5f1ed92..221c65a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -16,7 +16,7 @@ services: - PYTHONUNBUFFERED=1 - VIRTUAL_HOST=brencher.rudolf.keenetic.link - LETSENCRYPT_HOST=brencher.rudolf.keenetic.link - - PROFILES=brencher2,torrserv_proxy,immich,registry,gmail_mcp + - PROFILES=brencher2,torrserv_proxy,immich,gmail_mcp,hermes,hermes_infra - SECONDARY_BRENCHER=http://host.docker.internal:5002 deploy: replicas: 1