Skip to content

Commit

Permalink
Merge pull request #861 from alphagov/PP-6622_upgrade_docker_image_to…
Browse files Browse the repository at this point in the history
…_node_12.18.1

PP-6622 Upgrade to Node.js 12.18.1
  • Loading branch information
alexbishop1 authored Jun 19, 2020
2 parents d4548db + 377ffd3 commit c1c44ce
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
12.2.0
12.18.1
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
language: node_js
node_js:
- 12.2.0
- 12.18.1

addons:
apt:
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
FROM node@sha256:2ab3d9a1bac67c9b4202b774664adaa94d2f1e426d8d28e07bf8979df61c8694
# Digest of image e.g. node:12.18.1-alpine3.12 for linux/amd64 from tags list on https://hub.docker.com/_/node
FROM node@sha256:5f5cb21e96ad6ad28b6d2c1c2d5d9f3ec1a4c96ff8e130ab7d934f8e3034339c

### Needed to run appmetrics and pact-mock-service
COPY sgerrand.rsa.pub /etc/apk/keys/sgerrand.rsa.pub
Expand All @@ -8,7 +9,7 @@ RUN wget https://github.com/sgerrand/alpine-pkg-glibc/releases/download/2.28-r0/

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

RUN ["apk", "add", "--no-cache", "bash", "make", "g++", "python", "git", "ruby"]
RUN ["apk", "add", "--no-cache", "bash", "make", "g++", "python2", "git", "ruby"]

ENV PORT 9000
EXPOSE 9000
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": "^12.11.1"
"node": "^12.18.1"
},
"standard": {
"globals": [
Expand Down

0 comments on commit c1c44ce

Please sign in to comment.