diff --git a/docker-compose.yml b/docker-compose.yml index f29e719..9afa9a4 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ services: - postgres-data:/var/lib/postgresql/data rabbitmq: - image: rabbitmq:4 + image: rabbitmq:3.12 memcached: image: memcached:1.6 @@ -78,11 +78,6 @@ services: --scheduler django -n worker1@%h -n worker2@%h - healthcheck: - test: celery --app newsreader status || exit 1 - interval: 10s - timeout: 10s - retries: 5 depends_on: rabbitmq: condition: service_started @@ -112,9 +107,9 @@ services: newsreader.wsgi:application healthcheck: test: /usr/bin/curl --fail http://django:8000 || exit 1 - interval: 10s + interval: 30s timeout: 10s - retries: 5 + retries: 10 depends_on: memcached: condition: service_started diff --git a/docker/django b/docker/django index 6e079c8..77f0c1d 100644 --- a/docker/django +++ b/docker/django @@ -60,8 +60,8 @@ COPY ./src /app/src RUN uv sync --frozen --only-group production --extra sentry -RUN useradd --no-create-home --uid 1000 newsreader -RUN chown --recursive newsreader:newsreader /app +RUN useradd -M -u 1000 newsreader +RUN chown -R newsreader:newsreader /app USER newsreader