diff --git a/Dockerfiles/Dockerfile.app b/Dockerfiles/Dockerfile.app index c545addb..ef220880 100644 --- a/Dockerfiles/Dockerfile.app +++ b/Dockerfiles/Dockerfile.app @@ -47,4 +47,4 @@ RUN chmod +x /usr/local/bin/app-entrypoint.sh COPY . . -ENTRYPOINT ["app-entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/usr/bin/bash", "app-entrypoint.sh"] \ No newline at end of file diff --git a/Dockerfiles/Dockerfile.beat b/Dockerfiles/Dockerfile.beat index 8d175820..f2f8684f 100644 --- a/Dockerfiles/Dockerfile.beat +++ b/Dockerfiles/Dockerfile.beat @@ -47,4 +47,4 @@ RUN chmod +x /usr/local/bin/beat-entrypoint.sh COPY . . -ENTRYPOINT ["beat-entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/usr/bin/bash", "beat-entrypoint.sh"] \ No newline at end of file diff --git a/Dockerfiles/Dockerfile.stock_updater b/Dockerfiles/Dockerfile.stock_updater index 2987573e..39bbc5ba 100644 --- a/Dockerfiles/Dockerfile.stock_updater +++ b/Dockerfiles/Dockerfile.stock_updater @@ -47,4 +47,4 @@ RUN chmod +x /usr/local/bin/stock-updater-entrypoint.sh COPY . . -ENTRYPOINT ["stock-updater-entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/usr/bin/bash", "stock-updater-entrypoint.sh"] \ No newline at end of file diff --git a/Dockerfiles/Dockerfile.worker b/Dockerfiles/Dockerfile.worker index 86f9ade0..cb5234a9 100644 --- a/Dockerfiles/Dockerfile.worker +++ b/Dockerfiles/Dockerfile.worker @@ -47,4 +47,4 @@ RUN chmod +x /usr/local/bin/worker-entrypoint.sh COPY . . -ENTRYPOINT ["worker-entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/usr/bin/bash", "worker-entrypoint.sh"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index 466fceb3..c64e86cd 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -70,7 +70,6 @@ services: logging: *default-logging sysctls: net.ipv4.tcp_keepalive_time: 60 - vm.overcommit_memory: 1 healthcheck: test: [ "CMD", "redis-cli", "-a", "$REDIS_PASSWORD", "ping" ] interval: 30s diff --git a/evibes/settings/base.py b/evibes/settings/base.py index d8902e16..fa1ee7fb 100644 --- a/evibes/settings/base.py +++ b/evibes/settings/base.py @@ -2,7 +2,7 @@ import logging from os import getenv, name from pathlib import Path -EVIBES_VERSION = "2.9.0" +EVIBES_VERSION = "2.9.1" BASE_DIR = Path(__file__).resolve().parent.parent.parent diff --git a/pyproject.toml b/pyproject.toml index d641ff21..c269c1ea 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "eVibes" -version = "2.9.0" +version = "2.9.1" description = "eVibes is an open-source eCommerce backend service built with Django. It’s designed for flexibility, making it ideal for various use cases and learning Django skills. The project is easy to customize, allowing for straightforward editing and extension." authors = ["fureunoir "] readme = "README.md" diff --git a/scripts/Docker/app-entrypoint.sh b/scripts/Docker/app-entrypoint.sh index 8fae47f6..05ddd61e 100644 --- a/scripts/Docker/app-entrypoint.sh +++ b/scripts/Docker/app-entrypoint.sh @@ -18,4 +18,4 @@ else --bind 0.0.0.0:8000 \ --workers 12 \ --timeout 120 -fi \ No newline at end of file +fi diff --git a/scripts/Docker/beat-entrypoint.sh b/scripts/Docker/beat-entrypoint.sh index b78c7f46..d1779697 100644 --- a/scripts/Docker/beat-entrypoint.sh +++ b/scripts/Docker/beat-entrypoint.sh @@ -5,4 +5,4 @@ set -e poetry run python manage.py await_services # run beat -poetry run celery -A evibes beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler \ No newline at end of file +poetry run celery -A evibes beat -l info --scheduler django_celery_beat.schedulers:DatabaseScheduler diff --git a/scripts/Docker/stock-updater-entrypoint.sh b/scripts/Docker/stock-updater-entrypoint.sh index a1516086..1686cd32 100644 --- a/scripts/Docker/stock-updater-entrypoint.sh +++ b/scripts/Docker/stock-updater-entrypoint.sh @@ -5,4 +5,4 @@ set -e poetry run python manage.py await_services # run stock_updater -poetry run celery -A evibes worker --pool=prefork --concurrency=1 --queues=stock_updater --loglevel=info --max-tasks-per-child=1 \ No newline at end of file +poetry run celery -A evibes worker --pool=prefork --concurrency=1 --queues=stock_updater --loglevel=info --max-tasks-per-child=1 diff --git a/scripts/Docker/worker-entrypoint.sh b/scripts/Docker/worker-entrypoint.sh index 23001d3b..f811766f 100644 --- a/scripts/Docker/worker-entrypoint.sh +++ b/scripts/Docker/worker-entrypoint.sh @@ -5,4 +5,4 @@ set -e poetry run python manage.py await_services # run worker and metrics exporter -poetry run celery -A evibes worker --pool=prefork --concurrency=8 --loglevel=info -E --queues=default --prefetch-multiplier=1 --max-tasks-per-child=100 --max-memory-per-child=512000 --soft-time-limit=3600 --time-limit=7200 & /usr/local/bin/celery-prometheus-exporter \ No newline at end of file +poetry run celery -A evibes worker --pool=prefork --concurrency=8 --loglevel=info -E --queues=default --prefetch-multiplier=1 --max-tasks-per-child=100 --max-memory-per-child=512000 --soft-time-limit=3600 --time-limit=7200 & /usr/local/bin/celery-prometheus-exporter diff --git a/scripts/Windows/compile-messages.ps1 b/scripts/Windows/compile-messages.ps1 new file mode 100644 index 00000000..e69de29b diff --git a/scripts/Windows/install.ps1 b/scripts/Windows/install.ps1 index c0d49dca..0df9aec8 100644 --- a/scripts/Windows/install.ps1 +++ b/scripts/Windows/install.ps1 @@ -2,6 +2,9 @@ Set-StrictMode -Version Latest $ErrorActionPreference = 'Stop' .\scripts\Windows\starter.ps1 +if ($LASTEXITCODE -ne 0) { + exit $LASTEXITCODE +} if (-not (Test-Path '.env')) { diff --git a/scripts/Windows/make-messages.ps1 b/scripts/Windows/make-messages.ps1 new file mode 100644 index 00000000..9a7cc583 --- /dev/null +++ b/scripts/Windows/make-messages.ps1 @@ -0,0 +1,37 @@ +Set-StrictMode -Version Latest +$ErrorActionPreference = 'Stop' + +.\scripts\Windows\starter.ps1 +if ($LASTEXITCODE -ne 0) { + exit $LASTEXITCODE +} + +if (-not (Test-Path '.env')) +{ + Write-Warning ".env file not found. Exiting without running Docker steps." + exit 0 +} + +Write-Host "Updating PO files..." -ForegroundColor Magenta +docker compose exec app poetry run python manage.py makemessages -l en_GB -l ar_AR -l cs_CZ -l da_DK -l de_DE -l en_US -l es_ES -l fr_FR -l hi_IN -l it_IT -l ja_JP -l kk_KZ -l nl_NL -l pl_PL -l pt_BR -l ro_RO -l ru_RU -l zh_Hans +if ($LASTEXITCODE -ne 0) { + exit $LASTEXITCODE +} +Write-Host "PO files updated successfully!" -ForegroundColor Green + +Write-Host "Fixing fuzzy entries..." -ForegroundColor Magenta +docker compose exec app poetry run python manage.py fix_fuzzy +if ($LASTEXITCODE -ne 0) { + exit $LASTEXITCODE +} +Write-Host "Fuzzy entries fixed successfully!" -ForegroundColor Green + +Write-Host "Translating with DeepL..." -ForegroundColor Magenta +docker compose exec app poetry run python manage.py deepl_translate -l en-gb -l ar-ar -l cs-cz -l da-dk -l de-de -l en-us -l es-es -l fr-fr -l hi-in -l it-it -l ja-jp -l kk-kz -l nl-nl -l pl-pl -l pt-br -l ro-ro -l ru-ru -l zh-hans -a core -a geo -a payments -a vibes_auth -a blog -a root +if ($LASTEXITCODE -ne 0) { + exit $LASTEXITCODE +} +Write-Host "Translated successfully!" -ForegroundColor Green + +Write-Host "" +Write-Host "You can now use compile-messages.ps1 script." -ForegroundColor Cyan diff --git a/scripts/Windows/starter.ps1 b/scripts/Windows/starter.ps1 index dc4914f5..7a847b58 100644 --- a/scripts/Windows/starter.ps1 +++ b/scripts/Windows/starter.ps1 @@ -18,4 +18,5 @@ if (-not (Test-Path $artPath)) } Get-Content -Raw -Path $artPath | ForEach-Object { Write-Host "$purple$_$reset" } -Write-Host "`n by WISELESS TEAM`n" -ForegroundColor Gray \ No newline at end of file +Write-Host "`n by WISELESS TEAM`n" -ForegroundColor Gray +exit 0 \ No newline at end of file