Merge from develop

.gitignore

@@ -35,4 +35,5 @@ tiler-server/imposm/
 overpass-api-db/
 data/*/
 !data/README.md
-images/changeset-replication-job/config.yaml
+images/changeset-replication-job/config.yaml
+values_copy.yaml

chartpress.yaml

@@ -1,46 +1,52 @@
 charts:
-  - name: osm-seed
-    imagePrefix: developmentseed/osmseed-
-    repo:
-       git: developmentseed/osm-seed-chart
-       published: https://devseed.com/osm-seed-chart
+- name: osm-seed
+  imagePrefix: developmentseed/osmseed-
+  repo:
+    git: developmentseed/osm-seed-chart
+    published: https://devseed.com/osm-seed-chart
 
-    images:
-      web:
-        valuesPath: web.image
-      db:
-        valuesPath: db.image
-      backup-restore:
-        valuesPath: dbBackupRestore.image
-      planet-dump:
-        valuesPath: planetDump.image
-      full-history:
-        valuesPath: fullHistory.image
-      replication-job:
-        valuesPath: replicationJob.image
-      populate-apidb:
-        valuesPath: populateApidb.image
-      osm-processor:
-        valuesPath: osmProcessor.image
-      tiler-db:
-        valuesPath: tilerDb.image
-      tiler-imposm:
-        valuesPath: tilerImposm.image
-      tiler-server:
-        valuesPath: tilerServer.image
-      tasking-manager-api:
-        valuesPath: tmApi.image
-      # tiler-visor:
-      #   valuesPath: tilerVisor.image
-      nominatim:
-        valuesPath: nominatimApi.image
-      overpass-api:
-        valuesPath: overpassApi.image
-      taginfo:
-        valuesPath: taginfo.image
-      osm-simple-metrics:
-        valuesPath: osmSimpleMetrics.image
-      changeset-replication-job:
-        valuesPath: changesetReplicationJob.image
-      cgimap:
-        valuesPath: cgimap.image
+  images:
+    web:
+      valuesPath: web.image
+    db:
+      valuesPath: db.image
+    backup-restore:
+      valuesPath: dbBackupRestore.image
+    planet-dump:
+      valuesPath: planetDump.image
+    full-history:
+      valuesPath: fullHistory.image
+    replication-job:
+      valuesPath: replicationJob.image
+    populate-apidb:
+      valuesPath: populateApidb.image
+    osm-processor:
+      valuesPath: osmProcessor.image
+    tiler-db:
+      valuesPath: tilerDb.image
+    tiler-imposm:
+      valuesPath: tilerImposm.image
+    tiler-server:
+      valuesPath: tilerServer.image
+    tasking-manager-api:
+      valuesPath: tmApi.image
+    # tiler-visor:
+    #   valuesPath: tilerVisor.image
+    nominatim:
+      valuesPath: nominatimApi.image
+    overpass-api:
+      valuesPath: overpassApi.image
+    taginfo:
+      valuesPath: taginfo.image
+    osm-simple-metrics:
+      valuesPath: osmSimpleMetrics.image
+    changeset-replication-job:
+      valuesPath: changesetReplicationJob.image
+    osmcha-web:
+      valuesPath: osmchaWeb.image
+    osmcha-db:
+      valuesPath: osmchaDb.image
+    planet-files:
+      valuesPath: planetFiles.image
+    cgimap:
+      valuesPath: cgimap.image

compose/db-backup-restore.yml

@@ -9,13 +9,10 @@ services:
       context: ../images/backup-restore
       dockerfile: Dockerfile
     volumes:
-      - ../data/db-backup-restore-data:/mnt/data
-    command: >
-      /bin/bash -c "
-        echo 'Set cron job for backing up DB, every 4 minutes';
-        while :; do echo 'Creating DB backup...'; /start.sh; sleep 4m; done;
-      "
+    - ../data/db-backup-restore-data:/mnt/data
+    command: /start.sh
     env_file:
-      - ../envs/.env.db
-      - ../envs/.env.db-utils
-      - ../envs/.env.cloudprovider
+    - ../envs/.env.db
+    - ../envs/.env.osmcha
+    - ../envs/.env.db-utils
+    - ../envs/.env.cloudprovider

compose/nominatim.yml

@@ -10,9 +10,10 @@ services:
       dockerfile: Dockerfile
     ports:
       - '8080:8080'
-      - '5432:5432'
+    #   - '5432:5432'
     volumes:
       - ../data/nominatim-data:/var/lib/postgresql/14/main
       # - ../../Nominatim/nominatim/tokenizer/sanitizers:/usr/local/lib/nominatim/lib-python/nominatim/tokenizer/sanitizers
     env_file:
       - ../envs/.env.nominatim
+    restart: always

compose/osmcha.yml

@@ -0,0 +1,60 @@
+version: "3.8"
+services:
+  web:
+    platform: linux/amd64
+    image: developmentseed/osmseed-osmcha-web:v16
+    build:
+      context: ../images/osmcha-web
+      dockerfile: Dockerfile
+    env_file:
+    - ../envs/.env.osmcha
+    volumes:
+    - ../data/osmcha/staticfiles:/staticfiles
+  db:
+    platform: linux/amd64
+    image: osmseed-osmcha-db:v1
+    build:
+      context: ../images/osmcha-db
+      dockerfile: Dockerfile
+    ports:
+    - "5432:5432"
+    volumes:
+    - ../data/osmcha-db-data:/var/lib/postgresql/data
+    env_file:
+    - ../envs/.env.osmcha
+  init:
+    platform: linux/amd64
+    image: ghcr.io/willemarcel/osmcha-django:b1f4e6afc90e08707cadc4d74580632ca3b93dd2
+    command: >
+      /bin/bash -c "
+        set -x
+        python manage.py collectstatic
+        python manage.py migrate
+        mkdir -p /staticfiles/static
+        cp -r /app/staticfiles/* /staticfiles/static/
+      "
+    env_file:
+    - ../envs/.env.osmcha
+    volumes:
+    - ../data/osmcha/staticfiles:/staticfiles
+  api:
+    platform: linux/amd64
+    image: ghcr.io/willemarcel/osmcha-django:b1f4e6afc90e08707cadc4d74580632ca3b93dd2
+    build:
+      context: ../images/osmcha-api
+      dockerfile: Dockerfile
+    command: >
+      /bin/bash -c "
+        set -x
+        python manage.py collectstatic
+        python manage.py migrate
+        mkdir -p /staticfiles/static
+        cp -r /app/staticfiles/* /staticfiles/static/
+        gunicorn --workers 4 --bind 0.0.0.0:5000 --log-file - --access-logfile - config.wsgi
+      "
+    ports:
+    - "5000:5000"
+    env_file:
+    - ../envs/.env.osmcha
+    volumes:
+    - ../data/osmcha/staticfiles:/staticfiles

compose/planet.yml

@@ -0,0 +1,97 @@
+version: '3'
+services:
+  ######################################################
+  ### OSM minute replication files section
+  ######################################################
+  replication-job:
+    image: osmseed-replication-job:v1
+    build:
+      context: ../images/replication-job
+      dockerfile: Dockerfile
+    volumes:
+    - ../data/replication-job-data:/mnt/data
+    # - ./../images/replication-job:/app
+    command: /start.sh
+    env_file:
+    - ../envs/.env.db
+    - ../envs/.env.db-utils
+    - ../envs/.env.cloudprovider
+    restart: always
+
+  ######################################################
+  ### Planet replication section
+  ######################################################
+  planet-dump:
+    image: osmseed-planet-dump:v1
+    build:
+      context: ../images/planet-dump
+      dockerfile: Dockerfile
+    volumes:
+    - ../data/planet-dump-data:/mnt/data
+    command: /start.sh;
+    env_file:
+    - ../envs/.env.db
+    - ../envs/.env.db-utils
+    - ../envs/.env.cloudprovider
+    restart: always
+
+  #####################################################
+  ## OSM full planet replication
+  #####################################################
+  full-history:
+    image: osmseed-full-history:v1
+    build:
+      context: ../images/full-history
+      dockerfile: Dockerfile
+    volumes:
+    - ../data/full-history-data:/mnt/data
+    command: /start.sh
+    env_file:
+    - ../envs/.env.db
+    - ../envs/.env.db-utils
+    - ../envs/.env.cloudprovider
+    restart: always
+
+  #####################################################
+  ## Changeset replications
+  #####################################################
+  changeset-replication-job:
+    image: osmseed-changeset-replication-job:v1
+    build:
+      context: ../images/changeset-replication-job
+      dockerfile: Dockerfile
+    volumes:
+    - ../data/changeset-replication-job-data:/mnt/changesets
+    command: >
+      /bin/bash -c "./start.sh"
+    env_file:
+    - ../envs/.env.db
+    - ../envs/.env.db-utils
+    - ../envs/.env.cloudprovider
+    restart: always
+
+  ######################################################
+  ### NGINX container for serving files
+  ######################################################
+  planet-files:
+    image: osmseed-planet-files:v1
+    build:
+      context: ../images/planet-files
+      dockerfile: Dockerfile
+    ports:
+    - "8081:80"
+    - "8082:3000"
+    volumes:
+    # Serve minute replication files
+    - ../data/replication-job-data:/usr/share/nginx/html/server/static-files/replication/minute
+    # Serve planet dump files
+    - ../data/planet-dump-data:/usr/share/nginx/html/server/static-files/planet
+    # Serve full history planet file
+    - '.../data/full-history-data:/usr/share/nginx/html/server/static-files/full-planet'
+    - '../data/changeset-replication-job-data:/usr/share/nginx/html/server/static-files/changesets'
+    # Development mode
+    # - ./../images/planet-files/:/usr/share/nginx/html/
+    restart: always
+networks:
+  osm-seed:
+    driver: bridge