diff --git a/.github/scripts/test_image b/.github/scripts/test_image index 8d2a026..1c195a4 100755 --- a/.github/scripts/test_image +++ b/.github/scripts/test_image @@ -4,10 +4,9 @@ set -ex PROJECT_NAME=smartapp-template -python -m copier copy --trust --defaults --vcs-ref=HEAD . smartapp-template +python -m copier copy --trust --defaults --vcs-ref=HEAD --data add_worker=false . smartapp-template docker build -t $PROJECT_NAME $PROJECT_NAME -# there should be added `--fail` option to curl command when healthcheck endpoint is added docker run \ -d \ --name $PROJECT_NAME \ @@ -16,7 +15,7 @@ docker run \ -e REDIS_DSN=$REDIS_DSN \ -e POSTGRES_DSN=$POSTGRES_DSN \ -e BOT_CREDENTIALS="https://cts.example.com@secret@aab1b617-7694-4e75-bc59-145a2fd1502f" \ - --health-cmd "curl http://localhost:8000/status || exit 1" \ + --health-cmd "curl --fail http://localhost:8000/healthcheck || exit 1" \ --health-interval 2s \ --health-start-period 4s \ --health-timeout 1s \ diff --git a/Dockerfile.jinja b/Dockerfile.jinja index 63154e9..b6357b1 100644 --- a/Dockerfile.jinja +++ b/Dockerfile.jinja @@ -4,7 +4,7 @@ FROM python:3.13.11-alpine # Install system-wide dependencies RUN apk update && \ - apk add --no-cache --clean-protected git curl gcc python3-dev && \ + apk add --no-cache --clean-protected git curl build-base && \ rm -rf /var/cache/apk/* # Create user for app diff --git a/pyproject.toml.jinja b/pyproject.toml.jinja index 521cda0..93ee608 100644 --- a/pyproject.toml.jinja +++ b/pyproject.toml.jinja @@ -31,9 +31,7 @@ asyncpg = ">=0.31.0,<1.0.0" # DB backend for application psycopg2-binary = ">=2.9.11,<3.0.0" # DB backend for alembic (migration tool) redis = ">=7.4.0,<8.0.0" -{% if add_worker -%} saq = { version = ">=0.26.4,<1.0.0", extras = ["hiredis"] } -{%- endif %} [tool.poetry.group.dev.dependencies] mypy = "2.1.0"