Răsfoiți Sursa

rivista e corretta la pacchettizzazione docker dei servizi. Ci sono due versioni di python, in quanto la nuova .13 non supporta piu' la libreria crypt

mauro 1 lună în urmă
părinte
comite
899f692860
6 a modificat fișierele cu 27 adăugiri și 26 ștergeri
  1. 16 18
      docker-compose.yml
  2. 1 1
      mosquitto.d4/mosquitto.d4
  3. 6 4
      python/django.bpc
  4. 1 1
      python/django4
  5. 1 1
      python/django5
  6. 2 1
      python/start

+ 16 - 18
docker-compose.yml

@@ -5,6 +5,12 @@ services:
       context: python
       dockerfile: start
 
+  start.old:
+    image: start.old
+    build:
+      context: python
+      dockerfile: start.old
+
   python:
     image: python
     build:
@@ -13,6 +19,14 @@ services:
     depends_on:
       - start 
 
+  python.old:
+    image: python.old
+    build:
+      context: python
+      dockerfile: python.old
+    depends_on:
+      - start.old
+
   # dashboard4
   django4:
     image: django4
@@ -20,7 +34,7 @@ services:
       context: python
       dockerfile: django4
     depends_on:
-      - python
+      - python.old
     ports: 
       - 8100:8100
     volumes:
@@ -54,7 +68,7 @@ services:
       context: python
       dockerfile: django5
     depends_on:
-      - python
+      - python.old
     ports: 
       - 8110:8110
     volumes:
@@ -99,22 +113,6 @@ 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:
-      context: nginx.bpc
-      dockerfile: nginx.bpc
-    ports:
-      - 8125:80
-    volumes:
-      - /home/data/bpconverter.nginx:/etc/nginx
-      - /home/data/bpconverter:/home/bpconverter
-    entrypoint: ['/bin/bash','/root/run.sh']
-    restart: unless-stopped
-    depends_on:
-      - start 
-
   # gestione documentale
   gd:
     image: django.gd

+ 1 - 1
mosquitto.d4/mosquitto.d4

@@ -1,4 +1,4 @@
-from python as mosquitto.d4
+from python.old as mosquitto.d4
 run . ./home/runtime/bin/activate && pip install django==4.2.8
 run ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime
 copy run.sh /root/run.sh

+ 6 - 4
python/django.bpc

@@ -1,5 +1,7 @@
-from python as django5
-run . ./home/runtime/bin/activate && pip install django && pip install pypdf2
-run ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime
-copy run.bpc.sh /root/run.sh
+FROM python
+RUN . ./home/runtime/bin/activate && pip install django && pip install pypdf2
+RUN ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime
+COPY run.bpc.sh /root/run.sh
+RUN git clone https://gogs.966.it/python/bpc.git /home/bpconverter
+ENTRYPOINT ['/bin/bash','/root/run.sh']
 

+ 1 - 1
python/django4

@@ -1,3 +1,3 @@
-from python as django4
+from python.old as django4
 run . ./home/runtime/bin/activate && pip install django==4.2.8
 run ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime

+ 1 - 1
python/django5

@@ -1,4 +1,4 @@
-from python as django5
+from python.old as django5
 run . ./home/runtime/bin/activate && pip install django
 run ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime
 

+ 2 - 1
python/start

@@ -1,5 +1,6 @@
-from debian:stable as start
+from debian:latest
 run echo "Creazione immagine di base"
 run apt update && apt dist-upgrade -y
 run apt install nfs-common -y
+run apt install git -y
 run ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime