From 8f11c56d1a785c970f02fd15fd368c7f629aef34 Mon Sep 17 00:00:00 2001 From: Lukian Date: Sat, 28 Dec 2024 16:58:59 +0100 Subject: [PATCH] modified docker structure --- {company => client/company}/Dockerfile | 0 {company => client/company}/main.py | 8 ++--- client/docker-compose.yml | 33 +++++++++++++++++++ .../shareholder}/Dockerfile | 0 {shareholder => client/shareholder}/main.py | 0 5 files changed, 37 insertions(+), 4 deletions(-) rename {company => client/company}/Dockerfile (100%) rename {company => client/company}/main.py (86%) create mode 100644 client/docker-compose.yml rename {shareholder => client/shareholder}/Dockerfile (100%) rename {shareholder => client/shareholder}/main.py (100%) diff --git a/company/Dockerfile b/client/company/Dockerfile similarity index 100% rename from company/Dockerfile rename to client/company/Dockerfile diff --git a/company/main.py b/client/company/main.py similarity index 86% rename from company/main.py rename to client/company/main.py index 41ef3f8..2ca432d 100644 --- a/company/main.py +++ b/client/company/main.py @@ -6,7 +6,7 @@ HOST = "http://localhost:3000/" input : - idComp : Identifiant de l'entreprise """ -def showShares(idComp): +def getShares(idComp): url = HOST + 'api/companies/'+idComp+'/shares' r = requests.get(url) return r.json() @@ -16,7 +16,7 @@ def showShares(idComp): - idComp : identifiant de l'entreprise - price : prix de l'action sur le marché """ -def newShare(idComp, price): +def emmitShare(idComp, price): url = HOST + 'api/shares/emmit' obj={'id':idComp,'price':price} r = requests.post(url, json=obj) @@ -26,13 +26,13 @@ def newShare(idComp, price): input : - idComp : identifiant de l'entreprise """ -def showInfoComp(idComp): +def getCompany(idComp): url = HOST + 'api/companies/'+idComp r=requests.get(url) return r.json() """Affichage les enteprises """ -def showComp(): +def getCompanies(): url = HOST + 'api/companies/' r=requests.get(url) return r.json() diff --git a/client/docker-compose.yml b/client/docker-compose.yml new file mode 100644 index 0000000..241f9a7 --- /dev/null +++ b/client/docker-compose.yml @@ -0,0 +1,33 @@ +services: + companies: + build: ./company + container_name: companies + restart: always + networks: + - bourse + + shareholder1: + build: ./shareholder + container_name: shareholder1 + restart: always + networks: + - bourse + + shareholder2: + build: ./shareholder + container_name: shareholder2 + restart: always + networks: + - bourse + + shareholder3: + build: ./shareholder + container_name: shareholder3 + restart: always + networks: + - bourse + +networks: + bourse: + driver: bridge + diff --git a/shareholder/Dockerfile b/client/shareholder/Dockerfile similarity index 100% rename from shareholder/Dockerfile rename to client/shareholder/Dockerfile diff --git a/shareholder/main.py b/client/shareholder/main.py similarity index 100% rename from shareholder/main.py rename to client/shareholder/main.py