From cf9c368df080acfb13653df833d755488b1fa05b Mon Sep 17 00:00:00 2001 From: Rub21 Date: Fri, 5 Jul 2024 16:53:36 -0500 Subject: [PATCH] Update container for tiler --- compose/tiler.yml | 64 +++++++++++++++------------------- images/tiler-server/Dockerfile | 3 -- 2 files changed, 29 insertions(+), 38 deletions(-) diff --git a/compose/tiler.yml b/compose/tiler.yml index 5f676b40..b3124f50 100644 --- a/compose/tiler.yml +++ b/compose/tiler.yml @@ -18,49 +18,43 @@ services: # # ###################################################### # # ### Tiler imposm for importing data # # ###################################################### - tiler-imposm: - image: osmseed-tiler-imposm:v1 - build: - context: ../images/tiler-imposm - dockerfile: Dockerfile - volumes: - - ../data/tiler-imposm-data:/mnt/data - # - ../images/tiler-imposm:/osm - command: - - sh - - -c - - "./start.sh" - env_file: - - ../envs/.env.tiler-db - - ../envs/.env.tiler-imposm - healthcheck: - test: ["CMD", "./liveness.sh"] - interval: 30s - timeout: 10s - retries: 3 - restart: always + # tiler-imposm: + # image: osmseed-tiler-imposm:v1 + # build: + # context: ../images/tiler-imposm + # dockerfile: Dockerfile + # volumes: + # - ../data/tiler-imposm-data:/mnt/data + # # - ../images/tiler-imposm:/osm + # command: + # - sh + # - -c + # - "./start.sh" + # env_file: + # - ../envs/.env.tiler-db + # - ../envs/.env.tiler-imposm + # healthcheck: + # test: ["CMD", "./liveness.sh"] + # interval: 30s + # timeout: 10s + # retries: 3 + # restart: always # # ###################################################### # # ### Tiler server # # ###################################################### tiler-server: image: osmseed-tiler-server:v1 + # platform: linux/amd64 build: context: ../images/tiler-server dockerfile: Dockerfile volumes: - - ../images/tiler-server:/app - - ../data/tiler-imposm-data:/mnt/data/imposm - depends_on: - - tiler-db - - tiler-imposm + - ../images/tiler-server:/app + - ../data/tiler-imposm-data:/mnt/data/imposm ports: - - "9090:9090" - command: - - sh - - -c - - "./start.sh" + - "9090:9090" + command: "./start.sh" env_file: - - ../envs/.env.tiler-db - - ../envs/.env.tiler-server - restart: always - \ No newline at end of file + - ../envs/.env.tiler-db + - ../envs/.env.tiler-server + restart: always \ No newline at end of file diff --git a/images/tiler-server/Dockerfile b/images/tiler-server/Dockerfile index 382516ee..ce77ee72 100644 --- a/images/tiler-server/Dockerfile +++ b/images/tiler-server/Dockerfile @@ -29,10 +29,7 @@ RUN cd /opt/ && python build_config.py \ --providers config/providers \ --output /opt/tegola_config/config.toml -# Volumen -VOLUME /mnt/data # Copy config and exec files -COPY ./config/config.toml /opt/tegola_config/config.toml COPY ./tile2bounds.py . COPY ./start.sh . COPY ./expire-watcher.sh .