From 161234defd0d10e1420e25d0cb4e7445a43a047a Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sun, 23 Mar 2025 16:23:45 +0100 Subject: [PATCH 1/3] Bump rabbitmq version --- docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 9afa9a4..44e9555 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -52,7 +52,7 @@ services: - postgres-data:/var/lib/postgresql/data rabbitmq: - image: rabbitmq:3.12 + image: rabbitmq:4 memcached: image: memcached:1.6 From ed37be0c6041d71a7527aefb90cc8b5366e8bd8d Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sun, 23 Mar 2025 16:24:33 +0100 Subject: [PATCH 2/3] Add celery healthcheck & update existing healthcheck --- docker-compose.yml | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 44e9555..f29e719 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -78,6 +78,11 @@ 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 @@ -107,9 +112,9 @@ services: newsreader.wsgi:application healthcheck: test: /usr/bin/curl --fail http://django:8000 || exit 1 - interval: 30s + interval: 10s timeout: 10s - retries: 10 + retries: 5 depends_on: memcached: condition: service_started From 105371abafbbfb61e64b881a493a14cac40cb03e Mon Sep 17 00:00:00 2001 From: Sonny Bakker Date: Sun, 23 Mar 2025 16:25:03 +0100 Subject: [PATCH 3/3] Use long command options --- docker/django | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker/django b/docker/django index 77f0c1d..6e079c8 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 -M -u 1000 newsreader -RUN chown -R newsreader:newsreader /app +RUN useradd --no-create-home --uid 1000 newsreader +RUN chown --recursive newsreader:newsreader /app USER newsreader