diff --git a/.env.example b/.env.example index 914162f..b1aa9c5 100644 --- a/.env.example +++ b/.env.example @@ -23,3 +23,5 @@ WEB_CONCURRENCY=4 ENABLE_SOFT_DELETE=false # If ENABLE_SOFT_DELETE is true, transactions deleted for more than KEEP_DELETED_TRANSACTIONS_FOR days will be truly deleted. Set to 0 to keep all. KEEP_DELETED_TRANSACTIONS_FOR=365 + +TASK_WORKERS=1 # This only work if you're using the single container option. Increase to have more open queues via procrastinate, you probably don't need to increase this. diff --git a/docker-compose.prod.yml b/docker-compose.prod.yml index b840e46..c0c10a0 100644 --- a/docker-compose.prod.yml +++ b/docker-compose.prod.yml @@ -2,15 +2,13 @@ services: web: image: eitchtee/wygiwyh:latest container_name: ${SERVER_NAME} - command: /start + command: /start-single ports: - "${OUTBOUND_PORT}:8000" env_file: - .env depends_on: - db - volumes: - - wygiwyh_temp:/usr/src/app/temp/ restart: unless-stopped db: @@ -23,18 +21,3 @@ services: - POSTGRES_USER=${SQL_USER} - POSTGRES_PASSWORD=${SQL_PASSWORD} - POSTGRES_DB=${SQL_DATABASE} - - procrastinate: - image: eitchtee/wygiwyh:latest - container_name: ${PROCRASTINATE_NAME} - depends_on: - - db - env_file: - - .env - volumes: - - wygiwyh_temp:/usr/src/app/temp/ - command: /start-procrastinate - restart: unless-stopped - -volumes: - wygiwyh_temp: diff --git a/docker/prod/django/Dockerfile b/docker/prod/django/Dockerfile index 0920195..a444526 100644 --- a/docker/prod/django/Dockerfile +++ b/docker/prod/django/Dockerfile @@ -41,12 +41,12 @@ COPY --chown=app:app ./docker/prod/django/start /start COPY --chown=app:app ./docker/prod/procrastinate/start /start-procrastinate COPY --chown=app:app ./docker/prod/supervisord/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY --chown=app:app ./docker/prod/supervisord/supervisord.conf /etc/supervisord.conf -COPY --chown=app:app ./docker/prod/supervisord/start /start-supervisor +COPY --chown=app:app ./docker/prod/supervisord/start /start-single RUN sed -i 's/\r$//g' /start && \ chmod +x /start && \ sed -i 's/\r$//g' /start-procrastinate && \ chmod +x /start-procrastinate && \ - sed -i 's/\r$//g' /start-supervisor && \ + sed -i 's/\r$//g' /start-single && \ chmod +x /start-supervisor COPY --chown=app:app ./app .