From 89610291767b0f1184560e78b4082e0fc3450cb9 Mon Sep 17 00:00:00 2001 From: Egor fureunoir Gorbunov Date: Mon, 26 May 2025 15:34:45 +0300 Subject: [PATCH] Features: 1) Add `Dockerfile.app` with author label for application container; 2) Add `CODEOWNERS` file for ownership management; 3) Introduce `Dockerfile.storefront` for storefront container; 4) Add `.gitkeep` file for storefront folder; Fixes: 1) Update `docker-compose.yml` to use `Dockerfile.app` instead of default build context; Extra: 1) Add commented-out `storefront` service in `docker-compose.yml` for potential future use; 2) Minor cleanup and structuring of Docker setup; --- CODEOWNERS | 31 +++++++++++++++++++++++++++++++ Dockerfile => Dockerfile.app | 1 + Dockerfile.storefront | 2 ++ docker-compose.yml | 12 ++++++++---- storefront/.gitkeep | 0 5 files changed, 42 insertions(+), 4 deletions(-) create mode 100644 CODEOWNERS rename Dockerfile => Dockerfile.app (97%) create mode 100644 Dockerfile.storefront create mode 100644 storefront/.gitkeep diff --git a/CODEOWNERS b/CODEOWNERS new file mode 100644 index 00000000..681e8e78 --- /dev/null +++ b/CODEOWNERS @@ -0,0 +1,31 @@ +* @default-owner + +README.md @fureunoir contact@fureunoir.com + +LICENSE @fureunoir contact@fureunoir.com + +Dockerfile* @fureunoir contact@fureunoir.com +docker-compose.yml @fureunoir contact@fureunoir.com +.gitignore @fureunoir contact@fureunoir.com +.dockerignore @fureunoir contact@fureunoir.com +nginx @fureunoir contact@fureunoir.com +pyproject.toml @fureunoir contact@fureunoir.com +poetry.lock @fureunoir contact@fureunoir.com + +/blog/ @fureunoir contact@fureunoir.com +/core/ @fureunoir contact@fureunoir.com +/evibes/ @fureunoir contact@fureunoir.com +/payments/ @fureunoir contact@fureunoir.com +/scripts/ @fureunoir contact@fureunoir.com +/vibes_auth/ @fureunoir contact@fureunoir.com +/storefront/ @SaVBaD savbad@wiseless.xyz + +*.py @fureunoir contact@fureunoir.com +*.bat @fureunoir contact@fureunoir.com +*.sh @fureunoir contact@fureunoir.com +*.po @fureunoir contact@fureunoir.com +*.mo @fureunoir contact@fureunoir.com +*.html @savbad savbad@wiseless.xyz +*.js @savbad savbad@wiseless.xyz +*.vue @savbad savbad@wiseless.xyz +*.scss @savbad savbad@wiseless.xyz diff --git a/Dockerfile b/Dockerfile.app similarity index 97% rename from Dockerfile rename to Dockerfile.app index bb3d70e4..5abffbc2 100644 --- a/Dockerfile +++ b/Dockerfile.app @@ -1,5 +1,6 @@ # syntax=docker/dockerfile:1 FROM python:3.12-bookworm +LABEL authors="fureunoir" ENV PYTHONDONTWRITEBYTECODE=1 \ PYTHONUNBUFFERED=1 \ diff --git a/Dockerfile.storefront b/Dockerfile.storefront new file mode 100644 index 00000000..84586138 --- /dev/null +++ b/Dockerfile.storefront @@ -0,0 +1,2 @@ +FROM node:23.11 +LABEL authors="savbad" diff --git a/docker-compose.yml b/docker-compose.yml index c0e5d60c..c6af5453 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -7,7 +7,7 @@ x-logging: services: app: container_name: app - build: . + build: Dockerfile.app restart: always command: > sh -c "poetry run python manage.py await_services && @@ -42,7 +42,7 @@ services: worker: container_name: worker - build: . + build: Dockerfile.app restart: always command: > sh -c "poetry run celery -A evibes worker --loglevel=info --concurrency=4 --autoscale=4,2 --max-tasks-per-child=100 --max-memory-per-child=512000 --soft-time-limit=10800 --time-limit=21600" @@ -64,7 +64,7 @@ services: beat: container_name: beat - build: . + build: Dockerfile.app restart: always command: sh -c "poetry run celery -A evibes beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler" volumes: @@ -106,7 +106,7 @@ services: flower: container_name: flower - build: . + build: Dockerfile.app restart: always command: sh -c "poetry run celery -A evibes --broker=$CELERY_BROKER_URL flower --address=0.0.0.0 --port=5555 --basic_auth=$FLOWER_USER:$FLOWER_PASSWORD" depends_on: @@ -117,5 +117,9 @@ services: - .env logging: *default-logging +# storefront: +# container_name: storefront +# build: Dockerfile.storefront + volumes: es-data: diff --git a/storefront/.gitkeep b/storefront/.gitkeep new file mode 100644 index 00000000..e69de29b