From 44c250cc9d7450f1e36eee91c2ad92c34ca73bd5 Mon Sep 17 00:00:00 2001 From: Baitinq Date: Sat, 19 Mar 2022 19:41:36 +0000 Subject: Docker: Added network for services to share --- Bluetooth_Dosimeter_AP | 2 +- Bluetooth_Dosimeter_Backend | 2 +- Bluetooth_Dosimeter_Frontend | 2 +- docker-compose.yml | 19 ++++++++++++------- 4 files changed, 15 insertions(+), 10 deletions(-) diff --git a/Bluetooth_Dosimeter_AP b/Bluetooth_Dosimeter_AP index bfc5454b4..3d576b9e4 160000 --- a/Bluetooth_Dosimeter_AP +++ b/Bluetooth_Dosimeter_AP @@ -1 +1 @@ -Subproject commit bfc5454b4e157c63179f6da408161a36232fc250 +Subproject commit 3d576b9e4409e716d79238764de6ecf4271458ee diff --git a/Bluetooth_Dosimeter_Backend b/Bluetooth_Dosimeter_Backend index 736355961..3b56ab89f 160000 --- a/Bluetooth_Dosimeter_Backend +++ b/Bluetooth_Dosimeter_Backend @@ -1 +1 @@ -Subproject commit 73635596114503dfdbafa1a6978d78b288d560b8 +Subproject commit 3b56ab89fc55f5816067d66ef4ce58f39d247207 diff --git a/Bluetooth_Dosimeter_Frontend b/Bluetooth_Dosimeter_Frontend index acf63c3e8..8b2041721 160000 --- a/Bluetooth_Dosimeter_Frontend +++ b/Bluetooth_Dosimeter_Frontend @@ -1 +1 @@ -Subproject commit acf63c3e8addd2f32d5cc184f4bbf5b246f3eccf +Subproject commit 8b204172158b7c068d5d0822abb8faef0c03e10d diff --git a/docker-compose.yml b/docker-compose.yml index 83c738586..123813eab 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,22 +1,27 @@ version: '3.3' services: - bluetooth_dosimeter_backend: - env_file: - - ".env" - extends: - file: Bluetooth_Dosimeter_Backend/docker-compose.yml - service: _bluetooth_dosimeter_backend bluetooth_dosimeter_ap: env_file: - ".env" extends: file: Bluetooth_Dosimeter_AP/docker-compose.yml service: _bluetooth_dosimeter_ap + bluetooth_dosimeter_backend: + env_file: + - ".env" + networks: + - dockernet + extends: + file: Bluetooth_Dosimeter_Backend/docker-compose.yml + service: _bluetooth_dosimeter_backend bluetooth_dosimeter_frontend: env_file: - ".env" + networks: + - dockernet extends: file: Bluetooth_Dosimeter_Frontend/docker-compose.yml service: _bluetooth_dosimeter_frontend -#add another service for nginx redirects? +networks: + dockernet: -- cgit 1.4.1