From e6f4f1a6d13c9761a1c9840714e1fff354de8fc6 Mon Sep 17 00:00:00 2001
From: ksieuk <iebebd3@gmail.com>
Date: Sun, 8 Oct 2023 16:43:54 +0300
Subject: [PATCH] fix: [#8] docker-compose start

---
 src/template/Dockerfile.tests         |  4 ++--
 src/template/docker-compose.tests.yml | 30 +++++++++++++++++----------
 2 files changed, 21 insertions(+), 13 deletions(-)

diff --git a/src/template/Dockerfile.tests b/src/template/Dockerfile.tests
index 0f6641b..7362665 100644
--- a/src/template/Dockerfile.tests
+++ b/src/template/Dockerfile.tests
@@ -4,8 +4,8 @@ RUN apt-get update
 
 WORKDIR /opt/app
 
-COPY tests/pyproject.toml ./
-COPY tests/poetry.lock ./
+COPY pyproject.toml ./
+COPY poetry.lock ./
 
 RUN apt-get update \
     && pip install poetry \
diff --git a/src/template/docker-compose.tests.yml b/src/template/docker-compose.tests.yml
index 2c7586b..e92c8b7 100644
--- a/src/template/docker-compose.tests.yml
+++ b/src/template/docker-compose.tests.yml
@@ -3,19 +3,19 @@ version: "3"
 services:
   postgres:
     image: postgres:15.2
+    restart: always
     environment:
-      POSTGRES_USER: ${TEST_DB_USER}
-      POSTGRES_PASSWORD: ${TEST_DB_PASSWORD}
-      POSTGRES_DB: ${TEST_DB_NAME}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
+      POSTGRES_DB: ${POSTGRES_NAME}
     env_file:
       - .env
-    ports:
-      - "${TEST_DB_PORT}:${TEST_DB_PORT}"
+    expose:
+      - "${POSTGRES_PORT}"
     volumes:
       - postgres_data:/var/lib/postgresql/data/
-    restart: always
     networks:
-      - tests_network
+      - backend_network
 
   api:
     build:
@@ -23,15 +23,18 @@ services:
     container_name: api
     image: fastapi_app
     restart: always
-    entrypoint: ["/opt/app/entrypoint.sh"]
+    entrypoint: [ "/opt/app/entrypoint.sh" ]
     env_file:
       - .env
-    expose:
-      - "${API_PORT}"
     ports:
       - "${API_PORT}:${API_PORT}"
+    expose:
+      - "${API_PORT}"
     depends_on:
       - postgres
+    networks:
+      - backend_network
+      - api_network
 
   tests:
     build:
@@ -41,10 +44,15 @@ services:
       - .env
     depends_on:
       - postgres
+      - api
+    networks:
+      - api_network
 
 volumes:
   postgres_data:
 
 networks:
-  tests_network:
+  api_network:
+    driver: bridge
+  backend_network:
     driver: bridge