From 09ed78a66cfbc4b9fa17a631cf989bca58c7c013 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Mon, 3 Feb 2020 15:10:57 +0200 Subject: [PATCH 1/3] Update dependencies and engines (es7, nodejs 10) --- Dockerfile | 2 +- build-docker-image.sh | 16 ---------------- package.json | 27 ++++++++++++++------------- pelias.json.docker | 2 +- 4 files changed, 16 insertions(+), 31 deletions(-) delete mode 100755 build-docker-image.sh diff --git a/Dockerfile b/Dockerfile index 71ab4929..915d2bf1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:8-jessie +FROM node:10.18-buster ENV PORT=8080 EXPOSE ${PORT} diff --git a/build-docker-image.sh b/build-docker-image.sh deleted file mode 100755 index 196016e9..00000000 --- a/build-docker-image.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash -ORG=hsldevcom -DOCKER_IMAGE=pelias-api - -# Set these environment variables -#DOCKER_TAG= -#DOCKER_EMAIL= -#DOCKER_USER= -#DOCKER_AUTH= - -# Build image -docker build --tag="$ORG/$DOCKER_IMAGE:$DOCKER_TAG" . -docker login -e $DOCKER_EMAIL -u $DOCKER_USER -p $DOCKER_AUTH -docker push $ORG/$DOCKER_IMAGE:$DOCKER_TAG -docker tag $ORG/$DOCKER_IMAGE:$DOCKER_TAG $ORG/$DOCKER_IMAGE:latest -docker push $ORG/$DOCKER_IMAGE:latest diff --git a/package.json b/package.json index a597806e..98cacd34 100644 --- a/package.json +++ b/package.json @@ -33,52 +33,53 @@ "url": "https://github.com/pelias/api/issues" }, "engines": { - "node": ">=8.0.0" + "node": ">=10.0.0" }, "dependencies": { "@mapbox/geojson-extent": "^0.3.1", "addressit": "1.6.0", - "async": "^2.0.0", + "async": "^3.0.1", "check-types": "^7.0.0", - "elasticsearch": "^15.0.0", + "async": "^3.0.1", + "elasticsearch": "^16.0.0", "express": "^4.8.8", "geojson": "^0.5.0", - "geolib": "^2.0.18", - "iso3166-1": "^0.4.2", + "geolib": "^3.0.0", "iso-639-3": "^1.0.0", + "iso3166-1": "^0.4.2", "joi": "^14.0.0", "locale": "^0.1.0", "lodash": "^4.17.4", "markdown": "^0.5.0", "morgan": "^1.8.2", "pelias-categories": "^1.2.0", - "pelias-config": "^3.8.0", + "pelias-config": "^4.5.0", "pelias-labels": "^1.8.0", "pelias-logger": "^1.2.0", "pelias-microservice-wrapper": "^1.7.0", - "pelias-model": "^5.5.2", - "pelias-query": "^9.7.0", + "pelias-model": "^7.0.0", + "pelias-parser": "1.38.0", + "pelias-query": "github:hsldevcom/query", "pelias-sorting": "^1.2.0", "predicates": "^2.0.0", + "regenerate": "^1.4.0", "retry": "^0.12.0", "stable": "^0.1.8", "stats-lite": "^2.0.4", + "pelias-text-analyzer": "github:hsldevcom/pelias-text-analyzer", "through2": "^3.0.0", - "pelias-text-analyzer": "1.9.1", "fuzzy.js": "^0.1.0" }, "devDependencies": { "ciao": "^2.0.0", "difflet": "^1.0.1", "istanbul": "^0.4.2", - "jshint": "^2.5.6", + "jshint": "^2.10.1", "pelias-mock-logger": "^1.3.0", "precommit-hook": "^3.0.0", "proxyquire": "^2.0.0", - "source-map": "^0.7.0", "tap-dot": "^2.0.0", - "tape": "^4.5.1", - "tmp": "^0.0.33" + "tape": "^4.5.1" }, "pre-commit": [ "lint" diff --git a/pelias.json.docker b/pelias.json.docker index 2ac68cbc..9f416873 100644 --- a/pelias.json.docker +++ b/pelias.json.docker @@ -1,6 +1,6 @@ { "esclient": { - "apiVersion": "2.4", + "apiVersion": "6.8", "keepAlive": true, "requestTimeout": "20000", "hosts": [ From 6e3508638e2fe963129149e79289de060e7ff75c Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 5 Feb 2020 15:35:27 +0200 Subject: [PATCH 2/3] Remove unused require --- sanitizer/_text_addressit.js | 1 - 1 file changed, 1 deletion(-) diff --git a/sanitizer/_text_addressit.js b/sanitizer/_text_addressit.js index b4c1011b..c861c95d 100644 --- a/sanitizer/_text_addressit.js +++ b/sanitizer/_text_addressit.js @@ -17,7 +17,6 @@ const addressit = require('addressit'); const _ = require('lodash'); const logger = require('pelias-logger').get('api'); var check = require('check-types'); -var extend = require('extend'); var normalize = require('../helper/stringUtils').normalize; var api = require('pelias-config').generate().api; From 057cccbe8d96bfd98fbe368168316a4c49631556 Mon Sep 17 00:00:00 2001 From: Vesa Meskanen Date: Wed, 5 Feb 2020 15:36:21 +0200 Subject: [PATCH 3/3] Simplify dockerfile hsl-forked deps are directly listed as github repos in package.json. No need to install and link manually. --- Dockerfile | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/Dockerfile b/Dockerfile index 915d2bf1..f3084935 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,39 +18,18 @@ RUN git clone --single-branch https://github.com/vesameskanen/libpostal \ && make install \ && ldconfig -# use our extended query module -ENV QUERY=/opt/pelias/query -WORKDIR ${QUERY} -RUN git clone --single-branch https://github.com/HSLdevcom/query.git \ - && cd query \ - && npm install \ - && npm link - -# use our text-analyzer -ENV TEXT_ANALYZER=/opt/pelias/text-analyzer -WORKDIR ${TEXT_ANALYZER} -RUN git clone --single-branch https://github.com/HSLdevcom/pelias-text-analyzer.git \ - && cd pelias-text-analyzer \ - && npm install \ - && npm link - # Where the app is built and run inside the docker fs ENV WORK=/opt/pelias/api -# Used indirectly for saving npm logs etc. +# Used indirectly for saving yarn logs etc. ENV HOME=/opt/pelias/api WORKDIR ${WORK} ADD . ${WORK} # Build and set permissions for arbitrary non-root user -RUN npm install \ - && npm link pelias-query \ - && npm link pelias-text-analyzer \ - && chmod -R a+rwX . +RUN yarn install && chmod -R a+rwX . ADD pelias.json.docker pelias.json -ADD run.sh /usr/local/bin/ - -CMD /usr/local/bin/run.sh +CMD yarn start