From 166a27ddad2b326b49c1da5c4430fff012123b1e Mon Sep 17 00:00:00 2001
From: "nabil.abdennad" <nabil.abdennadher@hesge.ch>
Date: Sun, 22 Sep 2024 12:20:42 +0200
Subject: [PATCH] new args in generate-docker-compose

---
 Local-Without-Prediction/docker-compose.yml   |  8 ++---
 .../generate-docker-compose.py                | 30 ++++++++++++-------
 2 files changed, 23 insertions(+), 15 deletions(-)

diff --git a/Local-Without-Prediction/docker-compose.yml b/Local-Without-Prediction/docker-compose.yml
index e3eff02..95565c9 100644
--- a/Local-Without-Prediction/docker-compose.yml
+++ b/Local-Without-Prediction/docker-compose.yml
@@ -2,7 +2,7 @@ version: '3.8'
 services:
 
   node0:
-    image: local-comm
+    image: image-dfl-bad
     container_name: node0
     environment:
       - RANK=0
@@ -15,7 +15,7 @@ services:
 
 
   node1:
-    image: local-comm
+    image: image-dfl-bad
     container_name: node1
     environment:
       - RANK=1
@@ -28,7 +28,7 @@ services:
 
 
   node2:
-    image: local-comm
+    image: image-dfl-bad
     container_name: node2
     environment:
       - RANK=2
@@ -41,7 +41,7 @@ services:
 
 
   node3:
-    image: local-comm
+    image: image-dfl-bad
     container_name: node3
     environment:
       - RANK=3
diff --git a/Local-Without-Prediction/generate-docker-compose.py b/Local-Without-Prediction/generate-docker-compose.py
index 817bd16..a54ec4c 100644
--- a/Local-Without-Prediction/generate-docker-compose.py
+++ b/Local-Without-Prediction/generate-docker-compose.py
@@ -1,8 +1,9 @@
 import sys
+import argparse
 
-image = 'local-comm'
+#image = 'image-dfl-bad'
 
-def generate_docker_compose(num_nodes):
+def generate_docker_compose(image_name, num_nodes):
     docker_compose_template = """\
 version: '3.8'
 services:
@@ -17,7 +18,7 @@ services:
       - BASE_PORT=8000
       - IP_ADDRESS=node{i}
     volumes:
-      - ./neighbors/neighbors{file_suffix}.txt:/app/neighbors.txt
+      - ./neighbors/neighbors{i}.txt:/app/neighbors.txt
     networks:
       - my_network
 
@@ -31,9 +32,8 @@ networks:
 
 
     docker_compose_content = docker_compose_template
-    for i in range(0, num_nodes):
-        file_suffix = i
-        docker_compose_content += service_template.format(i=i, file_suffix=file_suffix,img=image)
+    for i in range(0, int(num_nodes)):
+        docker_compose_content += service_template.format(i=i,img=image_name)
 
     docker_compose_content += network_section
 
@@ -41,9 +41,17 @@ networks:
         file.write(docker_compose_content)
 
 if __name__ == "__main__":
-    if len(sys.argv) != 2:
-        print("Usage: python generate_docker_compose.py <num_nodes>")
-        sys.exit(1)
 
-    num_nodes = int(sys.argv[1])
-    generate_docker_compose(num_nodes)
+    parser = argparse.ArgumentParser(description="Upload PDF files to an S3 bucket")
+    parser.add_argument("--image_name", help="The name of the image")
+    parser.add_argument("--nb_nodes", help="The number of nodes")
+    args = parser.parse_args()
+    # image_name= args.image_name
+    # if len(sys.argv) != 2:
+    #     print("Usage: python generate_docker_compose.py <num_nodes>")
+    #     sys.exit(1)
+
+    # num_nodes = int(sys.argv[1])
+    generate_docker_compose(args.image_name, args.nb_nodes)
+
+    
-- 
GitLab