refactor(folders): structure

.github/workflows/ci-cd.yml

@@ -102,7 +102,7 @@ jobs:
         env:
           APP_TEST_IMAGE: ${{ env.TEST_IMAGE_NAME }}
         run: |
-          docker-compose -f ci/docker-compose.yml up --exit-code-from app
+          docker-compose -f devops/ci/docker-compose.yml up --exit-code-from app
 
   build:
     runs-on: ubuntu-20.04
@@ -130,9 +130,6 @@ jobs:
             type=sha,priority=300
             type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', github.event.repository.default_branch) }}
 
-      - name: Update .dockerignore
-        run: cat docker/.dockerignore.production >> .dockerignore
-
       - name: Build production and push Docker image
         uses: docker/build-push-action@v2
         with:

.gitignore

@@ -159,4 +159,5 @@ cython_debug/
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
 .idea/
 server/settings/environments/development.py
-pytest.ini
+pytest.ini
+run

.pre-commit-config.yaml

@@ -16,10 +16,10 @@ repos:
       - id: polint
         name: polint
         language: system
-        entry: poetry run polint -i location,unsorted,untranslated locale
+        entry: poetry run polint -i location,unsorted,untranslated src/locale
         pass_filenames: false
       - id: dennis
         name: dennis
         language: system
-        entry: poetry run dennis-cmd lint --errorsonly locale
+        entry: poetry run dennis-cmd lint --errorsonly src/locale
         pass_filenames: false

Makefile

@@ -1,45 +1,45 @@
 # -- poetry --
 
 poetry-install:
-	@poetry install --remove-untracked
+	poetry install --remove-untracked
 
 # -- code --
 
 lint:
 	black --check .
 	mypy .
 	flake8 .
-	DJANGO_ENV=build python manage.py makemigrations --dry-run --check
+	DJANGO_ENV=build python src/manage.py makemigrations --dry-run --check
 	xenon --max-absolute A \
         --max-modules A \
         --max-average A \
-        --exclude server/apps/core/graphql/fields/query_connection.py \
-        server
+        --exclude src/apps/core/graphql/fields/query_connection.py \
+        src
 	poetry check
 	pip check
 	#  safety check --bare --full-report -i 39462
-	polint -i location,unsorted locale
-	dennis-cmd lint --errorsonly locale
+	polint -i location,unsorted src/locale
+	dennis-cmd lint --errorsonly src/locale
 
 test:
-	@pytest
+	pytest
 
 # -- django --
 
 make-messages:
-	@python manage.py makemessages --ignore=.venv/* -l en --no-location
+	python src/manage.py makemessages -l en --no-location
 
 compile-messages:
-	@python manage.py compilemessages
+	python src/manage.py compilemessages
 
 # -- pre-commit --
 
 pre-commit:
-	@pre-commit
+	pre-commit
 
 pre-commit-install:
-	@pre-commit install
-	@pre-commit install --hook-type commit-msg
+	pre-commit install
+	pre-commit install --hook-type commit-msg
 
 pre-commit-update:
-	@pre-commit autoupdate
+	pre-commit autoupdate

docker/Dockerfile → devops/docker/Dockerfile

@@ -40,17 +40,15 @@ RUN apt-get update \
 
 FROM base as production
 
-ARG APP_VERSION
-
-RUN groupadd --system --gid 10001 app \
-    && useradd --system --uid 10001 --no-log-init -g app app
-
-COPY . .
+COPY devops/docker/server .
+COPY devops/docker/nginx/* /etc/nginx
+COPY ./src ./src
 
 RUN export DJANGO_ENV=build \
-    && python manage.py collectstatic --noinput --verbosity 0 \
-    && python manage.py compilemessages \
-    && cp docker/nginx/* /etc/nginx \
+    && python src/manage.py collectstatic --noinput --verbosity 0 \
+    && python src/manage.py compilemessages \
+    && groupadd --system --gid 10001 app \
+    && useradd --system --uid 10001 --no-log-init -g app app \
     && chmod -R 755 /app \
     && mkdir /var/run/app \
     && mkdir /var/run/nginx \
@@ -61,12 +59,11 @@ RUN export DJANGO_ENV=build \
     && ln -sf /dev/stderr /var/log/nginx/error.log
 
 
-ENV DJANGO_ENV=production \
-    APP_VERSION=$APP_VERSION
+ENV DJANGO_ENV=production
 
 USER app
 
-CMD ["/bin/bash", "docker/server/backend.sh"]
+CMD ["make", "server"]
 
 # ---
 
@@ -77,4 +74,5 @@ RUN poetry install --no-interaction --no-ansi
 COPY . .
 
 RUN export DJANGO_ENV=build \
-    && python manage.py compilemessages
+    && python src/manage.py compilemessages
+

docker/nginx/nginx.conf → devops/docker/nginx/nginx.conf

@@ -1,4 +1,4 @@
-worker_processes  auto;
+worker_processes auto;
 
 pid  /var/run/nginx/pid;
 
@@ -21,14 +21,9 @@ http {
     access_log  /var/run/nginx/access.log;
     error_log /var/run/nginx/errors.log;
 
-    upstream django {
-        server unix:/var/run/app/uwsgi.sock;
-    }
-
     server {
         listen 8080 default_server;
         charset     utf-8;
-        client_max_body_size 75M;
 
         location /static/ {
             expires max;
@@ -39,10 +34,5 @@ http {
             expires max;
             root /var/www;
         }
-
-        location / {
-            include /etc/nginx/uwsgi_params;
-            uwsgi_pass django;
-        }
     }
 }

devops/docker/server/Makefile

@@ -0,0 +1,30 @@
+CPU_COUNT = $(shell nproc)
+
+GUNICORN_WORKERS_COUNT ?= ${CPU_COUNT}
+CELERY_CONCURRENCY ?= ${CPU_COUNT}
+
+.PHONY: server
+server:
+	@python src/manage.py migrate
+	@gunicorn src.asgi:application \
+		-k uvicorn.workers.UvicornWorker \
+		--bind 0.0.0.0:8000
+
+.PHONY: celery-beat
+celery-beat:
+	@rm -f /var/run/app/celerybeat.pid
+	@celery -A src.celery_app beat \
+        -s /var/run/app/celerybeat.schedule \
+        --pidfile /var/run/app/celerybeat.pid
+
+.PHONY: celery-worker
+celery-worker:
+	@celery -A src.celery_app worker --concurrency ${CELERY_CONCURRENCY}
+
+.PHONY: flower
+flower:
+	@celery -A src.celery_app flower --url_prefix=admin/flower
+
+.PHONY: static
+static:
+	@nginx -g 'daemon off;'

pyproject.toml

@@ -5,7 +5,7 @@ description = ""
 authors = ["Lapshin Stanislav"]
 
 [tool.poetry.dependencies]
-python = "^3.10"
+python = "^3.11"
 python-decouple = "*"
 psycopg2-binary = "*"
 pymemcache = "*"