diff --git a/backend/Dockerfile b/Dockerfile similarity index 100% rename from backend/Dockerfile rename to Dockerfile diff --git a/backend/README.md b/backend/README.md index 0e17d03e..1187166f 100644 --- a/backend/README.md +++ b/backend/README.md @@ -2,14 +2,11 @@ ## Docker -> [!IMPORTANT] -> Due to Docker context limitations, you can't build an image in this directory - 1. Make sure you're at the root of the project 2. Run the following Docker command to build container: ```shell - docker build -f backend/Dockerfile -t fba_backend_independent . + docker build -f Dockerfile -t fba_backend_independent . ``` 3. Start container @@ -39,9 +36,7 @@ cd fastapi_best_architecture/backend - uv venv - - uv pip install -r requirements.txt + uv sync --frozen ``` 3. Checkout a new branch and make your changes diff --git a/deploy/backend/nginx.conf b/deploy/backend/nginx.conf index 661b1a45..0f63d972 100644 --- a/deploy/backend/nginx.conf +++ b/deploy/backend/nginx.conf @@ -46,10 +46,10 @@ server { } location /static { - alias /www/fba_server/backend/static; + alias /var/www/fba_server/backend/static; } location /static/upload { - alias /www/fba_server/backend/static/upload; + alias /var/www/fba_server/backend/static/upload; } } diff --git a/deploy/backend/docker-compose/docker-compose.yml b/docker-compose.yml similarity index 93% rename from deploy/backend/docker-compose/docker-compose.yml rename to docker-compose.yml index 378431b6..cd9607d9 100644 --- a/deploy/backend/docker-compose/docker-compose.yml +++ b/docker-compose.yml @@ -1,8 +1,8 @@ services: fba_server: build: - context: ../../../ - dockerfile: backend/Dockerfile + context: . + dockerfile: Dockerfile image: fba_server:latest container_name: fba_server restart: always @@ -11,7 +11,7 @@ services: - fba_redis - fba_celery volumes: - - .env.server:/fba/backend/.env + - ./deploy/backend/docker-compose/.env.server:/fba/backend/.env - fba_static:/fba/backend/app/static networks: - fba_network @@ -80,7 +80,7 @@ services: depends_on: - fba_server volumes: - - ../nginx.conf:/etc/nginx/conf.d/default.conf:ro + - ./deploy/backend/nginx.conf:/etc/nginx/conf.d/default.conf:ro - fba_static:/www/fba_server/backend/static - fba_static_upload:/www/fba_server/backend/static/upload networks: @@ -127,8 +127,8 @@ services: fba_celery: build: - context: ../../../ - dockerfile: backend/Dockerfile + context: . + dockerfile: Dockerfile args: - SERVER_TYPE=celery image: fba_celery:latest