浏览代码

ultime modifiche - il servizio funziona, c'e' solo qualche cosa da sistemare per riconoscere l'ip di partenza

mauro 1 月之前
父节点
当前提交
e003671363
共有 9 个文件被更改,包括 26 次插入54 次删除
  1. 3 17
      docker-compose.yml
  2. 0 5
      nginx.bpc/loop.sh
  3. 0 7
      nginx.bpc/nginx.bpc
  4. 0 5
      nginx.bpc/run.sh
  5. 6 0
      python/Dockerfile
  6. 6 4
      python/django.bpc
  7. 6 2
      python/run.bpc.sh
  8. 0 9
      python/run.gd.sh
  9. 5 5
      python/start

+ 3 - 17
docker-compose.yml

@@ -22,27 +22,13 @@ services:
     depends_on:
       - python
     ports: 
-      - 8220:8220
+      - 18220:8220
     volumes:
       - /home/data/bpconverter:/home/bpconverter
     environment:
-      - PORT=8220
+      - ENDPOINT=8220
       - V=5
     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:
-      - 8225: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 
+

+ 0 - 5
nginx.bpc/loop.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-#
-echo "Running ...."
-touch /tmp/nulfile.txt
-tail -f /tmp/nulfile.txt

+ 0 - 7
nginx.bpc/nginx.bpc

@@ -1,7 +0,0 @@
-from start as nginx.d4
-run apt install nginx-full -y
-run ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime
-copy run.sh /root/run.sh
-copy loop.sh /root/loop.sh
-run chmod a+x /root/run.sh
-run chmod a+x /root/loop.sh

+ 0 - 5
nginx.bpc/run.sh

@@ -1,5 +0,0 @@
-#!/bin/bash
-#
-/etc/init.d/nginx start
-touch /tmp/nginx.txt
-tail -f /tmp/nginx.txt

+ 6 - 0
python/Dockerfile

@@ -0,0 +1,6 @@
+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
+

+ 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']
 

+ 6 - 2
python/run.bpc.sh

@@ -1,9 +1,13 @@
 #!/bin/bash
 
-echo "PORTA indicata ${PORT}"
+ENDPOINT=$1
+
+echo "PORTA indicata ${ENDPOINT}"
+ls -al /home
+ls -al /home/bpconverter
 
 cd /home/bpconverter
 . /home/runtime/bin/activate
 
-python manage.py runserver 0.0.0.0:${PORT}
+python manage.py runserver 0.0.0.0:${ENDPOINT}
 

+ 0 - 9
python/run.gd.sh

@@ -1,9 +0,0 @@
-#!/bin/bash
-
-echo "PORTA indicata ${PORT}"
-
-cd /home/gd
-. /home/runtime/bin/activate
-
-python manage.py runserver 0.0.0.0:${PORT}
-

+ 5 - 5
python/start

@@ -1,5 +1,5 @@
-from debian:stable as start
-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 debian:latest
+RUN echo "Creazione immagine di base"
+RUN apt update && apt dist-upgrade -y
+RUN apt install git -y
+RUN ln -sf /usr/share/zoneinfo/Europe/Rome /etc/localtime