refactor: optimize image building

README.md

@@ -1,7 +1,9 @@
 # Cloud Storage
 
 <p align="center">
-  <img src="https://github.com/j3rrryy/cloud_storage/actions/workflows/main.yml/badge.svg">
+  <a href="https://github.com/j3rrryy/cloud_storage/actions/workflows/main.yml">
+    <img src="https://github.com/j3rrryy/cloud_storage/actions/workflows/main.yml/badge.svg" alt="СI/CD">
+  </a>
   <a href="https://www.python.org/downloads/release/python-3120/">
     <img src="https://img.shields.io/badge/Python-3.12-FFD64E.svg" alt="Python 3.12">
   </a>

docker-compose.dev.yml

@@ -43,7 +43,7 @@ services:
     env_file:
       - ./dev/.env
     volumes:
-      - ./src/gateway/:/app/
+      - ./src/gateway/:/app
     networks:
       - nginx_network
       - main_network
@@ -63,7 +63,7 @@ services:
     env_file:
       - ./dev/.env
     volumes:
-      - ./src/auth/:/app/
+      - ./src/auth/:/app
     networks:
       - main_network
       - auth_network
@@ -105,7 +105,7 @@ services:
     env_file:
       - ./dev/.env
     volumes:
-      - ./src/files/:/app/
+      - ./src/files/:/app
     networks:
       - main_network
       - files_network
@@ -195,7 +195,7 @@ services:
     env_file:
       - ./dev/.env
     volumes:
-      - ./src/mail/:/app/
+      - ./src/mail/:/app
     networks:
       - mail_network
     depends_on:

examples/dev/.env

@@ -2,7 +2,7 @@ APP_NAME="Cloud Storage"
 VERSION=1.0.0
 DEBUG=1
 SECRET_KEY={"kty": "OKP", "crv": "Ed25519", "x": "<key>", "d": "<key>", "alg": "EdDSA"}
-ALLOWED_ORIGINS="<origin>, <origin>"
+ALLOWED_ORIGINS="<origin:port>, <origin:port>"
 
 MAIL_USERNAME=<username>
 MAIL_PASSWORD=<password>

examples/prod/.env

@@ -2,7 +2,7 @@ APP_NAME="Cloud Storage"
 VERSION=1.0.0
 DEBUG=0
 SECRET_KEY={"kty": "OKP", "crv": "Ed25519", "x": "<key>", "d": "<key>", "alg": "EdDSA"}
-ALLOWED_ORIGINS="<origin>, <origin>"
+ALLOWED_ORIGINS="<origin:port>, <origin:port>"
 
 MAIL_USERNAME=<username>
 MAIL_PASSWORD=<password>

src/auth/.dockerignore

@@ -1,7 +1,8 @@
-.vscode
-.ruff_cache
-.gitignore
+**/.vscode
+**/.DS_Store
+**/.gitignore
+**/__pycache__
+**/.ruff_cache
 venv
-__pycache__
 Dockerfile
 .dockerignore

src/auth/config/config.py

@@ -39,7 +39,7 @@ def __new__(cls, *args, **kwargs):
     postgres: PostgresConfig
 
 
-def load_config() -> Config:
+def load_config():
     env = Env()
     env.read_env()
 

src/files/.dockerignore

@@ -1,7 +1,8 @@
-.vscode
-.ruff_cache
-.gitignore
+**/.vscode
+**/.DS_Store
+**/.gitignore
+**/__pycache__
+**/.ruff_cache
 venv
-__pycache__
 Dockerfile
 .dockerignore

src/files/config/config.py

@@ -45,7 +45,7 @@ def __new__(cls, *args, **kwargs):
     minio: MinioConfig
 
 
-def load_config() -> Config:
+def load_config():
     env = Env()
     env.read_env()
 

src/gateway/.dockerignore

@@ -1,7 +1,8 @@
-.vscode
-.ruff_cache
-.gitignore
+**/.vscode
+**/.DS_Store
+**/.gitignore
+**/__pycache__
+**/.ruff_cache
 venv
-__pycache__
 Dockerfile
 .dockerignore

src/gateway/config/config.py

@@ -33,7 +33,7 @@ def __new__(cls, *args, **kwargs):
     app: AppConfig
 
 
-def load_config() -> Config:
+def load_config():
     env = Env()
     env.read_env()
 

src/mail/.dockerignore

@@ -1,7 +1,8 @@
-.vscode
-.ruff_cache
-.gitignore
+**/.vscode
+**/.DS_Store
+**/.gitignore
+**/__pycache__
+**/.ruff_cache
 venv
-__pycache__
 Dockerfile
 .dockerignore

src/mail/config/config.py

@@ -35,7 +35,7 @@ def __new__(cls, *args, **kwargs):
     smtp: SMTPConfig
 
 
-def load_config() -> Config:
+def load_config():
     env = Env()
     env.read_env()
 

src/mail/main.py

@@ -8,8 +8,8 @@
 async def main():
     consumer = connect_kafka_service()
     service = MailService(consumer)
-    await service.process_messages()
     load_config().app.logger.info("Server started")
+    await service.process_messages()
 
 
 if __name__ == "__main__":