Cleanup and env file

docker-compose.yml

@@ -1,4 +1,3 @@
-version: '3'
 services:
   node:
     image: node:16.13.1
@@ -11,20 +10,32 @@ services:
     image: postgres:16.1
     ports:
       - "5432:5432"
+    healthcheck:
+      test: [ "CMD-SHELL", "pg_isready -d ${POSTGRES_DB} -U ${DATABASE_USER}" ]
+      interval: 5s
+      timeout: 5s
+      retries: 5
     environment:
-      POSTGRES_DB: weather-tool
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: mysecretpassword
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     volumes:
       - /var/lib/postgresql/data:/var/lib/postgresql/data
 
   scala:
+    environment:
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      METEO_USER: ${METEO_USER}
+      METEO_PASSWORD: ${METEO_PASSWORD}
+      METEO_URL: ${METEO_URL}
     build:
       context: .
       dockerfile: Dockerfile.local
     volumes:
       - $PWD:/app
     ports:
-      - "8080:8080"
+      - "9080:8080"
     depends_on:
       - postgres