From 1a97d84b46d59392f88a6cb3ba404520876091cd Mon Sep 17 00:00:00 2001 From: Tobias Manske Date: Sun, 5 Mar 2023 22:23:01 +0100 Subject: [PATCH] Watchtower: Split pantalaimon --- coreos-config/playbook.yaml | 1 + .../templates/pantalaimon/.env | 1 + .../templates/pantalaimon/docker-compose.yaml | 23 +++++++++++++++++++ .../pantalaimon.conf | 0 .../templates/watchtower/docker-compose.yaml | 17 ++++---------- 5 files changed, 30 insertions(+), 12 deletions(-) create mode 100644 coreos-config/roles/compose_project/templates/pantalaimon/.env create mode 100644 coreos-config/roles/compose_project/templates/pantalaimon/docker-compose.yaml rename coreos-config/roles/compose_project/templates/{watchtower => pantalaimon}/pantalaimon.conf (100%) diff --git a/coreos-config/playbook.yaml b/coreos-config/playbook.yaml index 9e4330c..065e4c6 100644 --- a/coreos-config/playbook.yaml +++ b/coreos-config/playbook.yaml @@ -105,6 +105,7 @@ - { role: compose_project, service: keycloak } - { role: compose_project, service: minio } - { role: compose_project, service: registry } + - { role: compose_project, service: pantalaimon } - { role: compose_project, service: gitea } - { role: compose_project, service: gitea-runner } - { role: compose_project, service: ba-gitlab-runner } diff --git a/coreos-config/roles/compose_project/templates/pantalaimon/.env b/coreos-config/roles/compose_project/templates/pantalaimon/.env new file mode 100644 index 0000000..adb8f9f --- /dev/null +++ b/coreos-config/roles/compose_project/templates/pantalaimon/.env @@ -0,0 +1 @@ +COMPOSE_PROJECT_NAME=pentalaimon diff --git a/coreos-config/roles/compose_project/templates/pantalaimon/docker-compose.yaml b/coreos-config/roles/compose_project/templates/pantalaimon/docker-compose.yaml new file mode 100644 index 0000000..1b4c728 --- /dev/null +++ b/coreos-config/roles/compose_project/templates/pantalaimon/docker-compose.yaml @@ -0,0 +1,23 @@ +--- +services: + pantalaimon: + image: matrixdotorg/pantalaimon:latest + container_name: pantalaimon + security_opt: + - no-new-privileges:true + cap_drop: + - ALL + volumes: + - pantalaimon_data:/data + - ./pantalaimon.conf:/data/pantalaimon.conf:ro,Z + restart: always + networks: + - pantalaimon + +volumes: + pantalaimon_data: +networks: + pantalaimon: + name: pantalaimon + internal: false +... diff --git a/coreos-config/roles/compose_project/templates/watchtower/pantalaimon.conf b/coreos-config/roles/compose_project/templates/pantalaimon/pantalaimon.conf similarity index 100% rename from coreos-config/roles/compose_project/templates/watchtower/pantalaimon.conf rename to coreos-config/roles/compose_project/templates/pantalaimon/pantalaimon.conf diff --git a/coreos-config/roles/compose_project/templates/watchtower/docker-compose.yaml b/coreos-config/roles/compose_project/templates/watchtower/docker-compose.yaml index 69be58b..1a330c9 100644 --- a/coreos-config/roles/compose_project/templates/watchtower/docker-compose.yaml +++ b/coreos-config/roles/compose_project/templates/watchtower/docker-compose.yaml @@ -14,18 +14,11 @@ services: - /var/run/docker.sock:/var/run/docker.sock - /home/core/.docker:/config restart: always + networks: + - default + - pantalaimon +networks: pantalaimon: - image: matrixdotorg/pantalaimon:latest - security_opt: - - no-new-privileges:true - cap_drop: - - ALL - volumes: - - pantalaimon_data:/data - - ./pantalaimon.conf:/data/pantalaimon.conf:ro,Z - restart: always - -volumes: - pantalaimon_data: + external: true ...