From 377ffd36cd6521bb4326af71890c38a85ddc4644 Mon Sep 17 00:00:00 2001
From: Alex Bishop <alexbishop1@users.noreply.github.com>
Date: Fri, 19 Jun 2020 14:21:33 +0100
Subject: [PATCH] PP-6622 Upgrade to Node.js 12.18.1

Update to new minor Node.js version:

https://hub.docker.com/layers/node/library/node/12.18.1-alpine3.12/images/sha256-5f5cb21e96ad6ad28b6d2c1c2d5d9f3ec1a4c96ff8e130ab7d934f8e3034339c

This upgrades us to Alpine Linux 3.12, which per
https://www.alpinelinux.org/posts/Alpine-3.12.0-released.html
renames the python package to python2.
---
 .nvmrc       | 2 +-
 .travis.yml  | 2 +-
 Dockerfile   | 5 +++--
 package.json | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.nvmrc b/.nvmrc
index 685332623..3b6a447a0 100644
--- a/.nvmrc
+++ b/.nvmrc
@@ -1 +1 @@
-12.2.0
+12.18.1
diff --git a/.travis.yml b/.travis.yml
index cb3792954..b45b789d3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 language: node_js
 node_js:
-  - 12.2.0
+  - 12.18.1
 
 addons:
   apt:
diff --git a/Dockerfile b/Dockerfile
index 0de7c0e95..ac48760ed 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -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
@@ -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
diff --git a/package.json b/package.json
index d81ae6141..bb229ad0c 100644
--- a/package.json
+++ b/package.json
@@ -5,7 +5,7 @@
   "private": true,
   "license": "MIT",
   "engines": {
-    "node": "^12.11.1"
+    "node": "^12.18.1"
   },
   "standard": {
     "globals": [