Updared docker file

Author: codermehraj

docker-compose.yml

@@ -1,5 +1,14 @@
 version: '3'
 services:
+  postgres:
+    image: postgres
+    ports:
+      - "5432:5432"
+    environment:
+      POSTGRES_USER: postgres
+      POSTGRES_PASSWORD: postgres
+      POSTGRES_DB: ecosync
+  
   frontend:
     build:
       context: ./client
@@ -23,11 +32,3 @@ services:
     env_file:
       - .env
 
-  postgres:
-    image: postgres
-    ports:
-      - "5432:5432"
-    environment:
-      POSTGRES_USER: postgres
-      POSTGRES_PASSWORD: postgres
-      POSTGRES_DB: ecosync

server/Dockerfile

@@ -5,10 +5,11 @@ WORKDIR /usr/src/app
 
 COPY package*.json ./
 
-RUN npm install
+RUN apt-get update && apt-get install -y postgresql-client
 
 COPY . .
 
 EXPOSE 8585
 
-CMD ["npx", "nodemon"]
+CMD ["sh", "-c", "until pg_isready -h postgres -p 5432; do sleep 1; done && npm i && npm run dev"]
+# CMD ["npx", "nodemon"]

server/wait-for.sh

@@ -0,0 +1,16 @@
+#!/bin/bash
+
+set -e
+
+host="$1"
+shift
+cmd="$@"
+
+# Wait for PostgreSQL to be ready
+until PGPASSWORD=$POSTGRES_PASSWORD psql -h "$host" -U postgres -d ecosync -c '\q'; do
+  >&2 echo "PostgreSQL is unavailable - sleeping"
+  sleep 1
+done
+
+>&2 echo "PostgreSQL is up - executing command"
+exec $cmd