Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update node and osrm #35

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update node and osrm #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: 2
jobs:
deploy-stage:
docker:
- image: circleci/node:6
- image: circleci/node:8
working_directory: ~/repo

environment:
Expand Down Expand Up @@ -40,7 +40,7 @@ jobs:

deploy-vt-prod:
docker:
- image: circleci/node:6
- image: circleci/node:8
working_directory: ~/repo

environment:
Expand Down Expand Up @@ -97,7 +97,7 @@ jobs:

deploy-analysis-prod:
docker:
- image: circleci/node:6
- image: circleci/node:8
working_directory: ~/repo

environment:
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ docker build -t ram-analysis .
## Releasing a new version
The process to release a new version:

- still on `develop`, bump the version in `./ram-tools/package.json` and/or `./ram-analysis/package.json`
- still on `develop`, bump the version in `./ram-vt/package.json` and/or `./ram-analysis/package.json`
- set up PR, have somebody do a review and merge `develop` into `master`
- CircleCI will add a new tag to git using the version in `package.json`
Because this repo holds two containers that are independently versioned, the git tags are prepended with the container name (eg. `ram-vt-v0.1.0`)
Expand Down
1 change: 1 addition & 0 deletions ram-analysis/.nvmrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
v8.11
1 change: 0 additions & 1 deletion ram-analysis/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ var missing = [

if (missing.length) {
throw new Error(`Missing env vars on ram-analysis: ${missing.join(', ')}`);
process.exit(1);
}

// ^ END CHECKS
Expand Down
4 changes: 2 additions & 2 deletions ram-analysis/local-run.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ then
echo "disk=/var/tmp/stxxl,2500,memory" > ./conversion/.stxxl
ln -s ../node_modules/osrm/profiles/lib/ ./conversion/lib

export 'DB_URI=postgresql://ram:ram@172.17.0.1:5432/ram'
export 'DB_URI=postgresql://ram:ram@localhost:5432/ram'
export "PROJECT_ID=$PROJECT_ID"
export "SCENARIO_ID=$SCENARIO_ID"
export 'STORAGE_HOST=172.17.0.1'
export 'STORAGE_HOST=localhost'
export 'STORAGE_PORT=9000'
export 'STORAGE_ENGINE=minio'
export 'STORAGE_ACCESS_KEY=minio'
Expand Down
4 changes: 2 additions & 2 deletions ram-analysis/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "ram-analysis",
"version": "0.1.1",
"version": "0.2.0",
"description": "",
"main": "index.js",
"scripts": {
Expand All @@ -24,7 +24,7 @@
"knex": "^0.12.7",
"lodash.kebabcase": "^4.1.1",
"minio": "^3.1.3",
"osrm": "5.6.4",
"osrm": "5.19.0",
"pg": "^6.1.2"
},
"devDependencies": {
Expand Down
Loading