Classic tasks clean up

wttech · Feb 18, 2023 · c50828a · c50828a
1 parent d8c15e7
commit c50828a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 9 deletions.
diff --git 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,23 +152,25 @@ 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
     deps: [aem:build]
     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
diff --git 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: