FIX check connection sql in local

Author: vectornguyen76

.env.api.local

@@ -12,8 +12,12 @@ API_HOST=0.0.0.0
 API_PORT=5000
 
 # Database service configuration
+DATABASE=postgres
 BBDD_HOST=db_service
 BBDD_PORT=5432
-DATABASE=postgres
+POSTGRES_DB=db_dev
+POSTGRES_USER=db_user
+PGPASSWORD=db_password
+
 DATABASE_TEST_URL=postgresql+psycopg2://db_user:db_password@db_service:5432/db_test
 DATABASE_URL=postgresql+psycopg2://db_user:db_password@db_service:5432/db_dev

Dockerfile

@@ -1,10 +1,10 @@
 FROM python:3.9-slim
 
-# Install nmap
-RUN apt-get update && apt-get install -y nmap
-
 WORKDIR /app
 
+# Update the package lists and install the PostgreSQL client
+RUN apt-get update && apt-get install -y postgresql-client
+
 COPY requirements.txt /app
 
 RUN pip install --upgrade pip

README.md

@@ -217,27 +217,31 @@ Containerized services separately with PostgreSQL databases (db), API (api) and
 1. Create **.env.api.local**, **.env.db.local** and **.env.cron.local** files and enter environment variables for
     each service. In the local environment there are 4 services (api, db, nginx, cron). For example:
     1. **.env.api.local**:
-       ```shell
-       # APP configuration
-       APP_NAME=[Name APP] # For example Flask API Rest Template
-       APP_ENV=local
-      
-       # Flask configuration
-       API_ENTRYPOINT=app:app
-       APP_SETTINGS_MODULE=config.LocalConfig
-       APP_TEST_SETTINGS_MODULE=config.TestingConfig
-      
-       # API service configuration
-       API_HOST=<api_host> # For example 0.0.0.0
-       API_PORT=<port_api> # For example 5000
-      
-       # Database service configuration
-       DB_HOST=<name_container_bbdd> # For example db (name service in docker-compose)
-       DB_PORT=<port_container_bbdd> # For example 5432 (port service in docker-compose)
-       DATABASE=postgres
-       DATABASE_TEST_URL=<url database test> # For example postgresql+psycopg2://db_user:db_password@db:5432/db_test
-       DATABASE_URL=<url database> # For example postgresql+psycopg2://db_user:db_password@db:5432/db_dev
-       ```
+        ```shell
+        # APP configuration
+        APP_NAME=[Name APP] # For example Flask API Rest Template
+        APP_ENV=local
+        
+        # Flask configuration
+        API_ENTRYPOINT=app:app
+        APP_SETTINGS_MODULE=config.LocalConfig
+        APP_TEST_SETTINGS_MODULE=config.TestingConfig
+        
+        # API service configuration
+        API_HOST=<api_host> # For example 0.0.0.0
+        API_PORT=<port_api> # For example 5000
+        
+        # Database service configuration
+        DATABASE=postgres
+        DB_HOST=<name_container_bbdd> # For example db_service (name service in docker-compose)
+        DB_PORT=<port_container_bbdd> # For example 5432 (port service in docker-compose)
+        POSTGRES_DB=<name_database> # For example db_dev 
+        POSTGRES_USER=<name_user> # For example db_user 
+        PGPASSWORD=<password_user> # For example db_password 
+
+        DATABASE_TEST_URL=<url database test> # For example postgresql+psycopg2://db_user:db_password@db_service:5432/db_test
+        DATABASE_URL=<url database> # For example postgresql+psycopg2://db_user:db_password@db_service:5432/db_dev
+        ```
     2. **.env.db.local**:
        ```shell
        POSTGRES_USER=<name_user> # For example db_user

entrypoint.sh

@@ -1,19 +1,17 @@
 #!/bin/sh
 
-if [[ -z "${APP_ENV}" ]]; then
-    echo "Add environment variable in production"
-
-    source .env.pro;
-fi
+echo "Start run entrypoint script..."
 
 echo "Database:" $DATABASE
 
 if [ "$DATABASE" = "postgres" ]
 then
     echo "Waiting for postgres..."
 
-    while ! nmap -p $BBDD_PORT --open -oG - $BBDD_HOST ; do
-        sleep 0.1
+    while ! psql -h $BBDD_HOST -U $POSTGRES_USER -d $POSTGRES_DB
+    do
+        echo "Waiting for PostgreSQL..."
+        sleep 0.5
     done
 
     echo "PostgreSQL started"

services/cron/Dockerfile

@@ -7,11 +7,11 @@ RUN apk update \
     && apk upgrade \
     && apk add --no-cache postgresql-client
 
-# Copy entry.sh
-COPY entry.sh /app
+# Copy entrypoint.sh
+COPY entrypoint.sh /app
 
-# Chmod to entry.sh
-RUN chmod +x ./entry.sh
+# Chmod to entrypoint.sh
+RUN chmod +x ./entrypoint.sh
 
-# Run entry.sh
-ENTRYPOINT ["/app/entry.sh"]
+# Run entrypoint.sh
+ENTRYPOINT [ "/app/entrypoint.sh" ]

services/cron/entry.sh services/cron/entrypoint.shservices/cron/entry.sh renamed to services/cron/entrypoint.sh

@@ -15,7 +15,7 @@ then
     echo "Waiting for postgres..."
 
     while ! nc -z $BBDD_HOST $BBDD_PORT; do
-      sleep 0.1
+      sleep 0.5
     done
 
     echo "PostgreSQL started"