From c50828abbb09d574eb0fd9c4c649dc481c8d569b Mon Sep 17 00:00:00 2001
From: Krystian Panek <krystian.panek@wundermanthompson.com>
Date: Sat, 18 Feb 2023 13:55:36 +0100
Subject: [PATCH] Classic tasks clean up

---
 pkg/project/classic/Taskfile.yml        | 20 ++++++++++++++------
 pkg/project/classic/dispatcher/build.sh |  3 ---
 pkg/project/cloud/Taskfile.yml          |  6 ++++++
 3 files changed, 20 insertions(+), 9 deletions(-)
 delete mode 100755 pkg/project/classic/dispatcher/build.sh

diff --git a/pkg/project/classic/Taskfile.yml b/pkg/project/classic/Taskfile.yml
index 17daeb78..03e33bda 100644
--- a/pkg/project/classic/Taskfile.yml
+++ b/pkg/project/classic/Taskfile.yml
@@ -68,6 +68,12 @@ tasks:
       - sh aemw instance create
       - sh aemw instance up
 
+  aem:await:
+    desc: await stable AEM instances
+    aliases: [aem:check]
+    cmds:
+      - sh aemw instance await
+
   aem:status:
     desc: check AEM instances status
     env:
@@ -146,7 +152,6 @@ tasks:
         --command "mvn clean package"
         --sources "pom.xml,all,core,ui.apps,ui.apps.structure,ui.config,ui.content,ui.frontend,ui.tests"
         --file "all/target/*.all-*.zip"
-      - cd dispatcher && sh build.sh
 
   aem:deploy:
     desc: deploy AEM application
@@ -154,15 +159,18 @@ tasks:
     cmds:
       - sh aemw package deploy --file "all/target/*.all-*.zip"
 
+  docker:build:dispatcher:
+    desc: build AEM dispatcher image
+    dir: dispatcher
+    cmds:
+      - docker build -t acme/aem-ams/dispatcher-publish .
+
   docker:start:
     desc: start Docker containers
     aliases: [docker:up]
+    deps: [docker:build:dispatcher]
     cmds:
-      - >
-        mkdir -p 
-        aem/home/var/dispatcher/httpd/logs 
-        aem/home/var/dispatcher/httpd/cache 
-        aem/home/var/dispatcher/httpd/htdocs
+      - mkdir -p aem/home/var/dispatcher/httpd/logs aem/home/var/dispatcher/httpd/cache aem/home/var/dispatcher/httpd/htdocs
       - docker compose up -d
 
   docker:stop:
diff --git a/pkg/project/classic/dispatcher/build.sh b/pkg/project/classic/dispatcher/build.sh
deleted file mode 100755
index 2cfc73a7..00000000
--- a/pkg/project/classic/dispatcher/build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env sh
-
-docker build -t acme/aem-ams/dispatcher-publish .
diff --git a/pkg/project/cloud/Taskfile.yml b/pkg/project/cloud/Taskfile.yml
index a60279c3..4847059a 100644
--- a/pkg/project/cloud/Taskfile.yml
+++ b/pkg/project/cloud/Taskfile.yml
@@ -67,6 +67,12 @@ tasks:
       - sh aemw instance create
       - sh aemw instance up
 
+  aem:await:
+    desc: await stable AEM instances
+    aliases: [aem:check]
+    cmds:
+      - sh aemw instance await
+
   aem:status:
     desc: check AEM instances status
     env: