Remove bash scripts that is not used from tiler-server

OpenHistoricalMap · Feb 6, 2025 · 069d970 · 069d970
1 parent 676e6a6
commit 069d970
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 244 deletions.
diff --git a/.gitignore b/.gitignore
@@ -13,9 +13,12 @@ config.toml
 !config.general.toml
 !config.osm.template.toml
 config.osm.toml
+envs/.env.tm
+values.staging.yaml
 
 .DS_Store
 */.DS_Store
 .env
 values.dev.staging.yaml
 images/tiler-server/utils/exec.sh
+__pycache__/
diff --git a/compose/README.md b/compose/README.md
@@ -19,3 +19,11 @@ Make a coppy of the enviroment files `envs/.env.tiler.example` file and name it
 docker compose -f compose/tiler.yml build
 docker compose -f compose/tiler.yml run --service-ports tiler bash
 ```
+
+
+## Tasking manager
+Make a coppy of the enviroment files `envs/.env.tiler.example` file and name it `envs/.env.tiler`.
+
+```sh
+docker compose -f compose/tm.yml run --service-ports tm-web bash
+```
diff --git a/compose/tiler.yml b/compose/tiler.yml
@@ -1,35 +1,35 @@
 services:
-  # db:
-  #   image: ohm-tiler-db:v1
-  #   build:
-  #     context: ../images/tiler-db
-  #     dockerfile: Dockerfile
-  #   ports:
-  #     - "5432:5432"
-  #   # volumes:
-  #   #   - ../data/tiler-db-data2:/var/lib/postgresql/data
-  #   env_file:
-  #     - ../envs/.env.tiler
-  #   restart: always
-  #   networks:
-  #     - tiler_network
+  db:
+    image: ohm-tiler-db:v1
+    build:
+      context: ../images/tiler-db
+      dockerfile: Dockerfile
+    ports:
+      - "5432:5432"
+    # volumes:
+    #   - ../data/tiler-db-data2:/var/lib/postgresql/data
+    env_file:
+      - ../envs/.env.tiler
+    restart: always
+    networks:
+      - tiler_network
 
-  # imposm:
-  #   image: rub21/tiler-imposm:v16
-  #   build:
-  #     context: ../images/tiler-imposm
-  #     dockerfile: Dockerfile
-  #   # volumes:
-  #   #   - ../data/tiler-imposm-data2:/mnt/data
-  #     # - ../images/tiler-imposm:/osm
-  #   command:
-  #     - sh
-  #     - -c
-  #     - "./start.sh"
-  #   env_file:
-  #     - ../envs/.env.tiler
-  #   networks:
-  #     - tiler_network
+  imposm:
+    image: rub21/tiler-imposm:v16
+    build:
+      context: ../images/tiler-imposm
+      dockerfile: Dockerfile
+    # volumes:
+    #   - ../data/tiler-imposm-data2:/mnt/data
+      # - ../images/tiler-imposm:/osm
+    command:
+      - sh
+      - -c
+      - "./start.sh"
+    env_file:
+      - ../envs/.env.tiler
+    networks:
+      - tiler_network
 
   tiler:
     image: ohm-tiler-server:v1
@@ -47,6 +47,20 @@ services:
     networks:
       - tiler_network
 
+  tiler-cache:
+    image: ohm-tiler-cache:v1
+    build:
+      context: ../images/tiler-cache
+      dockerfile: Dockerfile
+    volumes:
+      - ../images/tiler-cache:/app
+
+    env_file:
+      - ../envs/.env.tiler
+    restart: always
+    networks:
+      - tiler_network
+
 networks:
   tiler_network:
     driver: bridge
diff --git a/compose/tm.yml b/compose/tm.yml
@@ -10,7 +10,7 @@ services:
       - ../envs/.env.tiler
     restart: always
   tm-web:
-    image: node:16
+    image: node:18
     ports:
       - "3000:3000"
     env_file:

diff --git a/images/tiler-server/cache_cleaner.sh b/images/tiler-server/cache_cleaner.sh
diff --git a/images/tiler-server/expire-watcher.sh b/images/tiler-server/expire-watcher.sh
diff --git a/images/tiler-server/purge_and_seed.sh b/images/tiler-server/purge_and_seed.sh
diff --git a/images/tiler-server/rm_tegola_ps.sh b/images/tiler-server/rm_tegola_ps.sh
diff --git a/images/tiler-server/seed-by-diffs.sh b/images/tiler-server/seed-by-diffs.sh
diff --git a/images/tiler-server/tile2bounds.py b/images/tiler-server/tile2bounds.py
diff --git a/images/tiler-server/tile_cache_downloader.sh b/images/tiler-server/tile_cache_downloader.sh
diff --git a/ohm/templates/tiler-cache-purge/deployment.yaml b/ohm/templates/tiler-cache-purge/deployment.yaml
@@ -39,7 +39,7 @@ spec:
             - name: SQS_QUEUE_URL
               value: {{  .Values.ohm.tilerCachePurge.env.SQS_QUEUE_URL | quote }}
             - name: DOCKER_IMAGE
-              value: "{{ .Values.tilerServer.image.name }}:{{ .Values.tilerServer.image.tag }}"
+              value: "{{ .Values.osm-seed.tilerServer.image.name }}:{{ .Values.osm-seed.tilerServer.image.tag }}"
             - name: NODEGROUP_TYPE
               value: {{ .Values.ohm.tilerCachePurge.env.NODEGROUP_TYPE | quote }}
             - name: MAX_ACTIVE_JOBS