diff --git a/docker-compose-prune.yaml b/docker-compose-prune.yaml index 083b39a..992ec38 100644 --- a/docker-compose-prune.yaml +++ b/docker-compose-prune.yaml @@ -5,20 +5,23 @@ ### !!! - name: Manage Docker Compose services hosts: paperless, mongodb, gitea, - newt, jenkins, - ionos-debian-01, jellyfin -# hosts: paperless, wiki + newt, jenkins, jellyfin, n8n, + vaultwarden, ora-ubuntu-01 +# hosts: wiki, ionos-debian-01 become: true vars: host_compose_dirs: - wiki: "/home/admin/wikijs" +# wiki: "/home/admin/wikijs" paperless: "/home/admin" mongodb: "/home/admin/mongodb" gitea: "/home/admin/gitea" newt: "/home/admin/newt" jenkins: "/home/admin/jenkins" - ionos-debian-01: "/home/admin/pangolin" +# ionos-debian-01: "/home/admin/pangolin" jellyfin: "/home/admin" + n8n: "/home/admin/n8n" + vaultwarden: "/home/admin/vaultwarden" + ora-ubuntu-01: "/home/ubuntu/pangolin" force_pull: false force_recreate: false diff --git a/docker-compose-update.yaml b/docker-compose-update.yaml index 53380d4..7ab2b78 100644 --- a/docker-compose-update.yaml +++ b/docker-compose-update.yaml @@ -1,42 +1,69 @@ -### noch nicht ok !!!! -### keine Rechte fuer User ansible - name: Manage Docker Compose services - hosts: paperless, mongodb, gitea, - newt, jenkins, ionos-debian-01, jellyfin -# hosts: wiki !!! TOOK WIKI OUT !!! + hosts: paperless, mongodb, gitea, newt, jenkins, jellyfin, n8n, vaultwarden, ora-ubuntu-01 become: true vars: - host_compose_dirs: - wiki: "/home/admin/wikijs" - paperless: "/home/admin" - mongodb: "/home/admin/mongodb" - gitea: "/home/admin/gitea" - newt: "/home/admin/newt" - jenkins: "/home/admin/jenkins" - ionos-debian-01: "/home/admin/pangolin" - jellyfin: "/home/admin" + host_compose_configs: + paperless: + project_dir: "/home/admin" + compose_files: + - docker-compose.yaml + mongodb: + project_dir: "/home/admin/mongodb" + compose_files: + - docker-compose.yaml + gitea: + project_dir: "/home/admin/gitea" + compose_files: + - docker-compose.yaml + newt: + project_dir: "/home/admin/newt" + compose_files: + - docker-compose.yaml + jenkins: + project_dir: "/home/admin/jenkins" + compose_files: + - docker-compose.yaml + jellyfin: + project_dir: "/home/admin" + compose_files: + - docker-compose.yaml + n8n: + project_dir: "/home/admin/n8n" + compose_files: + - docker-compose.yaml + vaultwarden: + project_dir: "/home/admin/vaultwarden" + compose_files: + - docker-compose.yaml + ora-ubuntu-01: + project_dir: "/home/ubuntu/pangolin" + compose_files: + - docker-compose-monitoring.yaml + - docker-compose.yaml + force_pull: false force_recreate: false tasks: - name: Stop and remove containers community.docker.docker_compose_v2: - project_src: "{{ host_compose_dirs[inventory_hostname] }}" + project_src: "{{ host_compose_configs[inventory_hostname].project_dir }}" + files: "{{ host_compose_configs[inventory_hostname].compose_files }}" state: absent register: compose_down - name: Pull latest images - community.docker.docker_compose_v2_pull: - project_src: "{{ host_compose_dirs[inventory_hostname] }}" - # Remove the 'pull' parameter - the module always pulls by default - # Add policy if you want to control pull behavior - policy: "always" # or "missing" or "build" + community.docker.docker_compose_v2: + project_src: "{{ host_compose_configs[inventory_hostname].project_dir }}" + files: "{{ host_compose_configs[inventory_hostname].compose_files }}" + pull: always when: compose_down.changed or force_pull register: compose_pull - name: Start services community.docker.docker_compose_v2: - project_src: "{{ host_compose_dirs[inventory_hostname] }}" + project_src: "{{ host_compose_configs[inventory_hostname].project_dir }}" + files: "{{ host_compose_configs[inventory_hostname].compose_files }}" state: present recreate: "{{ 'always' if force_recreate else 'auto' }}" register: compose_up @@ -44,11 +71,8 @@ - name: Docker prune community.docker.docker_prune: containers: true - images: true -# networks: true -# volumes: true -# builder_cache: true + register: prune_result - name: Display operation results debug: @@ -57,4 +81,3 @@ Services down: {{ compose_down.changed }} Images pulled: {{ compose_pull.changed if compose_pull is defined else 'skipped' }} Services up: {{ compose_up.changed }} - diff --git a/inventory b/inventory index 8aafc9a..5644700 100644 --- a/inventory +++ b/inventory @@ -11,9 +11,10 @@ jenkins gitea pihole newt -#wiki paperless jellyfin +n8n +vaultwarden [pve] pve-01 @@ -26,7 +27,9 @@ vm-ubuntu-01 #homeassistant [vserver] -ionos-debian-01 +#ionos-debian-01 +ora-ubuntu-01 +ora-ubuntu-02 [homelab] zeus