Docker compose clean up

.devcontainer/docker-compose.yml

@@ -24,11 +24,7 @@ services:
       DATABASE_USERNAME: postgres
       DATABASE_PASSWORD: password
       DATABASE_NAME: dawarich_development
-      MIN_MINUTES_SPENT_IN_CITY: 60
       APPLICATION_HOSTS: localhost
-      TIME_ZONE: Europe/London
-      APPLICATION_PROTOCOL: http
-      DISTANCE_UNIT: km
       PROMETHEUS_EXPORTER_ENABLED: false
       PROMETHEUS_EXPORTER_HOST: 0.0.0.0
       PROMETHEUS_EXPORTER_PORT: 9394

.github/FUNDING.yml

@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: freika # Replace with a single Patreon username
+github: Freika
+patreon: freika
 open_collective: # Replace with a single Open Collective username
 ko_fi: freika
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

CHANGELOG.md

@@ -18,6 +18,20 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Restrict access to background jobs in non self-hosted mode.
 - Restrict access to users management in non self-hosted mode.
 
+### Removed
+
+ENV vars removed from the docker-compose.yml:
+
+```
+TIME_ZONE: Europe/London
+APPLICATION_PROTOCOL: http
+DISTANCE_UNIT: km
+MIN_MINUTES_SPENT_IN_CITY: 60
+```
+
+Link to the https://dawarich.app/docs/environment-variables-and-settings page added instead, and the app itself is now using defaults that can be changed if env vars are provided.
+
+
 # 0.24.1 - 2025-02-13
 
 ## Custom map tiles

config/application.rb

@@ -23,7 +23,7 @@ class Application < Rails::Application
     # These settings can be overridden in specific environments using the files
     # in config/environments, which are processed later.
     #
-    config.time_zone = ENV.fetch('TIME_ZONE', 'Europe/Berlin')
+    config.time_zone = ENV.fetch('TIME_ZONE', 'UTC')
     # config.eager_load_paths << Rails.root.join("extras")
 
     # Don't generate system test files.

docker/docker-compose.production.yml

@@ -59,11 +59,7 @@ services:
       DATABASE_USERNAME: postgres
       DATABASE_PASSWORD: password
       DATABASE_NAME: dawarich_production
-      MIN_MINUTES_SPENT_IN_CITY: 60
       APPLICATION_HOSTS: localhost,::1,127.0.0.1
-      TIME_ZONE: Europe/London
-      APPLICATION_PROTOCOL: http
-      DISTANCE_UNIT: km
       PROMETHEUS_EXPORTER_ENABLED: false
       PROMETHEUS_EXPORTER_HOST: 0.0.0.0
       PROMETHEUS_EXPORTER_PORT: 9394
@@ -115,8 +111,6 @@ services:
       DATABASE_NAME: dawarich_production
       APPLICATION_HOSTS: localhost,::1,127.0.0.1
       BACKGROUND_PROCESSING_CONCURRENCY: 10
-      APPLICATION_PROTOCOL: http
-      DISTANCE_UNIT: km
       PROMETHEUS_EXPORTER_ENABLED: false
       PROMETHEUS_EXPORTER_HOST: dawarich_app
       PROMETHEUS_EXPORTER_PORT: 9394

docker/docker-compose.yml

@@ -54,17 +54,15 @@ services:
     command: ['bin/rails', 'server', '-p', '3000', '-b', '::']
     restart: on-failure
     environment:
+      # All env vars with their defaults can be found here:
+      # https://dawarich.app/docs/environment-variables-and-settings
       RAILS_ENV: development
       REDIS_URL: redis://dawarich_redis:6379/0
       DATABASE_HOST: dawarich_db
       DATABASE_USERNAME: postgres
       DATABASE_PASSWORD: password
       DATABASE_NAME: dawarich_development
-      MIN_MINUTES_SPENT_IN_CITY: 60
       APPLICATION_HOSTS: localhost
-      TIME_ZONE: Europe/London
-      APPLICATION_PROTOCOL: http
-      DISTANCE_UNIT: km
       PROMETHEUS_EXPORTER_ENABLED: false
       PROMETHEUS_EXPORTER_HOST: 0.0.0.0
       PROMETHEUS_EXPORTER_PORT: 9394
@@ -106,6 +104,8 @@ services:
     command: ['sidekiq']
     restart: on-failure
     environment:
+      # All env vars with their defaults can be found here:
+      # https://dawarich.app/docs/environment-variables-and-settings
       RAILS_ENV: development
       REDIS_URL: redis://dawarich_redis:6379/0
       DATABASE_HOST: dawarich_db
@@ -114,8 +114,6 @@ services:
       DATABASE_NAME: dawarich_development
       APPLICATION_HOSTS: localhost
       BACKGROUND_PROCESSING_CONCURRENCY: 10
-      APPLICATION_PROTOCOL: http
-      DISTANCE_UNIT: km
       PROMETHEUS_EXPORTER_ENABLED: false
       PROMETHEUS_EXPORTER_HOST: dawarich_app
       PROMETHEUS_EXPORTER_PORT: 9394

docs/How_to_install_Dawarich_in_k8s.md

@@ -92,24 +92,12 @@ spec:
               value: Password123!
             - name: DATABASE_NAME
               value: dawarich_development
-            - name: MIN_MINUTES_SPENT_IN_CITY
-              value: "60"
-            - name: APPLICATION_HOST
-              value: localhost
             - name: APPLICATION_HOSTS
               value: "dawarich.example.com, localhost"
-            - name: APPLICATION_PROTOCOL
-              value: http
-            - name: DISTANCE_UNIT
-              value: km
-            - name: PHOTON_API_HOST
-              value: photon.komoot.io
-            - name: PHOTON_API_USE_HTTPS
-              value: "true"
             - name: RAILS_MIN_THREADS
               value: "5"
             - name: RAILS_MAX_THREADS
-              value: "10"              
+              value: "10"
           image: freikin/dawarich:0.16.4
           imagePullPolicy: Always
           volumeMounts:
@@ -149,21 +137,11 @@ spec:
             - name: RAILS_MIN_THREADS
               value: "5"
             - name: RAILS_MAX_THREADS
-              value: "10" 
+              value: "10"
             - name: BACKGROUND_PROCESSING_CONCURRENCY
               value: "20"
-            - name: APPLICATION_HOST
-              value: localhost
             - name: APPLICATION_HOSTS
               value: "dawarich.example.com, localhost"
-            - name: APPLICATION_PROTOCOL
-              value: http
-            - name: DISTANCE_UNIT
-              value: km
-            - name: PHOTON_API_HOST
-              value: photon.komoot.io
-            - name: PHOTON_API_USE_HTTPS
-              value: "true"
           image: freikin/dawarich:0.16.4
           imagePullPolicy: Always
           volumeMounts: