about summary refs log tree commit diff
diff options
context:
space:
mode:
authorBaitinq <you@example.com>2022-03-19 19:41:36 +0000
committerBaitinq <you@example.com>2022-03-19 19:41:36 +0000
commit44c250cc9d7450f1e36eee91c2ad92c34ca73bd5 (patch)
tree1bc0d121fbe9653f1c431f3a638ddf42f05a9bf3
parentPass the env file to all services (diff)
downloadBluetooth_Dosimeter-44c250cc9d7450f1e36eee91c2ad92c34ca73bd5.tar.gz
Bluetooth_Dosimeter-44c250cc9d7450f1e36eee91c2ad92c34ca73bd5.tar.bz2
Bluetooth_Dosimeter-44c250cc9d7450f1e36eee91c2ad92c34ca73bd5.zip
Docker: Added network for services to share
m---------Bluetooth_Dosimeter_AP0
m---------Bluetooth_Dosimeter_Backend0
m---------Bluetooth_Dosimeter_Frontend0
-rw-r--r--docker-compose.yml19
4 files changed, 12 insertions, 7 deletions
diff --git a/Bluetooth_Dosimeter_AP b/Bluetooth_Dosimeter_AP
-Subproject bfc5454b4e157c63179f6da408161a36232fc25
+Subproject 3d576b9e4409e716d79238764de6ecf4271458e
diff --git a/Bluetooth_Dosimeter_Backend b/Bluetooth_Dosimeter_Backend
-Subproject 73635596114503dfdbafa1a6978d78b288d560b
+Subproject 3b56ab89fc55f5816067d66ef4ce58f39d24720
diff --git a/Bluetooth_Dosimeter_Frontend b/Bluetooth_Dosimeter_Frontend
-Subproject acf63c3e8addd2f32d5cc184f4bbf5b246f3ecc
+Subproject 8b204172158b7c068d5d0822abb8faef0c03e10
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: