Browse Source

Update to match changes in other projects

na-disable_fielddata_es5_support_es2
Julian Simioni 6 years ago
parent
commit
2725e634b8
No known key found for this signature in database
GPG Key ID: B9EEB0C6EE0910A1
  1. 29
      projects/north-america/docker-compose.yml
  2. 2
      projects/north-america/pelias.json

29
projects/north-america/docker-compose.yml

@ -2,25 +2,17 @@ version: '3'
networks: networks:
default: default:
driver: bridge driver: bridge
volumes:
libpostaldata:
driver: local
services: services:
libpostal_baseimage:
image: pelias/libpostal_baseimage
container_name: pelias_libpostal_baseimage
libpostal: libpostal:
image: pelias/go-whosonfirst-libpostal image: pelias/libpostal-service
container_name: pelias_libpostal container_name: pelias_libpostal
restart: always restart: always
ports: [ "8080:8080" ] ports: [ "4400:4400" ]
schema: schema:
image: pelias/schema:build-2018-08 image: pelias/schema:master
container_name: pelias_schema container_name: pelias_schema
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "./synonyms/custom_name.txt:/code/pelias/schema/synonyms/custom_name.txt"
- "./synonyms/custom_street.txt:/code/pelias/schema/synonyms/custom_street.txt"
api: api:
image: pelias/api:master image: pelias/api:master
container_name: pelias_api container_name: pelias_api
@ -29,7 +21,6 @@ services:
ports: [ "4000:4000" ] ports: [ "4000:4000" ]
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "libpostaldata:/usr/share/libpostal"
placeholder: placeholder:
image: pelias/placeholder:master image: pelias/placeholder:master
container_name: pelias_placeholder container_name: pelias_placeholder
@ -46,7 +37,7 @@ services:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
openstreetmap: openstreetmap:
image: pelias/openstreetmap:build-2018-08 image: pelias/openstreetmap:master
container_name: pelias_openstreetmap container_name: pelias_openstreetmap
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
@ -70,7 +61,6 @@ services:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
interpolation: interpolation:
depends_on: [ "libpostal_baseimage" ]
image: pelias/interpolation:master image: pelias/interpolation:master
container_name: pelias_interpolation container_name: pelias_interpolation
restart: always restart: always
@ -78,10 +68,9 @@ services:
ports: [ "4300:4300" ] ports: [ "4300:4300" ]
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "libpostaldata:/usr/share/libpostal"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
pip: pip:
image: pelias/pip-service:nodejs10 image: pelias/pip-service:master
container_name: pelias_pip-service container_name: pelias_pip-service
restart: always restart: always
environment: [ "PORT=4200" ] environment: [ "PORT=4200" ]
@ -89,14 +78,6 @@ services:
volumes: volumes:
- "./pelias.json:/code/pelias.json" - "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data" - "${DATA_DIR}:/data"
document-service:
image: pelias/document-service:master
container_name: pelias_document-service
restart: always
ports: [ "5000:5000" ]
volumes:
- "./pelias.json:/code/pelias.json"
- "${DATA_DIR}:/data"
elasticsearch: elasticsearch:
image: pelias/elasticsearch image: pelias/elasticsearch
container_name: pelias_elasticsearch container_name: pelias_elasticsearch

2
projects/north-america/pelias.json

@ -22,7 +22,7 @@
"textAnalyzer": "libpostal", "textAnalyzer": "libpostal",
"services": { "services": {
"pip": { "url": "http://pip:4200" }, "pip": { "url": "http://pip:4200" },
"libpostal": { "url": "http://libpostal:8080" }, "libpostal": { "url": "http://libpostal:4400" },
"placeholder": { "url": "http://placeholder:4100" }, "placeholder": { "url": "http://placeholder:4100" },
"interpolation": { "url": "http://interpolation:4300" } "interpolation": { "url": "http://interpolation:4300" }
} }

Loading…
Cancel
Save