Переглянути джерело

allineamento produzione sviluppo

mauro 1 місяць тому
батько
коміт
c38378be8b
3 змінених файлів з 16 додано та 18 видалено
  1. 9 0
      docker-compose.yml
  2. 7 1
      mosquitto.d4/run.sh
  3. 0 17
      python/start.ori

+ 9 - 0
docker-compose.yml

@@ -13,6 +13,7 @@ services:
     depends_on:
       - start 
 
+  # dashboard4
   django4:
     image: django4
     build:
@@ -30,6 +31,7 @@ services:
     entrypoint: ['/bin/bash','/root/run.sh']
     restart: unless-stopped
 
+  # dashboard4: nginx per supporto file e immagini
   nginx.d4:
     image: nginx.d4
     build:
@@ -45,6 +47,7 @@ services:
     depends_on:
       - start 
 
+  # dashboard5
   django5:
     image: django5
     build:
@@ -62,6 +65,7 @@ services:
     entrypoint: ['/bin/bash','/root/run.sh']
     restart: unless-stopped
 
+  # dashboard5: nginx per supporto file e immagini
   nginx.d5:
     image: nginx.d5
     build:
@@ -77,6 +81,7 @@ services:
     depends_on:
       - start 
 
+  # spacchettatore di pdf per l'amministrazione
   bpconverter:
     image: django.bcp
     build:
@@ -94,6 +99,7 @@ services:
     entrypoint: ['/bin/bash','/root/run.sh']
     restart: unless-stopped
 
+  # bpconverter: supporto per la fornitura di file e immagini
   bpconverter.nginx:
     image: nginx.bpc
     build:
@@ -109,6 +115,7 @@ services:
     depends_on:
       - start 
 
+  # gestione documentale
   gd:
     image: django.gd
     build:
@@ -126,6 +133,7 @@ services:
     entrypoint: ['/bin/bash','/root/run.sh']
     restart: unless-stopped
 
+  # mosquitto server
   mosquitto:
     image: mosquitto
     build:
@@ -140,6 +148,7 @@ services:
     depends_on:
       - start 
 
+  # mosquitto client con codice per dashboard4
   mosquitto.d4:
     image: mosquitto.d4
     build:

+ 7 - 1
mosquitto.d4/run.sh

@@ -1,4 +1,10 @@
 #!/bin/bash
 . /home/runtime/bin/activate
 cd /home/data/mosquitto.d4
- python answer.py
+  while /usr/bin/true; do
+    python answer.py
+    data=$(date)
+    echo "Restart mosquitto.d4" > ./mosquitto.log
+    sleep 5
+    #&> ./mosquitto.log
+  done

+ 0 - 17
python/start.ori

@@ -1,17 +0,0 @@
-from debian:stable as base_image
-run echo "Creazione immagine di base"
-run apt update && apt dist-upgrade -y
-run apt install nfs-common -y
-run ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime
-
-from base_image as python_ready
-run apt install python3-pip python3-venv python-is-python3 -y
-run cd /home && python -mvenv runtime
-run ls -al /home
-
-from python_ready as django_428
-run . ./home/runtime/bin/activate && pip install django==4.2.8 && pip install configparser && pip install pymysqldb
-
-from python_ready as django_latest
-run . ./home/runtime/bin/activate && pip install django && pip install configparser && pip install pymysqldb
-