From 25c031e827b2e81f1993ca21266ec809f5f65fb3 Mon Sep 17 00:00:00 2001
From: Administrator <gitlab_admin_a84168@example.com>
Date: Wed, 15 Oct 2025 10:59:05 +0000
Subject: [PATCH] Update 2 files

- /roles/npm/tasks/main.yml
- /roles/heimdall/tasks/main.yml
---
 roles/heimdall/tasks/main.yml | 37 ++++-------------------------------
 roles/npm/tasks/main.yml      | 37 ++++-------------------------------
 2 files changed, 8 insertions(+), 66 deletions(-)

diff --git a/roles/heimdall/tasks/main.yml b/roles/heimdall/tasks/main.yml
index 517580b..a70fc19 100644
--- a/roles/heimdall/tasks/main.yml
+++ b/roles/heimdall/tasks/main.yml
@@ -14,13 +14,6 @@
     dest: "{{ heimdall_base_dir }}/docker-compose.yml"
     mode: 0644
 
-- name: Pull Heimdall Docker images
-  shell: |
-    cd {{ heimdall_base_dir }}
-    docker compose pull
-  args:
-    executable: /bin/bash
-
 - name: Start Heimdall container
   shell: |
     cd {{ heimdall_base_dir }}
@@ -32,33 +25,11 @@
   pause:
     seconds: 15
 
-- name: Check Heimdall container status
-  shell: |
-    docker ps --filter name=heimdall --format "json"
-  register: heimdall_status
+- name: Check if Heimdall container is running
+  shell: docker ps --filter name=heimdall --format "table {{.Names}}\\t{{.Status}}"
+  register: heimdall_check
   changed_when: false
 
 - name: Show Heimdall status
   debug:
-    msg: "Heimdall container: {{ heimdall_status.stdout }}"
-
-- name: Verify Heimdall is running
-  shell: |
-    docker ps --filter name=heimdall --filter status=running --quiet | wc -l
-  register: heimdall_running
-  changed_when: false
-
-- name: Show Heimdall running status
-  debug:
-    msg: "Heimdall is running: {{ heimdall_running.stdout | int > 0 }}"
-
-- name: Check Heimdall logs
-  shell: |
-    cd {{ heimdall_base_dir }}
-    docker compose logs --tail=5
-  register: heimdall_logs
-  failed_when: false
-
-- name: Show Heimdall logs
-  debug:
-    msg: "Heimdall logs: {{ heimdall_logs.stdout }}"
\ No newline at end of file
+    var: heimdall_check.stdout
\ No newline at end of file
diff --git a/roles/npm/tasks/main.yml b/roles/npm/tasks/main.yml
index 3c79655..c4c2376 100644
--- a/roles/npm/tasks/main.yml
+++ b/roles/npm/tasks/main.yml
@@ -15,13 +15,6 @@
     dest: "{{ npm_base_dir }}/docker-compose.yml"
     mode: 0644
 
-- name: Pull NPM Docker images
-  shell: |
-    cd {{ npm_base_dir }}
-    docker compose pull
-  args:
-    executable: /bin/bash
-
 - name: Start NPM container
   shell: |
     cd {{ npm_base_dir }}
@@ -33,33 +26,11 @@
   pause:
     seconds: 15
 
-- name: Check NPM container status
-  shell: |
-    docker ps --filter name=npm --format "json"
-  register: npm_status
+- name: Check if NPM container is running
+  shell: docker ps --filter name=npm --format "table {{.Names}}\\t{{.Status}}"
+  register: npm_check
   changed_when: false
 
 - name: Show NPM status
   debug:
-    msg: "NPM container: {{ npm_status.stdout }}"
-
-- name: Verify NPM is running
-  shell: |
-    docker ps --filter name=npm --filter status=running --quiet | wc -l
-  register: npm_running
-  changed_when: false
-
-- name: Show NPM running status
-  debug:
-    msg: "NPM is running: {{ npm_running.stdout | int > 0 }}"
-
-- name: Check NPM logs
-  shell: |
-    cd {{ npm_base_dir }}
-    docker compose logs --tail=5
-  register: npm_logs
-  failed_when: false
-
-- name: Show NPM logs
-  debug:
-    msg: "NPM logs: {{ npm_logs.stdout }}"
\ No newline at end of file
+    var: npm_check.stdout
\ No newline at end of file