Skip to content

Commit

Permalink
PP-5889: bump node version from 8.12.0 to 12.13.1
Browse files Browse the repository at this point in the history
* update Dockerfile base image references
* update referenced Node versions (favour fixed vs. wildcard)
  • Loading branch information
sfount committed Dec 2, 2019
1 parent 393e423 commit 393d280
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 10 deletions.
3 changes: 1 addition & 2 deletions .nvmrc
Original file line number Diff line number Diff line change
@@ -1,2 +1 @@
8.12.0

12.13.1
6 changes: 3 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
FROM alpine@sha256:ea47a59a33f41270c02c8c7764e581787cf5b734ab10d27e876e62369a864459
FROM node@sha256:b556d8910b851c27c5c8922eeb55d94fe6dbaf878d24bf0c9a8c32ba21cd091a

### Needed to run appmetrics and pact-mock-service
ADD sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
RUN ["apk", "--no-cache", "add", "ca-certificates"]
RUN ["apk", "--no-cache", "add", "ca-certificates", "python", "build-base"]
RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && apk add --no-cache glibc-2.28-r0.apk && rm -f glibc-2.28-r0.apk
###

RUN ["apk", "--no-cache", "upgrade"]

RUN ["apk", "add", "--no-cache", "nodejs", "npm", "tini"]
RUN ["apk", "add", "--no-cache", "tini"]

ADD package.json /tmp/package.json
ADD package-lock.json /tmp/package-lock.json
Expand Down
10 changes: 6 additions & 4 deletions docker/build_and_test.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM govukpay/nodejs:alpine-3.8
FROM node@sha256:b556d8910b851c27c5c8922eeb55d94fe6dbaf878d24bf0c9a8c32ba21cd091a

RUN apk update &&\
apk upgrade &&\
apk add --update bash ruby
### Needed to run appmetrics and pact-mock-service
ADD sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
RUN ["apk", "--no-cache", "add", "ca-certificates", "python", "build-base", "bash", "ruby"]
RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/glibc-2.28-r0.apk && apk add --no-cache glibc-2.28-r0.apk && rm -f glibc-2.28-r0.apk
###

# add package.json before source for node_module cache layer
ADD package.json /tmp/package.json
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"private": true,
"license": "MIT",
"engines": {
"node": ">8.12.0"
"node": "12.13.1"
},
"standard": {
"globals": [
Expand Down
2 changes: 2 additions & 0 deletions start.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
var fileOptions = { encoding: 'utf-8' }
var pid

logger.info(`[process.version=${process.version}] [NODE_VERSION=${process.env.NODE_VERSION}]`)

/**
* throng is a wrapper around node cluster
* https://github.com/hunterloftis/throng
Expand Down

0 comments on commit 393d280

Please sign in to comment.