From d15fa9a57dea6efab0f1e5a14735dd350bf862f8 Mon Sep 17 00:00:00 2001 From: Cyril Rouillon Date: Tue, 26 Nov 2024 15:13:34 +0100 Subject: [PATCH] cor docker Dev/Prod --- .gitignore | 2 +- AuctionServices/Scraper/Scraper.js | 2 +- README.md | 1 + agent/config.js | 15 ++++++++++++ config-dev.js | 12 --------- config.js | 4 ++- docker-compose-dev.yml | 2 -- docker-compose.yml | 39 +++++++++++++++--------------- scrapper/config.js | 15 ++++++++++++ scrapper/services/jucundus.js | 23 +++++++++--------- 10 files changed, 67 insertions(+), 48 deletions(-) mode change 100755 => 100644 agent/config.js delete mode 100644 config-dev.js mode change 100755 => 100644 scrapper/config.js diff --git a/.gitignore b/.gitignore index 5beeaec..a9aa86c 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,4 @@ agent/node_modules -scrapper/node_modules \ No newline at end of file +scrapper/node_modules diff --git a/AuctionServices/Scraper/Scraper.js b/AuctionServices/Scraper/Scraper.js index d390f65..975882c 100644 --- a/AuctionServices/Scraper/Scraper.js +++ b/AuctionServices/Scraper/Scraper.js @@ -169,7 +169,7 @@ class Scraper { async getNewToken(email, password) { - try { + try { const response = await fetch(this._JucundusUrl+'/authenticate', { method: 'POST', headers: { diff --git a/README.md b/README.md index 46ffc73..e166681 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,7 @@ Dev : ```bash docker-compose -f docker-compose-dev.yml build +docker-compose -f docker-compose-dev.yml up docker-compose -f docker-compose-dev.yml up --scale agent=3 ``` diff --git a/agent/config.js b/agent/config.js old mode 100755 new mode 100644 index e69de29..6bb3b26 --- a/agent/config.js +++ b/agent/config.js @@ -0,0 +1,15 @@ +// Config Dev +console.log('## CONFIG DEV ##'); + +const config = { + jucundus: { + url: 'http://host.docker.internal:3000', + useremail: 'agent@agent.com' + }, + agent: { + urlApi: 'http://agent/internApi', + maxCloseWebsockets: 5, + } +}; + +module.exports = { config }; \ No newline at end of file diff --git a/config-dev.js b/config-dev.js deleted file mode 100644 index c16cec0..0000000 --- a/config-dev.js +++ /dev/null @@ -1,12 +0,0 @@ -const config = { - jucundus: { - url: 'http://host.docker.internal:3000', - useremail: 'agent@agent.com' - }, - agent: { - urlApi: 'http://agent/internApi', - maxCloseWebsockets: 5, - } -}; - -module.exports = { config }; \ No newline at end of file diff --git a/config.js b/config.js index ad36c3c..726f381 100644 --- a/config.js +++ b/config.js @@ -1,6 +1,8 @@ +// Config Prod + const config = { jucundus: { - url: 'http://jucundus-api.saucisse.ninja', + url: 'https://jucundus-api.saucisse.ninja', useremail: 'agent@agent.com' }, agent: { diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index e382329..cdc5b35 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -8,7 +8,6 @@ services: volumes: - ./agent:/agent - ./.Key.js:/agent/.Key.js - - ./config-dev.js:/agent/config.js - ./AuctionServices:/agent/AuctionServices networks: - internal @@ -24,7 +23,6 @@ services: volumes: - ./scrapper:/scrapper - ./.Key.js:/scrapper/.Key.js - - ./config-dev.js:/scrapper/config.js - ./AuctionServices:/scrapper/AuctionServices networks: - internal diff --git a/docker-compose.yml b/docker-compose.yml index 0d5a76c..b356abb 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,32 +6,31 @@ services: context: ./agent dockerfile: Dockerfile volumes: - - ./agent:/agent - ./.Key.js:/agent/.Key.js - ./config.js:/agent/config.js - ./AuctionServices:/agent/AuctionServices networks: - internal - # scrapper: - # build: - # context: ./scrapper - # dockerfile: Dockerfile - # ports: - # - 3020 - # volumes: - # - ./scrapper:/scrapper - # - ./.Key.js:/scrapper/.Key.js - # - ./config.js:/scrapper/config.js - # - ./AuctionServices:/scrapper/AuctionServices - # networks: - # - internal - # labels: - # - "traefik.enable=true" - # - "traefik.http.routers.backend.rule=Host(`jucundus-agent1.saucisse.ninja`)" - # - "traefik.http.routers.backend.entrypoints=websecure" - # - "traefik.http.routers.backend.tls=true" - # - "traefik.http.routers.backend.tls.certresolver=myresolver" + scrapper: + build: + context: ./scrapper + dockerfile: Dockerfile + ports: + - "3020" + volumes: + - ./.Key.js:/scrapper/.Key.js + - ./config.js:/scrapper/config.js + - ./AuctionServices:/scrapper/AuctionServices + networks: + - internal + labels: + - "traefik.enable=true" + - "traefik.http.routers.jucundus-agent1.rule=Host(`jucundus-agent1.saucisse.ninja`)" + - "traefik.http.routers.jucundus-agent1.entrypoints=websecure" + - "traefik.http.routers.jucundus-agent1.tls=true" + - "traefik.http.routers.jucundus-agent1.tls.certresolver=myresolver" + - "traefik.http.services.jucundus-agent1.loadbalancer.server.port=3020" networks: internal: diff --git a/scrapper/config.js b/scrapper/config.js old mode 100755 new mode 100644 index e69de29..6bb3b26 --- a/scrapper/config.js +++ b/scrapper/config.js @@ -0,0 +1,15 @@ +// Config Dev +console.log('## CONFIG DEV ##'); + +const config = { + jucundus: { + url: 'http://host.docker.internal:3000', + useremail: 'agent@agent.com' + }, + agent: { + urlApi: 'http://agent/internApi', + maxCloseWebsockets: 5, + } +}; + +module.exports = { config }; \ No newline at end of file diff --git a/scrapper/services/jucundus.js b/scrapper/services/jucundus.js index 21786a9..86bc981 100644 --- a/scrapper/services/jucundus.js +++ b/scrapper/services/jucundus.js @@ -1,20 +1,21 @@ const fetch = require('node-fetch'); +const { config } = require("../config.js"); class Jucundus { constructor() { - this.url = 'http://localhost:3000/api'; + this.url = config.jucundus+'/api'; } - setSaleStatus(status) { - fetch(ApiURL+'/sale/setSaleStatus/'+status) - .then(response => response.json()) - .then(data => { - res.json(data); - }) - .catch(error => { - console.error(error); - }); - } + // setSaleStatus(status) { + // fetch(ApiURL+'/sale/setSaleStatus/'+status) + // .then(response => response.json()) + // .then(data => { + // res.json(data); + // }) + // .catch(error => { + // console.error(error); + // }); + // } } module.exports = Jucundus \ No newline at end of file