M6 doesn't need custom dockerfile as it already has NPM and compsoer in it. Let's simplify

Author: escopecz

.env

@@ -1,5 +1,18 @@
 COMPOSE_PROJECT_NAME=basic
 COMPOSE_NETWORK=${COMPOSE_PROJECT_NAME}-docker
+
+# Mautic Configuration
+MAUTIC_VERSION=6.0.5-apache
+
+# Mautic Packages (comma-separated, leave empty if none needed)
+MAUTIC_THEMES=
+MAUTIC_PLUGINS=
+
+# Example:
+# MAUTIC_THEMES=vendor/theme-name:^1.0,another/theme:^2.0
+# MAUTIC_PLUGINS=vendor/plugin-name:^1.0,another/plugin:^2.0
+
+# Database Configuration
 MYSQL_HOST=db.${COMPOSE_NETWORK}
 MYSQL_PORT=3306
 MYSQL_DATABASE=mautic_db

Dockerfile

@@ -1,6 +1,6 @@
-# Hosting Mautic 5 on a VPS with Docker Compose
+# Hosting Mautic 6 on a VPS with Docker Compose
 
-This is a working example of automate hosting Mautic 5 instance(s) on Virtual Private Server (VPS) on [digitalocean.com](https://m.do.co/c/d0ce234a41be)
+This is a working example of automate hosting Mautic 6 instance(s) on Virtual Private Server (VPS) on [digitalocean.com](https://m.do.co/c/d0ce234a41be)
 
 ## Mautic Conference Global 2024 video about this project
 
@@ -24,7 +24,7 @@ This is a bit different from your normal "execute a bunch of commands" tutorials
 
 It allows you to:
 - Install Mautic within 10 minutes.
-- Upgrade Mautic with 1 line change.
+- Upgrade Mautic with 1 line change in `.env` file.
 - Downgrade with commit revert.
 - Install themes and plugins via Composer.
 - Anyone from your team can do this. Avoid the [Bus Factor](https://en.wikipedia.org/wiki/Bus_factor). GitHub allows you to set rules that someone needs to approve all changes before they are applied.
@@ -93,7 +93,7 @@ A container is a list or a recipe of commands that needs to be executed to build
 
 **Docker Compose** enables simplified networking between the containers and [1 config file](docker-compose.yml) where all that interconnection is described.
 
-The [docker-compose.yml](docker-compose.yml) in this repository was copied from https://github.com/mautic/docker-mautic/tree/mautic5/examples/basic
+The [docker-compose.yml](docker-compose.yml) in this repository uses the official [Mautic Docker images](https://hub.docker.com/r/mautic/mautic).
 
 ### Containers
 
@@ -123,8 +123,23 @@ Volumes are basically files and directories that are shared between a container
 
 One of the goals of this deployment is to have a trace of everything related to the Mautic instance configuration. Installing a plugin or a theme can break your Mautic so it's good to have a way to roll back if it happens. And to have a trace of who installed what, when and why is also great to have. Git gives us all that.
 
-In the [Dockerfile](Dockerfile) there is an example of how to install a package. In this case it is a [`chimpino/theme-air`](https://chimpino.com/themes) theme. If you need to install anyting else, you'll just add a new line with the package you need and commit this one line change.
+### Configuration via Environment Variables
 
+Themes and plugins are now configured in the [`.env`](.env) file using environment variables:
+
+```bash
+# Mautic Packages (comma-separated, leave empty if none needed)
+MAUTIC_THEMES=vendor/theme-name:^1.0,another/theme:^2.0
+MAUTIC_PLUGINS=vendor/plugin-name:^1.0,another/plugin:^2.0
+```
+
+### Mautic Version Configuration
+
+You can also configure the Mautic version in the `.env` file:
+
+```bash
+MAUTIC_VERSION=6.0.5-apache
+```
 
 ## Cron jobs
 

README.md

@@ -26,9 +26,7 @@ services:
       - default
 
   mautic_web:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: mautic/mautic:${MAUTIC_VERSION:-6.0.5-apache}
     links:
       - db:mysql
     ports:
@@ -52,9 +50,7 @@ services:
       - default
 
   mautic_cron:
-      build:
-        context: .
-        dockerfile: Dockerfile
+      image: mautic/mautic:${MAUTIC_VERSION:-6.0.5-apache}
       links:
         - db:mysql
       volumes: *mautic-volumes
@@ -69,9 +65,7 @@ services:
         - default
 
   mautic_worker:
-    build:
-      context: .
-      dockerfile: Dockerfile
+    image: mautic/mautic:${MAUTIC_VERSION:-6.0.5-apache}
     links:
       - db:mysql
     volumes: *mautic-volumes

docker-compose.yml

@@ -33,6 +33,45 @@ else
     fi
     echo "## Installing Mautic..."
     docker compose exec -T -u www-data -w /var/www/html mautic_web php ./bin/console mautic:install --force --admin_email {{EMAIL_ADDRESS}} --admin_password {{MAUTIC_PASSWORD}} http://{{IP_ADDRESS}}:{{PORT}}
+    
+    echo "## Installing custom themes and plugins..."
+    
+    # Load environment variables
+    if [ -f "/var/www/.env" ]; then
+        source /var/www/.env
+    fi
+    
+    # Install themes
+    if [ ! -z "$MAUTIC_THEMES" ]; then
+        echo "### Processing themes..."
+        IFS=',' read -ra THEME_ARRAY <<< "$MAUTIC_THEMES"
+        for package in "${THEME_ARRAY[@]}"; do
+            package=$(echo "$package" | xargs) # trim whitespace
+            if [ ! -z "$package" ]; then
+                echo "#### Installing theme: $package"
+                docker compose exec -T -u www-data -w /var/www/html mautic_web composer require "$package" --no-scripts --no-interaction || echo "Warning: Failed to install theme $package"
+            fi
+        done
+    else
+        echo "### No themes defined in MAUTIC_THEMES"
+    fi
+    
+    # Install plugins
+    if [ ! -z "$MAUTIC_PLUGINS" ]; then
+        echo "### Processing plugins..."
+        IFS=',' read -ra PLUGIN_ARRAY <<< "$MAUTIC_PLUGINS"
+        for package in "${PLUGIN_ARRAY[@]}"; do
+            package=$(echo "$package" | xargs) # trim whitespace
+            if [ ! -z "$package" ]; then
+                echo "#### Installing plugin: $package"
+                docker compose exec -T -u www-data -w /var/www/html mautic_web composer require "$package" --no-scripts --no-interaction || echo "Warning: Failed to install plugin $package"
+            fi
+        done
+    else
+        echo "### No plugins defined in MAUTIC_PLUGINS"
+    fi
+    
+    echo "## Custom extensions installation completed"
 fi
 
 echo "## Starting all the containers"