🔥 Update docker compose and Dockerfile (#37)

khanh41 · Oct 30, 2023 · 8918a87 · 8918a87
1 parent e01da5d
commit 8918a87
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 24 deletions.
diff --git a/Dockerfile b/Dockerfile
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,8 +1,10 @@
-version: "3"
+version: "3.9"
 
 services:
   app:
-    build: .
+    build:
+      context: "{{cookiecutter.project_slug}}"
+      dockerfile: "docker/Dockerfile"
     restart: on-failure
     depends_on:
       - mongodb

diff --git a/{{cookiecutter.project_slug}}/app/api/database/models/user.py b/{{cookiecutter.project_slug}}/app/api/database/models/user.py
@@ -19,7 +19,7 @@ class UserSchema(CustomBaseModel):
 
     class Config:
         """Config."""
-        schema_extra = {
+        json_schema_extra = {
             "example": {
                 "username": "example@gmail.com",
                 "password": "abcd123456",

diff --git a/{{cookiecutter.project_slug}}/docker-compose.yml b/{{cookiecutter.project_slug}}/docker-compose.yml
@@ -2,6 +2,7 @@ version: "3.9"
 
 services:
   backend-app:
+    container_name: {{cookiecutter.project_slug}}-backend-app
     build:
       context: .
       dockerfile: docker/Dockerfile
@@ -10,14 +11,25 @@ services:
       - mongodb
     ports:
       - "{{cookiecutter.port}}:{{cookiecutter.port}}"
+    healthcheck:
+      test: [ "CMD-SHELL", "curl http://0.0.0.0:{{cookiecutter.port}}/" ]
+      interval: 60s
+      timeout: 5s
+      retries: 5
     networks:
       - backend-network
 
   mongodb:
     image: mongo
+    container_name: {{cookiecutter.project_slug}}-mongodb
     ports:
       - "27017:27017"
     restart: always
+    healthcheck:
+      test: echo 'db.runCommand("ping").ok' | mongosh localhost:27017/test --quiet
+      interval: 10s
+      timeout: 5s
+      retries: 5
     env_file:
       - .env
     volumes: