create docker image dmi3yy/evolution-cms

Author: Dmytro Lukianenko

docker/entrypoint.sh

@@ -45,6 +45,69 @@ if [ -n "$DB_HOST" ] && [ "$DB_HOST" != "localhost" ]; then
   timeout 30 sh -c 'until nc -z $0 $1; do sleep 1; done' "$DB_HOST" "${DB_PORT:-5432}" || echo "Database wait timeout"
 fi
 
+# Function to create database config file from ENV variables
+create_db_config() {
+  echo "📝 Creating database configuration file..."
+  
+  # Map database type
+  case "$DB_CONNECTION" in
+    "pgsql"|"postgresql")
+      DB_TYPE="pgsql"
+      DB_PORT_DEFAULT="5432"
+      DB_CHARSET="utf8"
+      DB_COLLATION="utf8"
+      DB_ENGINE=""
+      ;;
+    "mysql"|"mariadb")
+      DB_TYPE="mysql"
+      DB_PORT_DEFAULT="3306"
+      DB_CHARSET="utf8mb4"
+      DB_COLLATION="utf8mb4_unicode_520_ci"
+      DB_ENGINE=", 'innodb'"
+      ;;
+    *)
+      DB_TYPE="mysql"
+      DB_PORT_DEFAULT="3306"
+      DB_CHARSET="utf8mb4"
+      DB_COLLATION="utf8mb4_unicode_520_ci"
+      DB_ENGINE=", 'innodb'"
+      echo "⚠️  Unknown DB_CONNECTION '$DB_CONNECTION', defaulting to mysql"
+      ;;
+  esac
+  
+  # Use default port if not set
+  DB_PORT="${DB_PORT:-$DB_PORT_DEFAULT}"
+  
+  # Create config directory if it doesn't exist
+  mkdir -p /var/www/html/core/config/database/connections
+  
+  # Create database config file
+  cat > /var/www/html/core/config/database/connections/default.php <<EOF
+<?php
+return [
+    'driver' => env('DB_TYPE', '${DB_TYPE}'),
+    'host' => env('DB_HOST', '${DB_HOST}'),
+    'port' => env('DB_PORT', '${DB_PORT}'),
+    'database' => env('DB_DATABASE', '${DB_DATABASE}'),
+    'username' => env('DB_USERNAME', '${DB_USERNAME}'),
+    'password' => env('DB_PASSWORD', '${DB_PASSWORD}'),
+    'unix_socket' => env('DB_SOCKET', ''),
+    'charset' => env('DB_CHARSET', '${DB_CHARSET}'),
+    'collation' => env('DB_COLLATION', '${DB_COLLATION}'),
+    'prefix' => env('DB_PREFIX', '${EVO_TABLE_PREFIX:-evo_}'),
+    'method' => env('DB_METHOD', 'SET CHARACTER SET'),
+    'strict' => env('DB_STRICT', false),
+    'engine' => env('DB_ENGINE'${DB_ENGINE}),
+    'options' => [
+        PDO::ATTR_STRINGIFY_FETCHES => true,
+    ]
+];
+EOF
+  
+  chmod 0644 /var/www/html/core/config/database/connections/default.php
+  echo "✅ Database configuration file created"
+}
+
 # Auto-install Evolution CMS if not already installed
 if [ "$EVO_AUTO_INSTALL" = "true" ] && [ ! -f "/var/www/html/config.php" ]; then
   echo "🚀 Evolution CMS not found, starting auto-installation..."
@@ -69,6 +132,11 @@ if [ "$EVO_AUTO_INSTALL" = "true" ] && [ ! -f "/var/www/html/config.php" ]; then
         ;;
     esac
 
+    # For update mode (typeInstall=2), create config file first
+    if [ "${EVO_INSTALL_TYPE}" = "2" ]; then
+      create_db_config
+    fi
+    
     # Run CLI installer
     php cli-install.php \
       --typeInstall="${EVO_INSTALL_TYPE}" \
@@ -86,37 +154,41 @@ if [ "$EVO_AUTO_INSTALL" = "true" ] && [ ! -f "/var/www/html/config.php" ]; then
       --removeInstall="${EVO_REMOVE_INSTALL}"
 
     if [ $? -eq 0 ]; then
-      echo "✅ Evolution CMS installed successfully!"
-      
-      # Post-installation setup
-      cd /var/www/html/core/
-      
-      # Create main package if MAIN_PACKAGE_NAME is set
-      if [ -n "$EVO_MAIN_PACKAGE_NAME" ]; then
-        echo "📦 Creating main package: $EVO_MAIN_PACKAGE_NAME"
-        php artisan package:create "$EVO_MAIN_PACKAGE_NAME"
-        # Normalize package name to StudlyCase (first letter uppercase)
-        EVO_MAIN_PACKAGE_STUDLY=$(printf "%s" "$EVO_MAIN_PACKAGE_NAME" | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
-        # Write exact PHP string with double quotes and escaped backslashes
-        cat > custom/config/cms/settings/ControllerNamespace.php <<PHP
+      if [ "${EVO_INSTALL_TYPE}" = "2" ]; then
+        echo "✅ Evolution CMS updated successfully!"
+      else
+        echo "✅ Evolution CMS installed successfully!"
+        
+        # Post-installation setup (only for fresh install, not for update)
+        cd /var/www/html/core/
+        
+        # Create main package if MAIN_PACKAGE_NAME is set
+        if [ -n "$EVO_MAIN_PACKAGE_NAME" ]; then
+          echo "📦 Creating main package: $EVO_MAIN_PACKAGE_NAME"
+          php artisan package:create "$EVO_MAIN_PACKAGE_NAME"
+          # Normalize package name to StudlyCase (first letter uppercase)
+          EVO_MAIN_PACKAGE_STUDLY=$(printf "%s" "$EVO_MAIN_PACKAGE_NAME" | awk '{print toupper(substr($0,1,1)) substr($0,2)}')
+          # Write exact PHP string with double quotes and escaped backslashes
+          cat > custom/config/cms/settings/ControllerNamespace.php <<PHP
 <?php return "EvolutionCMS\\\\$EVO_MAIN_PACKAGE_STUDLY\\\\Controllers\\\\";
 PHP
+        fi
+        
+        # Install TinyMCE5 if enabled
+        if [ "$EVO_INSTALL_TINYMCE" = "true" ]; then
+          echo "📝 Installing TinyMCE5..."
+          php artisan extras extras TinyMCE5 master || echo "⚠️  TinyMCE5 installation failed"
+          echo '<?php return "TinyMCE5"; ?>' > custom/config/cms/settings/which_editor.php || true
+        fi
+        
+        echo "🎉 Evolution CMS setup completed!"
       fi
 
-      # Install TinyMCE5 if enabled
-      if [ "$EVO_INSTALL_TINYMCE" = "true" ]; then
-        echo "📝 Installing TinyMCE5..."
-        php artisan extras extras TinyMCE5 master || echo "⚠️  TinyMCE5 installation failed"
-        echo '<?php return "TinyMCE5"; ?>' > custom/config/cms/settings/which_editor.php || true
-      fi
-      
-      # Set final permissions
+      # Set final permissions (for both install and update)
       cd /var/www/html/
       chown -R www-data:www-data . || true
-      
-      echo "🎉 Evolution CMS setup completed!"
     else
-      echo "❌ Evolution CMS installation failed!"
+      echo "❌ Evolution CMS installation/update failed!"
       exit 1
     fi
   else