Bläddra i källkod

allineamento cloud artcloud

root 1 månad sedan
förälder
incheckning
5fd6d4aa80
3 ändrade filer med 18 tillägg och 8 borttagningar
  1. 16 6
      docker-compose.yml
  2. 1 1
      php/run.sh
  3. 1 1
      php/runcron.sh

+ 16 - 6
docker-compose.yml

@@ -36,8 +36,10 @@ services:
       - 80:80
       - 443:443
     volumes:
-      - /home/httpd:/home/httpd
-      - /home/httpd:/home/net211
+      - httpd:/home/httpd
+      - httpd:/home/net211
+      #- /home/httpd:/home/httpd
+      #- /home/httpd:/home/net211
     entrypoint: ['/bin/bash','/root/proxy.sh']
     restart: unless-stopped
 
@@ -54,7 +56,8 @@ services:
       - 10080:80
       - 10443:443
     volumes:
-      - /home/httpd:/home/httpd
+      - httpd:/home/httpd
+      #- /home/httpd:/home/httpd
     entrypoint: ['/bin/bash','/root/nginx.sh']
     restart: unless-stopped
 
@@ -66,9 +69,10 @@ services:
       context: php
       dockerfile: Dockerfile
       args:
-        PHP_VERSION: 8.3
+        PHP_VERSION: 8.4
     environment:
       TZ: Europe/Rome
+      PHP_VERSION: 8.4
     ports:
       - 9000:9000
     volumes:
@@ -82,7 +86,7 @@ services:
       context: php
       dockerfile: Dockerfile
       args:
-        PHP_VERSION: 8.3
+        PHP_VERSION: 8.4
     depends_on: 
       - php
     environment:
@@ -91,4 +95,10 @@ services:
       - /home/httpd:/home/httpd
     entrypoint: ["/bin/bash"]
 
-
+volumes:
+  httpd:
+    driver: local
+    driver_opts:
+      type: nfs
+      o: "addr=127.0.0.1,soft,rw,noexec,nosuid,nodev,async"
+      device: ":/home/httpd"

+ 1 - 1
php/run.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 /etc/init.d/postfix start
 echo "macchina in partenza" | mail -s "macchina in partenza" server@altemica.net
-/etc/init.d/php8.3-fpm start
+/etc/init.d/php${PHP_VERSION}-fpm start
 touch /tmp/null
 tail -f /tmp/null
 

+ 1 - 1
php/runcron.sh

@@ -3,7 +3,7 @@ p="$(pwd)"
 cd /home/httpd/cloud.artcloudnetwork.com/site
 if [ ! -f /tmp/runcron.run ]; then
   touch /tmp/runcron.run  
-  su www-data -s /bin/bash -c "/usr/bin/php8.3 -c /etc/php/8.3/fpm/php.ini -d apc.enable_cli=1 -d memory_limit=2048M -f /home/httpd/cloud.artcloudnetwork.com/site/cron.php" 
+  su www-data -s /bin/bash -c "/usr/bin/php${PHP_VERSION} -c /etc/php/${PHP_VERSION}/fpm/php.ini -d apc.enable_cli=1 -d memory_limit=2048M -f /home/httpd/cloud.artcloudnetwork.com/site/cron.php" 
   rm /tmp/runcron.run
 else
   echo "trovato file lock runcron"