Features: 1) Add chrony package and enable it in all Dockerfiles; 2) Set Celery timezone and disable UTC in celery.py;
Fixes: 1) Correct import of `TIME_ZONE` in `celery.py`; Extra: 1) Minor typo fixed in `Dockerfile.worker` (`python3p` → `python3`).
This commit is contained in:
parent
da3f307f2b
commit
2aa0e79743
5 changed files with 17 additions and 2 deletions
|
|
@ -26,6 +26,7 @@ RUN set -eux; \
|
||||||
graphviz-dev \
|
graphviz-dev \
|
||||||
libgts-dev \
|
libgts-dev \
|
||||||
libpq5 \
|
libpq5 \
|
||||||
|
chrony \
|
||||||
graphviz \
|
graphviz \
|
||||||
binutils \
|
binutils \
|
||||||
libproj-dev \
|
libproj-dev \
|
||||||
|
|
@ -35,6 +36,8 @@ RUN set -eux; \
|
||||||
pip install --upgrade pip; \
|
pip install --upgrade pip; \
|
||||||
curl -sSL https://install.python-poetry.org | python3
|
curl -sSL https://install.python-poetry.org | python3
|
||||||
|
|
||||||
|
RUN systemctl enable --now chrony
|
||||||
|
|
||||||
COPY pyproject.toml pyproject.toml
|
COPY pyproject.toml pyproject.toml
|
||||||
COPY poetry.lock poetry.lock
|
COPY poetry.lock poetry.lock
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ RUN set -eux; \
|
||||||
graphviz-dev \
|
graphviz-dev \
|
||||||
libgts-dev \
|
libgts-dev \
|
||||||
libpq5 \
|
libpq5 \
|
||||||
|
chrony \
|
||||||
graphviz \
|
graphviz \
|
||||||
binutils \
|
binutils \
|
||||||
libproj-dev \
|
libproj-dev \
|
||||||
|
|
@ -35,6 +36,8 @@ RUN set -eux; \
|
||||||
pip install --upgrade pip; \
|
pip install --upgrade pip; \
|
||||||
curl -sSL https://install.python-poetry.org | python3
|
curl -sSL https://install.python-poetry.org | python3
|
||||||
|
|
||||||
|
RUN systemctl enable --now chrony
|
||||||
|
|
||||||
COPY pyproject.toml pyproject.toml
|
COPY pyproject.toml pyproject.toml
|
||||||
COPY poetry.lock poetry.lock
|
COPY poetry.lock poetry.lock
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ RUN set -eux; \
|
||||||
graphviz-dev \
|
graphviz-dev \
|
||||||
libgts-dev \
|
libgts-dev \
|
||||||
libpq5 \
|
libpq5 \
|
||||||
|
chrony \
|
||||||
graphviz \
|
graphviz \
|
||||||
binutils \
|
binutils \
|
||||||
libproj-dev \
|
libproj-dev \
|
||||||
|
|
@ -35,6 +36,8 @@ RUN set -eux; \
|
||||||
pip install --upgrade pip; \
|
pip install --upgrade pip; \
|
||||||
curl -sSL https://install.python-poetry.org | python3
|
curl -sSL https://install.python-poetry.org | python3
|
||||||
|
|
||||||
|
RUN systemctl enable --now chrony
|
||||||
|
|
||||||
COPY pyproject.toml pyproject.toml
|
COPY pyproject.toml pyproject.toml
|
||||||
COPY poetry.lock poetry.lock
|
COPY poetry.lock poetry.lock
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -26,6 +26,7 @@ RUN set -eux; \
|
||||||
graphviz-dev \
|
graphviz-dev \
|
||||||
libgts-dev \
|
libgts-dev \
|
||||||
libpq5 \
|
libpq5 \
|
||||||
|
chrony \
|
||||||
graphviz \
|
graphviz \
|
||||||
binutils \
|
binutils \
|
||||||
libproj-dev \
|
libproj-dev \
|
||||||
|
|
@ -33,7 +34,9 @@ RUN set -eux; \
|
||||||
gdal-bin; \
|
gdal-bin; \
|
||||||
rm -rf /var/lib/apt/lists/*; \
|
rm -rf /var/lib/apt/lists/*; \
|
||||||
pip install --upgrade pip; \
|
pip install --upgrade pip; \
|
||||||
curl -sSL https://install.python-poetry.org | python3
|
curl -sSL https://install.python-poetry.org | python3p
|
||||||
|
|
||||||
|
RUN systemctl enable --now chrony
|
||||||
|
|
||||||
COPY pyproject.toml pyproject.toml
|
COPY pyproject.toml pyproject.toml
|
||||||
COPY poetry.lock poetry.lock
|
COPY poetry.lock poetry.lock
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,9 @@
|
||||||
from datetime import timedelta
|
from datetime import timedelta
|
||||||
|
|
||||||
from evibes.settings import REDIS_PASSWORD
|
from evibes.settings.base import REDIS_PASSWORD, TIME_ZONE
|
||||||
|
|
||||||
|
CELERY_ENABLE_UTC = False
|
||||||
|
CELERY_TIMEZONE = TIME_ZONE
|
||||||
|
|
||||||
CELERY_BROKER_URL = f"redis://:{REDIS_PASSWORD + '@'}redis:6379/0"
|
CELERY_BROKER_URL = f"redis://:{REDIS_PASSWORD + '@'}redis:6379/0"
|
||||||
CELERY_RESULT_BACKEND = f"redis://:{REDIS_PASSWORD + '@'}redis:6379/0"
|
CELERY_RESULT_BACKEND = f"redis://:{REDIS_PASSWORD + '@'}redis:6379/0"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue