mirror of
https://github.com/Freika/dawarich.git
synced 2026-01-09 08:47:11 -05:00
* Implement OmniAuth GitHub authentication * Fix omniauth GitHub scope to include user email access * Remove margin-bottom * Implement Google OAuth2 authentication * Implement OIDC authentication for Dawarich using omniauth_openid_connect gem. * Add patreon account linking and patron checking service * Update docker-compose.yml to use boolean values instead of strings * Add support for KML files * Add tests * Update changelog * Remove patreon OAuth integration * Move omniauthable to a concern * Update an icon in integrations * Update changelog * Update app version * Fix family location sharing toggle * Move family location sharing to its own controller * Update changelog * Implement basic tagging functionality for places, allowing users to categorize and label places with custom tags. * Add places management API and tags feature * Add some changes related to places management feature * Fix some tests * Fix sometests * Add places layer * Update places layer to use Leaflet.Control.Layers.Tree for hierarchical layer control * Rework tag form * Add hashtag * Add privacy zones to tags * Add notes to places and manage place tags * Update changelog * Update e2e tests * Extract tag serializer to its own file * Fix some tests * Fix tags request specs * Fix some tests * Fix rest of the tests * Revert some changes * Add missing specs * Revert changes in place export/import code * Fix some specs * Fix PlaceFinder to only consider global places when finding existing places * Fix few more specs * Fix visits creator spec * Fix last tests * Update place creating modal * Add home location based on "Home" tagged place * Save enabled tag layers * Some fixes * Fix bug where enabling place tag layers would trigger saving enabled layers, overwriting with incomplete data * Update migration to use disable_ddl_transaction! and add up/down methods * Fix tag layers restoration and filtering logic * Update OIDC auto-registration and email/password registration settings * Fix potential xss
164 lines
5.5 KiB
YAML
164 lines
5.5 KiB
YAML
networks:
|
|
dawarich:
|
|
|
|
services:
|
|
dawarich_redis:
|
|
image: redis:7.4-alpine
|
|
container_name: dawarich_redis
|
|
command: redis-server
|
|
networks:
|
|
- dawarich
|
|
volumes:
|
|
- dawarich_shared:/data
|
|
restart: always
|
|
healthcheck:
|
|
test: [ "CMD", "redis-cli", "--raw", "incr", "ping" ]
|
|
interval: 10s
|
|
retries: 5
|
|
start_period: 30s
|
|
timeout: 10s
|
|
|
|
dawarich_db:
|
|
image: postgis/postgis:17-3.5-alpine
|
|
# image: imresamu/postgis:17-3.5-alpine # If you're on ARM architecture, use this image instead
|
|
shm_size: 1G
|
|
container_name: dawarich_db
|
|
volumes:
|
|
- dawarich_db_data:/var/lib/postgresql/data
|
|
- dawarich_shared:/var/shared
|
|
networks:
|
|
- dawarich
|
|
environment:
|
|
POSTGRES_USER: ${POSTGRES_USER:-postgres}
|
|
POSTGRES_PASSWORD: ${POSTGRES_PASSWORD:-password}
|
|
POSTGRES_DB: ${POSTGRES_DB:-dawarich_development}
|
|
restart: always
|
|
healthcheck:
|
|
test: [ "CMD-SHELL", "pg_isready -U ${POSTGRES_USER:-postgres} -d ${POSTGRES_DB:-dawarich_development}" ]
|
|
interval: 10s
|
|
retries: 5
|
|
start_period: 30s
|
|
timeout: 10s
|
|
# command: postgres -c config_file=/etc/postgresql/postgresql.conf # Use custom config, uncomment if you want to use a custom config
|
|
|
|
dawarich_app:
|
|
image: freikin/dawarich:latest
|
|
container_name: dawarich_app
|
|
volumes:
|
|
- dawarich_public:/var/app/public
|
|
- dawarich_watched:/var/app/tmp/imports/watched
|
|
- dawarich_storage:/var/app/storage
|
|
- dawarich_db_data:/dawarich_db_data
|
|
networks:
|
|
- dawarich
|
|
ports:
|
|
- "${DAWARICH_APP_PORT:-3000}:3000"
|
|
# - "${PROMETHEUS_PORT:-9394}:9394" # Prometheus exporter, uncomment if needed
|
|
stdin_open: true
|
|
tty: true
|
|
entrypoint: web-entrypoint.sh
|
|
command: ['bin/rails', 'server', '-p', '3000', '-b', '::']
|
|
restart: on-failure
|
|
environment:
|
|
RAILS_ENV: ${RAILS_ENV:-development}
|
|
REDIS_URL: ${REDIS_URL:-redis://dawarich_redis:6379}
|
|
DATABASE_HOST: ${DATABASE_HOST:-dawarich_db}
|
|
DATABASE_PORT: ${DATABASE_PORT:-5432}
|
|
DATABASE_USERNAME: ${DATABASE_USERNAME:-postgres}
|
|
DATABASE_PASSWORD: ${DATABASE_PASSWORD:-password}
|
|
DATABASE_NAME: ${DATABASE_NAME:-dawarich_development}
|
|
MIN_MINUTES_SPENT_IN_CITY: ${MIN_MINUTES_SPENT_IN_CITY:-60}
|
|
APPLICATION_HOSTS: ${APPLICATION_HOSTS:-localhost,::1,127.0.0.1}
|
|
TIME_ZONE: ${TIME_ZONE:-Europe/London}
|
|
APPLICATION_PROTOCOL: ${APPLICATION_PROTOCOL:-http}
|
|
PROMETHEUS_EXPORTER_ENABLED: ${PROMETHEUS_EXPORTER_ENABLED:-false}
|
|
PROMETHEUS_EXPORTER_HOST: ${PROMETHEUS_EXPORTER_HOST:-0.0.0.0}
|
|
PROMETHEUS_EXPORTER_PORT: ${PROMETHEUS_EXPORTER_PORT:-9394}
|
|
SECRET_KEY_BASE: ${SECRET_KEY_BASE:-"CHANGE_ME"}
|
|
RAILS_LOG_TO_STDOUT: ${RAILS_LOG_TO_STDOUT:-true}
|
|
SELF_HOSTED: ${SELF_HOSTED:-true}
|
|
STORE_GEODATA: ${STORE_GEODATA:-true}
|
|
logging:
|
|
driver: "json-file"
|
|
options:
|
|
max-size: ${LOG_MAX_SIZE:-100m}
|
|
max-file: ${LOG_MAX_FILE:-5}
|
|
healthcheck:
|
|
test: [ "CMD-SHELL", "wget -qO - http://127.0.0.1:3000/api/v1/health | grep -q '\"status\"\\s*:\\s*\"ok\"'" ]
|
|
interval: 10s
|
|
retries: 30
|
|
start_period: 30s
|
|
timeout: 10s
|
|
depends_on:
|
|
dawarich_db:
|
|
condition: service_healthy
|
|
restart: true
|
|
dawarich_redis:
|
|
condition: service_healthy
|
|
restart: true
|
|
deploy:
|
|
resources:
|
|
limits:
|
|
cpus: ${APP_CPU_LIMIT:-0.50}
|
|
memory: ${APP_MEMORY_LIMIT:-4G}
|
|
|
|
dawarich_sidekiq:
|
|
image: freikin/dawarich:latest
|
|
container_name: dawarich_sidekiq
|
|
volumes:
|
|
- dawarich_public:/var/app/public
|
|
- dawarich_watched:/var/app/tmp/imports/watched
|
|
- dawarich_storage:/var/app/storage
|
|
networks:
|
|
- dawarich
|
|
stdin_open: true
|
|
tty: true
|
|
entrypoint: sidekiq-entrypoint.sh
|
|
command: ['sidekiq']
|
|
restart: on-failure
|
|
environment:
|
|
RAILS_ENV: ${RAILS_ENV:-development}
|
|
REDIS_URL: ${REDIS_URL:-redis://dawarich_redis:6379}
|
|
DATABASE_HOST: ${DATABASE_HOST:-dawarich_db}
|
|
DATABASE_PORT: ${DATABASE_PORT:-5432}
|
|
DATABASE_USERNAME: ${DATABASE_USERNAME:-postgres}
|
|
DATABASE_PASSWORD: ${DATABASE_PASSWORD:-password}
|
|
DATABASE_NAME: ${DATABASE_NAME:-dawarich_development}
|
|
APPLICATION_HOSTS: ${APPLICATION_HOSTS:-localhost,::1,127.0.0.1}
|
|
BACKGROUND_PROCESSING_CONCURRENCY: ${BACKGROUND_PROCESSING_CONCURRENCY:-10}
|
|
APPLICATION_PROTOCOL: ${APPLICATION_PROTOCOL:-http}
|
|
PROMETHEUS_EXPORTER_ENABLED: ${PROMETHEUS_EXPORTER_ENABLED:-false}
|
|
PROMETHEUS_EXPORTER_HOST: ${PROMETHEUS_EXPORTER_HOST_SIDEKIQ:-dawarich_app}
|
|
PROMETHEUS_EXPORTER_PORT: ${PROMETHEUS_EXPORTER_PORT:-9394}
|
|
SECRET_KEY_BASE: ${SECRET_KEY_BASE:-"CHANGE_ME"}
|
|
RAILS_LOG_TO_STDOUT: ${RAILS_LOG_TO_STDOUT:-true}
|
|
SELF_HOSTED: ${SELF_HOSTED:-true}
|
|
STORE_GEODATA: ${STORE_GEODATA:-true}
|
|
logging:
|
|
driver: "json-file"
|
|
options:
|
|
max-size: ${LOG_MAX_SIZE:-100m}
|
|
max-file: ${LOG_MAX_FILE:-5}
|
|
healthcheck:
|
|
test: [ "CMD-SHELL", "pgrep -f sidekiq" ]
|
|
interval: 10s
|
|
retries: 30
|
|
start_period: 30s
|
|
timeout: 10s
|
|
depends_on:
|
|
dawarich_db:
|
|
condition: service_healthy
|
|
restart: true
|
|
dawarich_redis:
|
|
condition: service_healthy
|
|
restart: true
|
|
dawarich_app:
|
|
condition: service_healthy
|
|
restart: true
|
|
|
|
volumes:
|
|
dawarich_db_data:
|
|
dawarich_shared:
|
|
dawarich_public:
|
|
dawarich_watched:
|
|
dawarich_storage:
|