V0.6.1 Arroyo Toad

.devcontainer/DOCKERFILES/deno.dockerfile

@@ -4,4 +4,5 @@ apt install \
 git \
 sqlite3 \
 npm \
+iputils-ping \
 -y 

.environment/.postgres.env.example

@@ -0,0 +1,3 @@
+POSTGRES_PASSWORD=abcdefg1234
+POSTGRES_USER=Admin
+POSTGRES_DB=SAPD

.gitignore

@@ -5,7 +5,8 @@
 .LSOverride
 
 # Icon must end with two \r
-Icon
+Icon
+
 
 # Thumbnails
 ._*
@@ -134,6 +135,9 @@ web_modules/
 .env.production.local
 .env.local
 
+# Custom dotenv
+*.env
+
 # parcel-bundler cache (https://parceljs.org/)
 .cache
 .parcel-cache

.gitmodules

@@ -1,6 +1,3 @@
-[submodule "IoT-Simulator"]
-	path = IoT-Simulator
-	url = https://repositories.communitynotfound.work/PoliBa-Software-Architecture/IoT-Simulator.git
 [submodule "Leader-Service"]
 	path = Leader-Service
 	url = https://repositories.communitynotfound.work/PoliBa-Software-Architecture/Leader-Service.git
@@ -10,3 +7,7 @@
 [submodule "PublicKey-Backend"]
 	path = PublicKey-Backend
 	url = https://repositories.communitynotfound.work/PoliBa-Software-Architecture/PublicKey-Backend.git
+
+[submodule "IoT-Simulator"]
+	path = IoT-Simulator
+	url = https://repositories.communitynotfound.work/PoliBa-Software-Architecture/IoT-Simulator.git

Leader-Service

@@ -1 +1 @@
-Subproject commit d44865db427d26b9af8702238e649b93bea7a841
+Subproject commit c47eea3826821ac34eafe9cfa58df6edef0d5c4d

docker-compose.yaml

@@ -11,18 +11,20 @@ services:
     command: sleep infinity
 
   leader-service:
-    build: 
+    env_file:
+        - .environment/.leader.env
+    build:
       context: .
       dockerfile: .devcontainer/DOCKERFILES/deno.dockerfile
     volumes:
       - .:/workspace
-    hostname: leader-service.internal
+    hostname: iot-data-backend.internal
     networks:
       iot-network:
     command: sleep infinity
 
   publickey-backend:
-    build: 
+    build:
       context: .
       dockerfile: .devcontainer/DOCKERFILES/deno.dockerfile
     volumes:
@@ -31,7 +33,28 @@ services:
     networks:
       iot-network:
     command: sleep infinity
-    
+
+  postgres-data-backend:
+    image: postgres
+    env_file:
+      - .environment/.postgres.env
+    volumes:
+      - pg-data:/var/lib/postgresql/data
+    hostname: iot-data-db.internal
+    networks:
+      iot-network:
+
+  pg-admin:
+    image: dpage/pgadmin4
+    env_file:
+      - .environment/.pgadmin.env
+    networks:
+      iot-network:
+    ports:
+      - 8080:80
+
+volumes:
+  pg-data:
 
 networks:
   iot-network:
@@ -39,8 +62,3 @@ networks:
       config:
         - subnet: 10.0.0.0/8
           ip_range: 10.0.0.0/16
-
-
-
-
-