jkfile

Jenkinsfile

@@ -1,9 +1,9 @@
 pipeline {
-    agent {
-        docker {
-            image 'php:8.2-fpm'
-            args '-u root'
-        }
+    agent any
+
+    tools {
+        php 'PHP 8.2'
+        nodejs 'NodeJS 18'
     }
 
     environment {
@@ -54,10 +54,17 @@ pipeline {
     stages {
         stage('Setup') {
             steps {
-                sh 'apt-get update && apt-get install -y git zip unzip libzip-dev libonig-dev libicu-dev openssh-client'
-                sh 'docker-php-ext-install pdo_mysql zip mbstring intl'
-                sh 'curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin --filename=composer'
                 sh 'php -v'
+                sh 'node -v'
+                sh 'npm -v'
+
+                // Install composer if not available
+                sh '''
+                if ! command -v composer &> /dev/null; then
+                    curl -sS https://getcomposer.org/installer | php
+                    mv composer.phar /usr/local/bin/composer || sudo mv composer.phar /usr/local/bin/composer
+                fi
+                '''
                 sh 'composer --version'
             }
         }
@@ -93,7 +100,6 @@ pipeline {
 
         stage('Build Assets') {
             steps {
-                sh 'apt-get install -y nodejs npm'
                 sh 'npm install'
                 sh 'npm run build'
             }
@@ -102,7 +108,8 @@ pipeline {
         stage('Deploy to Server') {
             when {
                 anyOf {
-                    branch 'develop'
+                    branch 'master'
+                    branch 'main'
                 }
             }
             steps {