From 7f7102ded6e1d2d76b68b1110c4051731f4cf147 Mon Sep 17 00:00:00 2001
From: administrator <currykwok@gmail.com>
Date: Fri, 23 Feb 2024 14:47:00 +0800
Subject: [PATCH] Update roles/demolamp/tasks/redeploy.yml

---
 roles/demolamp/tasks/redeploy.yml | 33 +++++++++++++++----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/roles/demolamp/tasks/redeploy.yml b/roles/demolamp/tasks/redeploy.yml
index e5f43df..5ff4e1f 100644
--- a/roles/demolamp/tasks/redeploy.yml
+++ b/roles/demolamp/tasks/redeploy.yml
@@ -1,12 +1,14 @@
+---
+
 - block:
   - name: Stop a container
     community.docker.docker_container:
-      name: demolamp
+      name: "{{ stackName }}"
       state: stopped
 
   - name: Remove container
     community.docker.docker_container:
-      name: demolamp
+      name: "{{ stackName }}"
       state: absent
 
 
@@ -28,7 +30,7 @@
     
   - name: Remove the docker image for demolamp if exists
     community.docker.docker_image:
-      name: "demolamp"
+      name: "{{ demolamp.imageName }}"
       tag: "{{ ansTagVer }}"
       state: absent
  
@@ -42,22 +44,9 @@
 
   - name: Build demolamp image
     community.docker.docker_image:
-      name: demolamp
+      name: "{{ demolamp.imageName }}"
       source: build
       tag: "{{ ansTagVer }}"
-
-
-- block:
-  - name: run docker
-    community.docker.docker_container:
-      name: demolamp
-      state: started
-      recreate: yes
-      image: "demolamp:{{ ansTagVer }}"
-      ports:
-        - "80:80"
-
-
       build:
         path: "{{ build_root_abspath }}"
         pull: false
@@ -67,3 +56,13 @@
       timeout: 300
       state: present
 
+
+- block:
+  - name: run docker
+    community.docker.docker_container:
+      name: "{{ stackName }}"
+      state: started
+      recreate: yes
+      image: "{{ demolamp.imageName }}:{{ ansTagVer }}"
+      ports:
+        - "80:80"