Skip to content

Commit

Permalink
Merge pull request #294 from pelias/staging
Browse files Browse the repository at this point in the history
Merge staging into production
  • Loading branch information
orangejulius authored Mar 20, 2018
2 parents 8777f9c + 7b892ed commit 44bd672
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 8 deletions.
3 changes: 3 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,8 @@ ADD . $WORK
# install npm dependencies
RUN npm install

# Explicitly download metadata (it will not be downloaded automatically in noninteractive sessions)
RUN npm run download_metadata

# run tests
RUN npm test
11 changes: 8 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import.
git clone https://github.com/pelias/geonames
cd geonames
npm install
npm run download_metadata
```

### Configuration
Expand Down Expand Up @@ -80,6 +79,12 @@ The data corresponding to the countryCode in the pelias config file will be down
### Updating Metadata
The metadata is not shipped with the repo, to pull the latest metadata run
The metadata is not shipped with the repo, however, during normal usagage running `npm install` will also trigger a script that updates the metadata.
__However__ this hook will not trigger in non-interactive sessions such as many shell scripts. To explicitly download the metadata or refresh it (it changes very infrequently, perhaps every few months), run:
```
npm run download_metadata
```
`npm run download_metadata`
The metadata _is_ packaged in our Docker images, so using an up to date docker image should guarantee recent enough metadata.
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,12 @@
"csv-parse": "^1.3.3",
"geonames-stream": "^2.0.3",
"lodash": "^4.2.1",
"pelias-config": "2.13.0",
"pelias-config": "2.14.0",
"mkdirp": "^0.5.1",
"pelias-dbclient": "2.3.0",
"pelias-logger": "0.3.0",
"pelias-model": "5.2.0",
"pelias-wof-admin-lookup": "4.4.1",
"pelias-dbclient": "2.4.0",
"pelias-logger": "0.3.1",
"pelias-model": "5.3.2",
"pelias-wof-admin-lookup": "4.5.4",
"request": "^2.34.0",
"through2": "^2.0.1",
"through2-filter": "^2.0.0",
Expand Down

0 comments on commit 44bd672

Please sign in to comment.