Dawarich: Removed Sidekiq & Valkey from configuration and switched to development RAILS_ENV
*Removed Sidekiq & Valkey due to them being replaced with SolidQueue and SolidCache *Switched RAILS_ENV to development due to SolidQueue not starting and /jobs not working in production
This commit is contained in:
@@ -3,23 +3,6 @@ version: '3'
|
|||||||
networks:
|
networks:
|
||||||
dawarich:
|
dawarich:
|
||||||
services:
|
services:
|
||||||
dawarich_valkey:
|
|
||||||
image: valkey/valkey
|
|
||||||
container_name: dawarich_valkey
|
|
||||||
command: valkey-server
|
|
||||||
networks:
|
|
||||||
- dawarich
|
|
||||||
volumes:
|
|
||||||
- type: bind
|
|
||||||
source: /srv/dawarich/valkey
|
|
||||||
target: /data
|
|
||||||
restart: always
|
|
||||||
healthcheck:
|
|
||||||
test: [ "CMD", "valkey-cli", "--raw", "incr", "ping" ]
|
|
||||||
interval: 10s
|
|
||||||
retries: 5
|
|
||||||
start_period: 30s
|
|
||||||
timeout: 10s
|
|
||||||
dawarich_app:
|
dawarich_app:
|
||||||
image: freikin/dawarich:latest
|
image: freikin/dawarich:latest
|
||||||
container_name: dawarich_app
|
container_name: dawarich_app
|
||||||
@@ -47,8 +30,8 @@ services:
|
|||||||
command: ['bin/rails', 'server', '-p', '3000', '-b', '::']
|
command: ['bin/rails', 'server', '-p', '3000', '-b', '::']
|
||||||
restart: on-failure
|
restart: on-failure
|
||||||
environment:
|
environment:
|
||||||
RAILS_ENV: production
|
#RAILS_ENV: production
|
||||||
REDIS_URL: redis://dawarich_valkey:6379/0
|
RAILS_ENV: development
|
||||||
DATABASE_HOST: ${POSTGRESS_HOST}
|
DATABASE_HOST: ${POSTGRESS_HOST}
|
||||||
# Default 5432
|
# Default 5432
|
||||||
DATABASE_PORT: ${POSTGRESS_PORT}
|
DATABASE_PORT: ${POSTGRESS_PORT}
|
||||||
@@ -84,75 +67,6 @@ services:
|
|||||||
retries: 30
|
retries: 30
|
||||||
start_period: 30s
|
start_period: 30s
|
||||||
timeout: 10s
|
timeout: 10s
|
||||||
depends_on:
|
|
||||||
dawarich_valkey:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: true
|
|
||||||
deploy:
|
|
||||||
resources:
|
|
||||||
limits:
|
|
||||||
cpus: '1' # Limit CPU usage to 50% of one core
|
|
||||||
memory: '4G' # Limit memory usage to 2GB
|
|
||||||
dawarich_sidekiq:
|
|
||||||
image: freikin/dawarich:latest
|
|
||||||
container_name: dawarich_sidekiq
|
|
||||||
volumes:
|
|
||||||
- type: bind
|
|
||||||
source: /srv/dawarich/watched
|
|
||||||
target: /var/app/tmp/imports/watched
|
|
||||||
- type: bind
|
|
||||||
source: /srv/dawarich/public
|
|
||||||
target: /var/app/public
|
|
||||||
- type: bind
|
|
||||||
source: /srv/dawarich/storage
|
|
||||||
target: /var/app/storage
|
|
||||||
networks:
|
|
||||||
- dawarich
|
|
||||||
stdin_open: true
|
|
||||||
tty: true
|
|
||||||
entrypoint: sidekiq-entrypoint.sh
|
|
||||||
command: ['bundle', 'exec', 'sidekiq']
|
|
||||||
restart: on-failure
|
|
||||||
environment:
|
|
||||||
RAILS_ENV: production
|
|
||||||
REDIS_URL: redis://dawarich_valkey:6379/0
|
|
||||||
DATABASE_HOST: ${POSTGRESS_HOST}
|
|
||||||
# Default 5432
|
|
||||||
DATABASE_PORT: ${POSTGRESS_PORT}
|
|
||||||
DATABASE_USERNAME: ${POSTGRESS_DB_USERNAME}
|
|
||||||
DATABASE_PASSWORD: ${POSTGRESS_DB_PASSWORD}
|
|
||||||
DATABASE_NAME: ${POSTGRESS_DB_NAME}
|
|
||||||
APPLICATION_HOSTS: localhost,::1,127.0.0.1
|
|
||||||
BACKGROUND_PROCESSING_CONCURRENCY: 10
|
|
||||||
APPLICATION_PROTOCOL: http
|
|
||||||
STORE_GEODATA: "true"
|
|
||||||
PROMETHEUS_EXPORTER_ENABLED: false
|
|
||||||
PROMETHEUS_EXPORTER_HOST: dawarich_app
|
|
||||||
PROMETHEUS_EXPORTER_PORT: 9394
|
|
||||||
SECRET_KEY_BASE: ${SECRET_KEY_BASE}
|
|
||||||
RAILS_LOG_TO_STDOUT: "true"
|
|
||||||
PHOTON_API_USE_HTTPS: "true"
|
|
||||||
PHOTON_API_HOST: ${PHOTON_API_HOST}
|
|
||||||
PHOTON_API_KEY: ${PHOTON_API_KEY}
|
|
||||||
SELF_HOSTED: "true"
|
|
||||||
logging:
|
|
||||||
driver: "json-file"
|
|
||||||
options:
|
|
||||||
max-size: "100m"
|
|
||||||
max-file: "5"
|
|
||||||
healthcheck:
|
|
||||||
test: [ "CMD-SHELL", "bundle exec sidekiqmon processes | grep $${HOSTNAME}" ]
|
|
||||||
interval: 10s
|
|
||||||
retries: 30
|
|
||||||
start_period: 30s
|
|
||||||
timeout: 10s
|
|
||||||
depends_on:
|
|
||||||
dawarich_valkey:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: true
|
|
||||||
dawarich_app:
|
|
||||||
condition: service_healthy
|
|
||||||
restart: true
|
|
||||||
deploy:
|
deploy:
|
||||||
resources:
|
resources:
|
||||||
limits:
|
limits:
|
||||||
@@ -160,7 +74,6 @@ services:
|
|||||||
memory: '4G' # Limit memory usage to 2GB
|
memory: '4G' # Limit memory usage to 2GB
|
||||||
|
|
||||||
volumes:
|
volumes:
|
||||||
dawarich_valkey_data:
|
|
||||||
dawarich_public:
|
dawarich_public:
|
||||||
dawarich_watched:
|
dawarich_watched:
|
||||||
dawarich_storage:
|
dawarich_storage:
|
||||||
|
|||||||
Reference in New Issue
Block a user