Skip to content
This repository has been archived by the owner on Mar 19, 2024. It is now read-only.

Commit

Permalink
Merge pull request #172 from nhsuk/fix/docker-python-version
Browse files Browse the repository at this point in the history
Fix Docker python version and update npm dependencies
  • Loading branch information
st3v3nhunt committed May 17, 2019
2 parents e8a579b + 5784538 commit 0b9e878
Show file tree
Hide file tree
Showing 5 changed files with 1,381 additions and 745 deletions.
3 changes: 2 additions & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
language: node_js
node_js: "9"
node_js:
- "lts/*"
services: docker

before_install: yarn global add greenkeeper-lockfile@1
Expand Down
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
0.21.1 / TBC
===================
- Remove the specific version of python from the Dockerfile
- Update npm dependencies
- Use the LTS version of node in travis CI

0.21.0 / 2019-03-20
===================
- Update npm dependencies
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
FROM node:10.15.3-alpine

RUN apk add --no-cache python=2.7.15-r3 git-perl bash make gcc g++
RUN apk add --no-cache python git-perl bash make gcc g++
RUN rm /bin/sh && ln -s /bin/bash /bin/sh
ENV USERNAME nodeuser

Expand Down
34 changes: 17 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "sexual-health-service-finder",
"version": "0.21.0",
"version": "0.21.1",
"description": "Helping to connect people to sexual health services.",
"main": "app.js",
"scripts": {
Expand Down Expand Up @@ -57,21 +57,21 @@
"after-brunch": "^0.0.5",
"babel-brunch": "^6.1.1",
"babel-preset-env": "^1.7.0",
"body-parser": "^1.18.2",
"body-parser": "^1.19.0",
"brunch": "^2.10.16",
"compression": "^1.7.1",
"compression": "^1.7.4",
"cookie-parser": "^1.4.3",
"express": "^4.16.2",
"express-prom-bundle": "^5.0.2",
"fingerprint-brunch": "^2.0.5",
"express": "^4.17.0",
"express-prom-bundle": "^5.1.5",
"fingerprint-brunch": "^2.0.6",
"google-libphonenumber": "^3.2.2",
"helmet": "^3.11.0",
"helmet": "^3.18.0",
"map-replace": "^1.0.2",
"moment": "^2.22.0",
"nhsuk-bunyan-logger": "^1.7.0",
"node-sass": "^4.10.0",
"node-sass": "^4.12.0",
"nunjucks": "^3.2.0",
"prom-client": "^11.2.1",
"prom-client": "^11.3.0",
"querystring": "^0.2.0",
"request-promise-native": "^1.0.5",
"require-environment-variables": "^1.2.0",
Expand All @@ -81,22 +81,22 @@
},
"devDependencies": {
"chai": "^4.1.2",
"chai-http": "^4.2.1",
"cheerio": "^1.0.0-rc.2",
"chai-http": "^4.3.0",
"cheerio": "^1.0.0-rc.3",
"coveralls": "^3.0.0",
"destroy": "^1.0.4",
"eslint": "^5.0.1",
"eslint": "^5.16.0",
"eslint-config-airbnb": "^17.0.0",
"eslint-config-airbnb-base": "^13.0.0",
"eslint-config-nhsuk": "^0.16.0",
"eslint-plugin-import": "^2.16.0",
"eslint-plugin-import": "^2.17.2",
"eslint-plugin-json": "^1.3.2",
"eslint-plugin-mocha": "^5.3.0",
"eslint-watch": "^5.0.1",
"husky": "^1.0.1",
"eslint-watch": "^5.1.2",
"husky": "^2.3.0",
"istanbul": "^1.1.0-alpha.1",
"mocha": "^6.0.2",
"mocha": "^6.1.4",
"nock": "^10.0.6",
"nodemon": "^1.18.7"
"nodemon": "^1.19.0"
}
}
Loading

0 comments on commit 0b9e878

Please sign in to comment.