Ver Fonte

aggiunto sviluppo dashboard6

root há 4 semanas atrás
pai
commit
2adb0b9e6b
8 ficheiros alterados com 48 adições e 10 exclusões
  1. 24 6
      docker-compose.yml
  2. 1 1
      python/django.gd
  3. 5 0
      python/django.gd1
  4. 6 0
      python/django6
  5. 1 1
      python/run.gd.sh
  6. 9 0
      python/run6.sh
  7. 1 1
      python/start
  8. 1 1
      python/start.old

+ 24 - 6
docker-compose.yml

@@ -79,6 +79,24 @@ services:
     entrypoint: ['/bin/bash','/root/run.sh']
     restart: unless-stopped
 
+  # dashboard6
+  django6:
+    image: django6
+    build:
+      context: python
+      dockerfile: django6
+    depends_on:
+      - python
+    ports: 
+      - 8160:8160
+    volumes:
+      - /home/data:/home/data
+    environment:
+      - PORT=8160
+      - V=6
+    entrypoint: ['/bin/bash','/root/run.sh']
+    restart: unless-stopped
+
   # dashboard5: nginx per supporto file e immagini
   nginx.d5:
     image: nginx.d5
@@ -147,16 +165,16 @@ services:
       - start 
 
   # mosquitto client con codice per dashboard4
-  mosquitto.d4:
-    image: mosquitto.d4
+  mosquitto.d5:
+    image: mosquitto.d5
     build:
-      context: mosquitto.d4
-      dockerfile: mosquitto.d4
+      context: mosquitto.d5
+      dockerfile: mosquitto.d5
     volumes:
       - /home/data:/home/data
-      - /home/data/mosquitto.d4:/home/data/mosquitto.d4
+      - /home/data/mosquitto.d5:/home/data/mosquitto.d5
     entrypoint: ['/bin/bash','/root/run.sh']
     restart: unless-stopped
     depends_on:
-      - django4
+      - django5
 

+ 1 - 1
python/django.gd

@@ -1,5 +1,5 @@
 from python as django5
-run . ./home/runtime/bin/activate && pip install django && pip install pypdf2 && pip install python-codicefiscale
+run . ./home/runtime/bin/activate && pip install django && pip install pypdf2 && pip install python-codicefiscale && pip install gunicorn 
 run ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime
 copy run.gd.sh /root/run.sh
 

+ 5 - 0
python/django.gd1

@@ -0,0 +1,5 @@
+from python as django5
+run . ./home/runtime/bin/activate && pip install django && pip install pypdf2 && pip install python-codicefiscale && pip install gunicorn 
+run ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime
+copy run.gd1.sh /root/run.sh
+

+ 6 - 0
python/django6

@@ -0,0 +1,6 @@
+FROM python
+COPY run6.sh /root/run.sh
+RUN chmod a+x /root/run.sh
+RUN . ./home/runtime/bin/activate && pip install django && pip install gunicorn
+RUN ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime
+

+ 1 - 1
python/run.gd.sh

@@ -6,4 +6,4 @@ cd /home/gd
 . /home/runtime/bin/activate
 
 python manage.py runserver 0.0.0.0:${PORT}
-
+#gunicorn -b 0.0.0.0:${PORT} gd.wsgi

+ 9 - 0
python/run6.sh

@@ -0,0 +1,9 @@
+#!/bin/bash
+
+echo "PORTA indicata ${PORT}"
+
+cd /home/data/dashboard${V}
+. /home/runtime/bin/activate
+gunicorn -b 0.0.0.0:${PORT} dashboard6.wsgi
+#python manage.py runserver 0.0.0.0:${PORT}
+

+ 1 - 1
python/start

@@ -1,4 +1,4 @@
-from debian:latest
+from debian:stable
 run echo "Creazione immagine di base"
 run apt update && apt dist-upgrade -y
 run apt install nfs-common -y

+ 1 - 1
python/start.old

@@ -1,4 +1,4 @@
-from debian:bookworm
+from debian:oldstable
 run echo "Creazione immagine di base"
 run apt update && apt dist-upgrade -y
 run apt install nfs-common -y