Compare commits

..

No commits in common. "105371abafbbfb61e64b881a493a14cac40cb03e" and "f3ba0f1d091db6a4c8b58e91562037128ed6f2d0" have entirely different histories.

2 changed files with 5 additions and 10 deletions

View file

@ -52,7 +52,7 @@ services:
- postgres-data:/var/lib/postgresql/data - postgres-data:/var/lib/postgresql/data
rabbitmq: rabbitmq:
image: rabbitmq:4 image: rabbitmq:3.12
memcached: memcached:
image: memcached:1.6 image: memcached:1.6
@ -78,11 +78,6 @@ services:
--scheduler django --scheduler django
-n worker1@%h -n worker1@%h
-n worker2@%h -n worker2@%h
healthcheck:
test: celery --app newsreader status || exit 1
interval: 10s
timeout: 10s
retries: 5
depends_on: depends_on:
rabbitmq: rabbitmq:
condition: service_started condition: service_started
@ -112,9 +107,9 @@ services:
newsreader.wsgi:application newsreader.wsgi:application
healthcheck: healthcheck:
test: /usr/bin/curl --fail http://django:8000 || exit 1 test: /usr/bin/curl --fail http://django:8000 || exit 1
interval: 10s interval: 30s
timeout: 10s timeout: 10s
retries: 5 retries: 10
depends_on: depends_on:
memcached: memcached:
condition: service_started condition: service_started

View file

@ -60,8 +60,8 @@ COPY ./src /app/src
RUN uv sync --frozen --only-group production --extra sentry RUN uv sync --frozen --only-group production --extra sentry
RUN useradd --no-create-home --uid 1000 newsreader RUN useradd -M -u 1000 newsreader
RUN chown --recursive newsreader:newsreader /app RUN chown -R newsreader:newsreader /app
USER newsreader USER newsreader