Merge ab31b99 into fcdd5de

tjcsl · Apr 4, 2024 · 042091d · 042091d
2 parents fcdd5de + ab31b99
commit 042091d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/config/docker/docker-compose.yml b/config/docker/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.9'
 
 services:
   redis:
-    container_name: server
+    container_name: redis
     image: redis:latest
     networks:
       - intranet_net
@@ -23,9 +23,9 @@ services:
     volumes:
       - pgdata:/var/lib/postgresql/data
 
-  application:
+  intranet:
     container_name: intranet
-    image: application
+    image: intranet_image
     networks:
       - intranet_net
     entrypoint:
@@ -48,7 +48,7 @@ services:
 
   celery:
     container_name: celery
-    image: application
+    image: intranet_image
     networks:
       - intranet_net
     entrypoint:
@@ -59,13 +59,13 @@ services:
          celery --app intranet worker -l info --without-gossip --without-mingle --without-heartbeat -Ofair"
       ]
     depends_on:
-      - application
+      - intranet
     volumes:
       - ../../:/ion:z
 
   celerybeat:
     container_name: celerybeat
-    image: application
+    image: intranet_image
     networks:
       - intranet_net
     entrypoint:
@@ -76,7 +76,7 @@ services:
          celery --app intranet beat -l info"
       ]
     depends_on:
-      - application
+      - intranet
     volumes:
       - ../../:/ion:z
 

diff --git a/config/scripts/create_users.py b/config/scripts/create_users.py
@@ -89,7 +89,7 @@ def validate(username: str) -> str:
     return username
 
 
-def generate_names(args: argparse.Namespace) -> list[tuple[str]]:
+def generate_names(args: argparse.Namespace) -> "list[tuple[str]]":
     for i, name in enumerate(args.names):
         username = ""
         if not args.noyear and args.type != "teacher":