update dockerfiles

docker/.env

 # ======================================================================
 #
-# GENERATED BY ./init.sh - template: ./templates/dot_env - e2cde05722688ff85d3a93e9cd55787e
+# GENERATED BY docker/init.sh - template: ./templates/dot_env - e2cde05722688ff85d3a93e9cd55787e
 # values to be used in docker-composer.yml
 #
 # ======================================================================

docker/containers/web-server/Dockerfile

 #
-# GENERATED BY ./init.sh - template: ./templates/web-server-Dockerfile - 42dce773c83597a7d05af398bdd66d15
+# GENERATED BY docker/init.sh - template: ./templates/web-server-Dockerfile - 42dce773c83597a7d05af398bdd66d15
 #
 FROM php:8.1-apache
 
 # install packages
-RUN apt-get update && apt-get install -y git unzip zip
+RUN apt-get update && apt-get install -y git unzip zip rsync
 
 # enable apache modules
 RUN a2enmod rewrite

docker/containers/web-server/apache/sites-enabled/vhost_app.conf

 #
-# GENERATED BY ./init.sh - template: ./templates/vhost_app.conf - 9a9cf79de5a3584c0cef6cb79c339c25
+# GENERATED BY docker/init.sh - template: ./templates/vhost_app.conf - 9a9cf79de5a3584c0cef6cb79c339c25
 #
 
 

docker/containers/web-server/php/extra-php-config.ini

 ;
-; GENERATED BY ./init.sh - template: ./templates/extra-php-config.ini - 80c23edaf568e2c36b9926fe2339e481
+; GENERATED BY docker/init.sh - template: ./templates/extra-php-config.ini - 80c23edaf568e2c36b9926fe2339e481
 ;
 [PHP]
 

docker/docker-compose.yml

 #
-# GENERATED BY ./init.sh - template: ./templates/docker-compose.yml - 482a0fd9745c482f4cc4b3871c3fa4b3
+# GENERATED BY docker/init.sh - template: ./templates/docker-compose.yml - 97c88229bd2b5099544c013052b8d9c3
 #
 # ======================================================================
 #
@@ -31,12 +31,18 @@ services:
     working_dir: ${WEBROOT}
     
     volumes:
-      - ../:/var/www/${APP_NAME}
-      - ../data/imldeployment:/var/imldeployment
-      - ../data/tmp:/var/tmp/imldeployment
+      # service config
       - ./containers/web-server/apache/sites-enabled:/etc/apache2/sites-enabled
       - ./containers/web-server/php/extra-php-config.ini:/usr/local/etc/php/conf.d/extra-php-config.ini
 
+      # data dirs
+      - ../data/.ssh:/var/www/.ssh
+      - ../data/imldeployment:/var/imldeployment
+      - ../data/tmp:/var/tmp/imldeployment
+
+      # app webroot
+      - ../:/var/www/${APP_NAME}
+
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost"]
       interval: 10s

docker/init.sh

@@ -282,7 +282,7 @@ while true; do
             _wait
             ;;
         u)
-            if docker-compose --verbose up -d --remove-orphans; then
+            if docker-compose --verbose up -d --remove-orphans --build; then
                 # test ! -z "${APP_ONSTARTUP}" && sleep 2 && docker exec -it appmonitor-server /bin/bash -c "${APP_ONSTARTUP}" 
                 echo "In a web browser:"
                 echo "  $frontendurl"

docker/templates/docker-compose.yml

@@ -32,12 +32,18 @@ services:
     working_dir: ${WEBROOT}
     
     volumes:
-      - ../:/var/www/${APP_NAME}
-      - ../data/imldeployment:/var/imldeployment
-      - ../data/tmp:/var/tmp/imldeployment
+      # service config
       - ./containers/web-server/apache/sites-enabled:/etc/apache2/sites-enabled
       - ./containers/web-server/php/extra-php-config.ini:/usr/local/etc/php/conf.d/extra-php-config.ini
 
+      # data dirs
+      - ../data/.ssh:/var/www/.ssh
+      - ../data/imldeployment:/var/imldeployment
+      - ../data/tmp:/var/tmp/imldeployment
+
+      # app webroot
+      - ../:/var/www/${APP_NAME}
+
     healthcheck:
       test: ["CMD", "curl", "-f", "http://localhost"]
       interval: 10s