test fix

Author: srugano

docker/Dockerfile

@@ -9,9 +9,11 @@ RUN apt update && apt install --no-install-recommends -y \
         --disabled-password --home /home/hcr \
         --shell /sbin.nologin --group hcr --gecos hcr \
     && mkdir -p /code /tmp /data /static \
-    && chown -R hcr:hcr /code /tmp /data /static
+    && chown -R hcr:hcr /code /tmp /data /static \
+    && curl -o /data/waitforit -sSL https://github.com/maxclaus/waitforit/releases/download/v2.4.1/waitforit-linux_amd64 \
+    && chmod +x /data/waitforit
 
-ENV PATH=/venv/bin:/usr/local/bin/:/usr/bin:/bin \
+ENV PATH=/venv/bin:/usr/local/bin/:/usr/bin:/bin:/data \
     DJANGO_SETTINGS_MODULE=hope_country_report.config.settings \
     PYTHONUNBUFFERED=1 \
     PYTHONDONTWRITEBYTECODE=1 \
@@ -29,7 +31,6 @@ RUN apt update \
         build-essential cmake git libfontconfig1 libgconf-2-4 libglib2.0-0 libnss3 libssl-dev libxml2-dev python3-dev zlib1g-dev \
     && apt clean && rm -rf /var/lib/apt/lists/*
 
-
 COPY pyproject.toml uv.lock /code/
 COPY src /app/src/
 
@@ -42,12 +43,13 @@ RUN --mount=type=cache,target=/root/.uv-cache \
 
 FROM builder AS dev
 
-ENV PYTHONPATH=$PYTHONPATH:/code/src:/code/test \
+ENV PYTHONPATH=/code/src:/code/test:$PYTHONPATH \
     PATH="/venv/bin:$PATH"
 
 WORKDIR /code
 COPY uv.lock README.md MANIFEST.in pyproject.toml /code/
 COPY src /code/src/
+COPY --from=base /data/waitforit /usr/local/bin/waitforit
 
 COPY docker/entrypoint.sh /usr/local/bin/entrypoint.sh
 ENTRYPOINT ["entrypoint.sh"]

docker/entrypoint.sh

@@ -3,6 +3,7 @@
 set -eou pipefail
 
 production() {
+    waitforit -address=tcp://db:5432
     uwsgi \
         --http :8000 \
         --master \
@@ -17,25 +18,27 @@ fi
 
 case "$1" in
     dev)
-        ./docker/wait-for-it.sh db:5432
+        waitforit -address=tcp://db:5432
         python3 manage.py migrate
         python3 manage.py runserver 0.0.0.0:8000
     ;;
     tests)
-        ./docker/wait-for-it.sh db:5432
+        waitforit -address=tcp://db:5432
         pytest tests/ --create-db --cov-report term --maxfail 5 --with-selenium
     ;;
     prd)
         production
     ;;
     celery_worker)
         export C_FORCE_ROOT=1
-        celery -A hope_country_report.config.celery worker -l info
+        watchmedo auto-restart --directory=./ --pattern=*.py --recursive -- celery -A hope_country_report.config.celery worker -l info
     ;;
     celery_beat)
+        waitforit -host=backend
         celery -A hope_country_report.config.celery beat -l info
     ;;
     celery_flower)
+        waitforit -host=backend
         celery -A hope_country_report.config.celery flower
     ;;
     *)