From 8dead13cc2fd3fd719a8aa9d48ef282673d8a617 Mon Sep 17 00:00:00 2001
From: Artem Litvinov <ijaric@gmail.com>
Date: Sat, 23 Sep 2023 19:21:32 +0100
Subject: [PATCH] fix: docker files & minor fixes

---
 src/fastapi_app/Dockerfile                         | 6 ++++++
 src/fastapi_app/docker-compose.dev.yml             | 4 ++--
 src/fastapi_app/docker-compose.yml                 | 4 ++--
 src/fastapi_app/entrypoint.sh                      | 6 ++----
 src/fastapi_app/lib/app/split_settings/__init__.py | 2 +-
 src/fastapi_app/nginx/templates/api.conf.template  | 2 +-
 6 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/fastapi_app/Dockerfile b/src/fastapi_app/Dockerfile
index 468ce62..202c1a7 100644
--- a/src/fastapi_app/Dockerfile
+++ b/src/fastapi_app/Dockerfile
@@ -1,5 +1,11 @@
 FROM python:3.11
 
+RUN apt-get update \
+  && DEBIAN_FRONTEND=noninteractive \
+  && apt-get install -y net-tools netcat-traditional curl \
+  && apt-get clean \
+  && rm -rf /var/lib/apt/lists/*
+
 RUN mkdir --parents /opt/app
 COPY pyproject.toml /opt/app/pyproject.toml
 COPY poetry.lock /opt/app/poetry.lock
diff --git a/src/fastapi_app/docker-compose.dev.yml b/src/fastapi_app/docker-compose.dev.yml
index 82b5a73..4305528 100644
--- a/src/fastapi_app/docker-compose.dev.yml
+++ b/src/fastapi_app/docker-compose.dev.yml
@@ -1,7 +1,7 @@
 version: "3"
 
 services:
-  db:
+  postgres:
     image: postgres:15.2
     restart: always
     environment:
@@ -29,7 +29,7 @@ services:
     ports:
       - "${API_PORT}:${API_PORT}"
     depends_on:
-      - db
+      - postgres
     networks:
       - backend_network
       - api_network
diff --git a/src/fastapi_app/docker-compose.yml b/src/fastapi_app/docker-compose.yml
index acac81e..d46c390 100644
--- a/src/fastapi_app/docker-compose.yml
+++ b/src/fastapi_app/docker-compose.yml
@@ -1,7 +1,7 @@
 version: "3"
 
 services:
-  db:
+  postgres:
     image: postgres:15.2
     restart: always
     environment:
@@ -29,7 +29,7 @@ services:
     expose:
       - "${API_PORT}"
     depends_on:
-      - db
+      - postgres
     networks:
       - backend_network
       - api_network
diff --git a/src/fastapi_app/entrypoint.sh b/src/fastapi_app/entrypoint.sh
index 85adc64..fe288b7 100644
--- a/src/fastapi_app/entrypoint.sh
+++ b/src/fastapi_app/entrypoint.sh
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-while ! (echo > /dev/tcp/db/5432) >/dev/null 2>&1; do
-  sleep 1
-done
+while ! nc -z postgres 5432; do sleep 1; done;
 
-exec .venv/bin/python -m bin
+exec .venv/bin/python -m bin
\ No newline at end of file
diff --git a/src/fastapi_app/lib/app/split_settings/__init__.py b/src/fastapi_app/lib/app/split_settings/__init__.py
index 627e186..4d3b87b 100644
--- a/src/fastapi_app/lib/app/split_settings/__init__.py
+++ b/src/fastapi_app/lib/app/split_settings/__init__.py
@@ -6,7 +6,7 @@ from .project import *
 __all__ = [
     "ApiSettings",
     "LoggingSettings",
-    "get_logging_config",
     "PostgresSettings",
     "ProjectSettings",
+    "get_logging_config",
 ]
diff --git a/src/fastapi_app/nginx/templates/api.conf.template b/src/fastapi_app/nginx/templates/api.conf.template
index e89cfac..847d018 100644
--- a/src/fastapi_app/nginx/templates/api.conf.template
+++ b/src/fastapi_app/nginx/templates/api.conf.template
@@ -4,7 +4,7 @@ server {
     server_name  _;
 
     location /api {
-        proxy_pass http://api:${SERVER_PORT}/api;
+        proxy_pass http://api:${API_PORT}/api;
         proxy_set_header X-Request-Id $request_id;
     }