Skip to content

Commit

Permalink
resolve secure-tunnel to 0.6.0 and use latest node lts
Browse files Browse the repository at this point in the history
  • Loading branch information
jmhooper committed Dec 4, 2017
1 parent 0a10e4a commit 34bd40b
Show file tree
Hide file tree
Showing 5 changed files with 53 additions and 821 deletions.
4 changes: 2 additions & 2 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@ jobs:
- run:
name: Test Setup
command: |
yarn --ignore-engines install
yarn --ignore-engines build
yarn install
yarn build
cp config/application.yml.example config/application.yml
cp certs/saml.crt.example certs/saml.crt
cp keys/saml.key.enc.example keys/saml.key.enc
Expand Down
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ RUN apt-get install apt-transport-https
# npm and yarn is needed by webpacker to install packages
# TOOD(sbc): Create a separate production container without this.
RUN mkdir /usr/local/node \
&& curl -L https://nodejs.org/dist/v4.8.4/node-v4.8.4-linux-x64.tar.xz | tar Jx -C /usr/local/node --strip-components=1
&& curl -L https://nodejs.org/dist/v8.9.1/node-v8.9.1-linux-x64.tar.xz | tar Jx -C /usr/local/node --strip-components=1
RUN ln -s ../node/bin/node /usr/local/bin/
RUN ln -s ../node/bin/npm /usr/local/bin/
RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
Expand All @@ -30,8 +30,8 @@ RUN ln -s ../phantomjs/bin/phantomjs /usr/local/bin/
WORKDIR /upaya

COPY package.json /upaya
RUN yarn --ignore-engines install
RUN yarn --ignore-engines build
RUN yarn install
RUN yarn build

COPY Gemfile /upaya
COPY Gemfile.lock /upaya
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ A Identity Management System powering login.gov.
- Ruby 2.3
- [Postgresql](http://www.postgresql.org/download/)
- [Redis 2.8+](http://redis.io/)
- [Node.js v4.4.x](https://nodejs.org)
- [Node.js v8.x.x](https://nodejs.org)

Testing dependencies:
- [PhantomJS](http://phantomjs.org)
Expand Down
10 changes: 6 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@
"version": "0.0.1",
"private": true,
"engines": {
"node": "~4.x.x",
"npm": "~3.x.x"
"node": "~8.x.x",
"npm": "~5.x.x"
},
"scripts": {
"build": "true",
Expand Down Expand Up @@ -32,7 +32,9 @@
"eslint-config-airbnb-base": "^11.2.0",
"eslint-plugin-import": "^2.2.0",
"mocha": "^4.0.1",
"proxyquire": "^1.8.0",
"webpack-dev-server": "^2.9.5"
"proxyquire": "^1.8.0"
},
"resolutions": {
"tunnel-agent": "0.6.0"
}
}
Loading

0 comments on commit 34bd40b

Please sign in to comment.