Update docker compose files

Author: jonra1993

create_fastapi_project/templates/basic/docker-compose-dev.yml

@@ -2,6 +2,7 @@ version: '3.8'
 
 services:
   fastapi_server:
+    container_name: ${PROJECT_NAME}_fastapi_server
     build: .
     restart: always
     command: "sh -c 'uvicorn app.main:app --reload --workers 3 --host 0.0.0.0 --port 8000'"

create_fastapi_project/templates/basic/docker-compose.yml

@@ -2,6 +2,7 @@ version: '3.8'
 
 services:
   fastapi_server:
+    container_name: ${PROJECT_NAME}_fastapi_server
     build: .
     restart: always
     command: "sh -c 'gunicorn -w 3 -k uvicorn.workers.UvicornWorker app.main:app  --bind 0.0.0.0:8000 --preload --log-level=debug --timeout 120'"

create_fastapi_project/templates/full/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   fastapi_server:
-    container_name: fastapi_server
+    container_name: ${PROJECT_NAME}_fastapi_server
     build: ./backend
     restart: always
     command: "sh -c 'alembic upgrade head && uvicorn app.main:app --reload --workers 3 --host 0.0.0.0 --port 8000'"
@@ -18,9 +18,9 @@ services:
       - caddy_reverse_proxy:storage.localhost
 
   database:
+    container_name: ${PROJECT_NAME}_database
     image: bitnami/postgresql:13.3.0
-    restart: always
-    container_name: database
+    restart: always    
     env_file: ".env"
     user: root
     volumes:
@@ -37,15 +37,15 @@ services:
       - POSTGRES_HOST_AUTH_METHOD= "trust"
 
   redis_server:
+    container_name: ${PROJECT_NAME}_redis_server
     image: redis:alpine
-    container_name: redis_server    
     restart: always
     expose:
       - 6379
     env_file: .env
 
   celery_worker:
-    container_name: celery_worker
+    container_name: ${PROJECT_NAME}_celery_worker
     restart: always
     # platform: linux/arm64/v8
     build: ./backend
@@ -59,7 +59,7 @@ services:
     env_file: .env
 
   celery_beat:  #Good for crontab and schedule tasks
-    container_name: celery_beat
+    container_name: ${PROJECT_NAME}_celery_beat    
     restart: always
     # platform: linux/arm64/v8
     build:
@@ -76,9 +76,9 @@ services:
     env_file: .env
 
   minio_server:
+    container_name: ${PROJECT_NAME}_minio_server
     image: minio/minio:latest
     restart: always
-    container_name: minio_server
     volumes:
       - ./minio/data:/data
     expose:
@@ -91,7 +91,7 @@ services:
     command: "server /data --console-address ':9090'"    
 
   caddy_reverse_proxy:
-    container_name: caddy_reverse_proxy
+    container_name: ${PROJECT_NAME}_caddy_reverse_proxy
     image: caddy:alpine
     restart: always
     ports:

create_fastapi_project/templates/full/docker-compose-sonarqube.yml

@@ -2,7 +2,7 @@ version: "3.9"
 
 services:
   sonarqube:
-    container_name: "sonarqube"
+    container_name: ${PROJECT_NAME}_sonarqube    
     image: "sonarqube:8.9.10-community"
     volumes:
       - ./sonarqube/extensions:/opt/sonarqube/extensions

create_fastapi_project/templates/full/docker-compose-test.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   fastapi_server:
-    container_name: fastapi_server
+    container_name: ${PROJECT_NAME}_fastapi_server
     build: 
       context: ./backend      
       args:
@@ -22,9 +22,9 @@ services:
       - caddy_reverse_proxy:storage.localhost
 
   database:
+    container_name: ${PROJECT_NAME}_database
     image: bitnami/postgresql:13.3.0
-    restart: always
-    container_name: database
+    restart: always    
     env_file: ".env"
     user: root
     volumes:
@@ -41,15 +41,15 @@ services:
       - POSTGRES_HOST_AUTH_METHOD= "trust"
 
   redis_server:
+    container_name: ${PROJECT_NAME}_redis_server
     image: redis:alpine
-    container_name: redis_server    
     restart: always
     expose:
       - 6379
     env_file: .env
 
   celery_worker:
-    container_name: celery_worker
+    container_name: ${PROJECT_NAME}_celery_worker
     restart: always
     # platform: linux/arm64/v8
     build:
@@ -66,7 +66,7 @@ services:
     env_file: .env
 
   celery_beat:  #Good for crontab and schedule tasks
-    container_name: celery_beat
+    container_name: ${PROJECT_NAME}_celery_beat
     restart: always
     # platform: linux/arm64/v8
     build:
@@ -83,9 +83,9 @@ services:
     env_file: .env
 
   minio_server:
+    container_name: ${PROJECT_NAME}_minio_server
     image: minio/minio:latest
     restart: always
-    container_name: minio_server
     volumes:
       - ./minio/data:/data
     expose:
@@ -98,7 +98,7 @@ services:
     command: "server /data --console-address ':9090'"    
 
   caddy_reverse_proxy:
-    container_name: caddy_reverse_proxy
+    container_name: ${PROJECT_NAME}_caddy_reverse_proxy
     image: caddy:alpine
     restart: always
     ports:

create_fastapi_project/templates/full/docker-compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   fastapi_server:
-    container_name: fastapi_server
+    container_name: ${PROJECT_NAME}_fastapi_server
     image: jrtec/fastapi-alembic-sqlmodel-async:latest
     restart: always
     command: "sh -c 'alembic upgrade head && python app/initial_data.py && gunicorn -w 3 -k uvicorn.workers.UvicornWorker app.main:app  --bind 0.0.0.0:8000 --preload --log-level=debug --timeout 120'"
@@ -17,9 +17,9 @@ services:
       - caddy_reverse_proxy:storage.localhost
 
   database:
+    container_name: ${PROJECT_NAME}_database
     image: bitnami/postgresql:13.3.0
     restart: always
-    container_name: database
     env_file: ".env"
     user: root
     volumes:
@@ -37,7 +37,7 @@ services:
 
 
   redis_server:
-    container_name: redis_server
+    container_name: ${PROJECT_NAME}_redis_server
     image: "redis:alpine"
     restart: always
     expose:
@@ -46,7 +46,7 @@ services:
 
 
   celery_worker:
-    container_name: celery_worker
+    container_name: ${PROJECT_NAME}_celery_worker    
     restart: always
     # platform: linux/arm64/v8
     build:
@@ -63,7 +63,7 @@ services:
     env_file: .env
 
   celery_beat:  #Good for crontab and schedule tasks
-    container_name: celery_beat
+    container_name: ${PROJECT_NAME}_celery_beat
     restart: always
     # platform: linux/arm64/v8
     build:
@@ -81,9 +81,9 @@ services:
 
 
   minio_server:
+    container_name: ${PROJECT_NAME}_minio_server
     image: minio/minio:latest
     restart: always
-    container_name: minio_server
     volumes:
       - ./minio/data:/data
     expose:
@@ -96,7 +96,7 @@ services:
     command: "server /data --console-address ':9090'"  
 
   caddy_reverse_proxy:
-    container_name: caddy_reverse_proxy
+    container_name: ${PROJECT_NAME}_caddy_reverse_proxy
     image: caddy:alpine
     restart: always
     ports:

create_fastapi_project/templates/langchain_basic/Makefile

@@ -52,21 +52,21 @@ stop-prod:
 	docker compose down
 
 formatter:
-	cd app && \
+	cd backend/app && \
 	poetry run black app
 
 mypy:
-	cd app && \
+	cd backend/app && \
 	poetry run mypy .
 
 lint:
-	cd app && \
+	cd backend/app && \
 	poetry run ruff app && poetry run black --check app
 
 lint-watch:
-	cd app && \
+	cd backend/app && \
 	poetry run ruff app --watch
 
 lint-fix:
-	cd app && \
+	cd backend/app && \
 	poetry run ruff app --fix

create_fastapi_project/templates/langchain_basic/docker-compose-dev.yml

@@ -2,7 +2,7 @@ version: "3.8"
 
 services:
   fastapi_server:
-    container_name: fastapi_server
+    container_name: ${PROJECT_NAME}_fastapi_server
     build: ./backend
     restart: always
     command: "sh -c 'uvicorn app.main:app --reload --workers 3 --host 0.0.0.0 --port 8000'"
@@ -13,7 +13,7 @@ services:
     env_file: ".env"
 
   streamlit_frontend:
-    container_name: streamlit_frontend
+    container_name: ${PROJECT_NAME}_streamlit_frontend
     build: ./frontend
     restart: always
     volumes:
@@ -24,7 +24,7 @@ services:
     env_file: ".env"
 
   caddy_reverse_proxy:
-    container_name: caddy_reverse_proxy
+    container_name: ${PROJECT_NAME}_caddy_reverse_proxy
     image: caddy:alpine
     restart: always
     ports:

create_fastapi_project/templates/langchain_basic/docker-compose.yml

@@ -2,6 +2,7 @@ version: "3.8"
 
 services:
   fastapi_server:
+    container_name: ${PROJECT_NAME}_fastapi_server
     build: ./backend
     restart: always
     command: "sh -c 'gunicorn -w 3 -k uvicorn.workers.UvicornWorker app.main:app  --bind 0.0.0.0:8000 --preload --log-level=debug --timeout 120'"
@@ -14,7 +15,7 @@ services:
     env_file: ".env"
 
   streamlit_frontend:
-    container_name: streamlit_frontend
+    container_name: ${PROJECT_NAME}_streamlit_frontend
     build: ./frontend
     restart: always
     volumes:
@@ -25,7 +26,7 @@ services:
     env_file: ".env"
 
   caddy_reverse_proxy:
-    container_name: caddy_reverse_proxy
+    container_name: ${PROJECT_NAME}_caddy_reverse_proxy
     image: caddy:alpine
     restart: always
     ports: