tum пре 2 година
родитељ
комит
db8b27325b
2 измењених фајлова са 28 додато и 28 уклоњено
  1. 4 4
      app/network_report/settings.py
  2. 24 24
      docker-compose.prod.yml

+ 4 - 4
app/network_report/settings.py

195
 
195
 
196
 
196
 
197
 CELERY_BEAT_SCHEDULE = {
197
 CELERY_BEAT_SCHEDULE = {
198
-    # "dumpapi": {
199
-        # "task": "backend.views.dump_api_task",
198
+    "dumpapi": {
199
+        "task": "backend.views.dump_api_task",
200
         #"schedule": crontab(minute="*/1"),
200
         #"schedule": crontab(minute="*/1"),
201
         # "schedule": crontab(minute="*/30"),
201
         # "schedule": crontab(minute="*/30"),
202
         # "schedule": crontab(hour="17", minute="15"),
202
         # "schedule": crontab(hour="17", minute="15"),
203
-        # "schedule": crontab(hour="*/1"),
204
-    # },
203
+        "schedule": crontab(hour="*/3,17-21"),
204
+    },
205
 }
205
 }

+ 24 - 24
docker-compose.prod.yml

7
     ports:
7
     ports:
8
       - "127.0.0.1:6379:6379"
8
       - "127.0.0.1:6379:6379"
9
   db:
9
   db:
10
-    image: postgres
10
+    image: postgres:15.5-alpine3.19
11
     volumes:
11
     volumes:
12
       - ./data/db:/var/lib/postgresql/data
12
       - ./data/db:/var/lib/postgresql/data
13
     ports:
13
     ports:
42
   worker:
42
   worker:
43
     restart: unless-stopped
43
     restart: unless-stopped
44
     #build: .
44
     #build: .
45
-    image: tum/web-image
45
+    image: tum/network-report-image
46
     #command: python -X dev manage.py  runserver 0.0.0.0:8000
46
     #command: python -X dev manage.py  runserver 0.0.0.0:8000
47
     entrypoint: ./worker-entrypoint.sh
47
     entrypoint: ./worker-entrypoint.sh
48
     volumes:
48
     volumes:
53
       - POSTGRES_USER=postgres
53
       - POSTGRES_USER=postgres
54
       - POSTGRES_PASSWORD=postgres
54
       - POSTGRES_PASSWORD=postgres
55
       - PYTHONMALLOC=debug
55
       - PYTHONMALLOC=debug
56
-      - DJANGO_SETTINGS_MODULE=kacee.settings
56
+      - DJANGO_SETTINGS_MODULE=network_report.settings
57
       - MODE=${MODE}
57
       - MODE=${MODE}
58
     depends_on:
58
     depends_on:
59
       - web
59
       - web
60
-  websocket:
61
-    #build: .
62
-    image: tum/network-report-image
63
-    command: nodemon authentication.py
64
-    volumes:
65
-      - ./app:/code
66
-    ports:
67
-      - "127.0.0.1:8888:8888"
68
-    environment:
69
-      - POSTGRES_NAME=postgres
70
-      - POSTGRES_USER=postgres
71
-      - POSTGRES_PASSWORD=postgres
72
-      - PYTHONMALLOC=debug
73
-      - DJANGO_SETTINGS_MODULE=kacee.settings
74
-      - MODE=${MODE}
75
-    depends_on:
76
-      - db
77
-      - redis
60
+  #websocket:
61
+    ##build: .
62
+    #image: tum/network-report-image
63
+    #command: nodemon authentication.py
64
+    #volumes:
65
+      #- ./app:/code
66
+    #ports:
67
+      #- "127.0.0.1:8888:8888"
68
+    #environment:
69
+      #- POSTGRES_NAME=postgres
70
+      #- POSTGRES_USER=postgres
71
+      #- POSTGRES_PASSWORD=postgres
72
+      #- PYTHONMALLOC=debug
73
+      #- DJANGO_SETTINGS_MODULE=kacee.settings
74
+      #- MODE=${MODE}
75
+    #depends_on:
76
+      #- db
77
+      #- redis
78
   rabbitmq:
78
   rabbitmq:
79
     image: rabbitmq:3-management-alpine
79
     image: rabbitmq:3-management-alpine
80
-    container_name: 'rabbitmq'
80
+    container_name: 'rabbitmq3'
81
     ports:
81
     ports:
82
-      - "127.0.0.1:5672:5672"
83
-      - "127.0.0.1:15672:15672"
82
+      - "5672:5672"
83
+      - "15672:15672"
84
     volumes:
84
     volumes:
85
         - ./rabbitmq/data/:/var/lib/rabbitmq/
85
         - ./rabbitmq/data/:/var/lib/rabbitmq/
86
         - ./rabbitmq/log/:/var/log/rabbitmq
86
         - ./rabbitmq/log/:/var/log/rabbitmq