From 9c5fa2cafd4da67a4088f5325af2d91e34172044 Mon Sep 17 00:00:00 2001
From: AnthonyS <a.santoro@integry.it>
Date: Wed, 23 Jul 2025 15:47:45 +0200
Subject: [PATCH] Rimossa cartella exports in docker build e creato dockerfile
 separato per dev

---
 .dockerignore                                 |  3 +-
 .../Mutagen_daemon_start.xml                  |  2 +-
 .idea/runConfigurations/Mutagen_install.xml   | 17 ++++++++
 .idea/runConfigurations/Mutagen_start.xml     |  2 +-
 Dockerfile                                    |  6 +--
 Dockerfile.dev                                | 40 +++++++++++++++++++
 Jenkinsfile.groovy                            | 10 +++--
 docker-compose.yml                            |  3 +-
 8 files changed, 72 insertions(+), 11 deletions(-)
 create mode 100644 .idea/runConfigurations/Mutagen_install.xml
 create mode 100644 Dockerfile.dev

diff --git a/.dockerignore b/.dockerignore
index 1f8a1af71..1d8b100d2 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -5,7 +5,8 @@
 .editorconfig
 .env
 .eslint*
-**/node_modules/
+exports
+**/node_modules
 **/dist
 **/cache
 docker-compose.yml
diff --git a/.idea/runConfigurations/Mutagen_daemon_start.xml b/.idea/runConfigurations/Mutagen_daemon_start.xml
index 951013261..705db344c 100644
--- a/.idea/runConfigurations/Mutagen_daemon_start.xml
+++ b/.idea/runConfigurations/Mutagen_daemon_start.xml
@@ -13,7 +13,7 @@
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs />
     <method v="2">
-      <option name="RunConfigurationTask" enabled="false" run_configuration_name="Install mutagen" run_configuration_type="ShConfigurationType" />
+      <option name="RunConfigurationTask" enabled="false" run_configuration_name="Mutagen install" run_configuration_type="ShConfigurationType" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Mutagen_install.xml b/.idea/runConfigurations/Mutagen_install.xml
new file mode 100644
index 000000000..315a87edf
--- /dev/null
+++ b/.idea/runConfigurations/Mutagen_install.xml
@@ -0,0 +1,17 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Mutagen install" type="ShConfigurationType">
+    <option name="SCRIPT_TEXT" value="$branch= &amp;git rev-parse --abbrev-ref HEAD; docker buildx build --load -t ($branch.Replace('/', '_').ToLower() + &quot;:latest&quot;) --build-arg SERVICES_BASE_URL=https://services.studioml.it --target=final-dev ." />
+    <option name="INDEPENDENT_SCRIPT_PATH" value="false" />
+    <option name="SCRIPT_PATH" value="$PROJECT_DIR$/install-mutagen.ps1" />
+    <option name="SCRIPT_OPTIONS" value="" />
+    <option name="INDEPENDENT_SCRIPT_WORKING_DIRECTORY" value="true" />
+    <option name="SCRIPT_WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="INDEPENDENT_INTERPRETER_PATH" value="false" />
+    <option name="INTERPRETER_PATH" value="$PROJECT_DIR$/../../../Windows/System32/WindowsPowerShell/v1.0/powershell.exe" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="EXECUTE_IN_TERMINAL" value="false" />
+    <option name="EXECUTE_SCRIPT_FILE" value="true" />
+    <envs />
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file
diff --git a/.idea/runConfigurations/Mutagen_start.xml b/.idea/runConfigurations/Mutagen_start.xml
index 1d602add9..6f0940e35 100644
--- a/.idea/runConfigurations/Mutagen_start.xml
+++ b/.idea/runConfigurations/Mutagen_start.xml
@@ -13,7 +13,7 @@
     <option name="EXECUTE_SCRIPT_FILE" value="false" />
     <envs />
     <method v="2">
-      <option name="RunConfigurationTask" enabled="false" run_configuration_name="Install mutagen" run_configuration_type="ShConfigurationType" />
+      <option name="RunConfigurationTask" enabled="false" run_configuration_name="Mutagen install" run_configuration_type="ShConfigurationType" />
     </method>
   </configuration>
 </component>
\ No newline at end of file
diff --git a/Dockerfile b/Dockerfile
index 27771bf1b..6f79fac44 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -75,11 +75,11 @@ COPY docker/php/conf.d/error_reporting.ini /usr/local/etc/php/conf.d/error_repor
 RUN install-php-extensions xdebug
 COPY docker/php/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
 
-#COPY --from=builder --chown=www-data:www-data app ./pvm
+COPY --from=builder --chown=www-data:www-data app ./pvm
 
 USER www-data
-#RUN touch pvm/.env \
-#    && printenv | sed 's/\(^[^=]*\)=\(.*\)/\1="\2"/' > pvm/.env
+RUN touch pvm/.env \
+    && printenv | sed 's/\(^[^=]*\)=\(.*\)/\1="\2"/' > pvm/.env
 
 EXPOSE 80
 EXPOSE 9003
diff --git a/Dockerfile.dev b/Dockerfile.dev
new file mode 100644
index 000000000..4a534b04c
--- /dev/null
+++ b/Dockerfile.dev
@@ -0,0 +1,40 @@
+# syntax=docker/dockerfile:1
+
+ARG PHP_VERSION="7.4"
+
+# Immagine finale
+FROM php:${PHP_VERSION}-apache-bullseye AS final
+
+# Enable Apache modules to ensure proper functionality
+RUN a2enmod rewrite
+
+ADD --chmod=0755 https://github.com/mlocati/docker-php-extension-installer/releases/latest/download/install-php-extensions /usr/local/bin/
+
+COPY docker/php/php.ini $PHP_INI_DIR/php.ini
+
+# Imposto la lingua delle date
+ENV LC_TIME=it_IT.UTF-8
+
+RUN apt-get update && apt-get install -y --no-install-recommends locales \
+    && apt-get clean \
+    && apt-get autoremove -y \
+    && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/* \
+    && echo it_IT.UTF-8 UTF-8 >> /etc/locale.gen \
+    && locale-gen \
+    && install-php-extensions \
+      gd \
+      imagick \
+      zip
+
+COPY docker/apache/000-default.conf $APACHE_CONFDIR/sites-available/000-default.conf
+
+WORKDIR /var/www/html
+
+COPY docker/php/conf.d/error_reporting.ini /usr/local/etc/php/conf.d/error_reporting.ini
+RUN install-php-extensions xdebug
+COPY docker/php/conf.d/xdebug.ini /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
+USER www-data
+
+EXPOSE 80
+EXPOSE 9003
\ No newline at end of file
diff --git a/Jenkinsfile.groovy b/Jenkinsfile.groovy
index b1a3e4629..fc0e97cdc 100644
--- a/Jenkinsfile.groovy
+++ b/Jenkinsfile.groovy
@@ -42,9 +42,9 @@ pipeline {
 
 //                        bat 'cd public_html && npm install --omit=dev'
 
-                            if (NODE_ENV == 'development') {
+                            if (env.NODE_ENV == 'development') {
                                 bat '7za a public_html.zip "%WORKSPACE%\\public_html" -tzip'
-                            } else if (NODE_ENV == 'production') {
+                            } else if (env.NODE_ENV == 'production') {
                                 bat 'grunt BuildAll'
                             }
                         }
@@ -111,10 +111,14 @@ sudo /bin/chmod -R 777 /var/www/portale/cache''', execTimeout: 120000, flatten:
 
                             script {
                                 def branchVersion = ""
-                                def target = "final-prod"
 
                                 if (env.BRANCH_NAME != "master") {
                                     branchVersion = "-${env.BRANCH_NAME.toLowerCase().replace('/', '-')}"
+                                }
+
+                                def target = "final-prod"
+
+                                if (env.NODE_ENV == "development") {
                                     target = "final-dev"
                                 }
 
diff --git a/docker-compose.yml b/docker-compose.yml
index 1c42b2f24..96aafd543 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -9,8 +9,7 @@ services:
 
   php-apache:
     build:
-      dockerfile: ./Dockerfile
-      target: final-dev
+      dockerfile: ./Dockerfile.dev
     restart: unless-stopped
     container_name: php-apache
     extra_hosts: