From a1a79965250931c407a6cdc30c460407775975bb Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Tue, 21 Jan 2020 10:52:06 -0500 Subject: [PATCH 1/2] Major node upgrade node to the last LTE: 12.14.1 --- .circleci/config.yml | 2 +- Dockerfile | 2 +- Dockerfile-dev | 2 +- Dockerfile-test-acceptance | 8 ++++---- package.json | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index a3c92e5..8ccf16d 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -5,7 +5,7 @@ jobs: build: <<: &docker_node docker: - - image: circleci/node:10.16.0-stretch + - image: circleci/node:12.14.1-stretch working_directory: ~/repo steps: - checkout diff --git a/Dockerfile b/Dockerfile index 995af58..fd8c017 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # https://hub.docker.com/_/node/ -FROM node:10.16.0-alpine +FROM node:12.14.1-alpine ARG VCS_REF=not_ci LABEL org.label-schema.description="PagerDuty on-call dashboard widget" \ org.label-schema.name="PagerBeauty" \ diff --git a/Dockerfile-dev b/Dockerfile-dev index 900a1d1..ff6f227 100644 --- a/Dockerfile-dev +++ b/Dockerfile-dev @@ -1,5 +1,5 @@ # https://hub.docker.com/_/node/ -FROM node:10.16.0-alpine +FROM node:12.14.1-alpine ARG VCS_REF=not_ci LABEL org.label-schema.description="PagerDuty on-call dashboard widget" \ org.label-schema.name="PagerBeauty" \ diff --git a/Dockerfile-test-acceptance b/Dockerfile-test-acceptance index c802154..edcfd44 100644 --- a/Dockerfile-test-acceptance +++ b/Dockerfile-test-acceptance @@ -1,5 +1,5 @@ # https://hub.docker.com/_/node/ -FROM node:10.16.0-alpine +FROM node:12.14.1-alpine ARG VCS_REF=not_ci LABEL org.label-schema.description="PagerDuty on-call dashboard widget" \ org.label-schema.name="PagerBeauty" \ @@ -34,9 +34,9 @@ RUN yarn install --frozen-lockfile # ---------- Acceptance test image from here # https://github.com/GoogleChrome/puppeteer/blob/master/docs/troubleshooting.md -# Installs latest Chromium 72.0.3626.121-r0 available in Apline 3.9: -# Alpine: https://github.com/nodejs/docker-node/blob/170ed2/10/alpine/Dockerfile -# Chromium: https://pkgs.alpinelinux.org/package/v3.9/community/x86_64/chromium +# Installs latest Chromium 79.0.3945.88-r0 available in Apline 3.11: +# Alpine: https://github.com/nodejs/docker-node/blob/8b8ee/12/alpine3.11/Dockerfile +# Chromium: https://pkgs.alpinelinux.org/package/v3.11/community/x86_64/chromium RUN apk update && apk upgrade && \ apk add --no-cache \ chromium diff --git a/package.json b/package.json index 8958ba9..8ddfba4 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "main": "./src/pagerbeauty", "module": "./src/pagerbeauty", "engines": { - "node": "^10.14.0", + "node": "^12.14.0", "npm": "^6.4.1", "yarn": "^1.12.0" }, From 33182c68235fa451285c05ae5f9a18acc878d82b Mon Sep 17 00:00:00 2001 From: Sergii Tkachenko Date: Tue, 21 Jan 2020 11:09:18 -0500 Subject: [PATCH 2/2] Sync npm and yarn with Docker --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index 8ddfba4..d5996d1 100644 --- a/package.json +++ b/package.json @@ -9,8 +9,8 @@ "module": "./src/pagerbeauty", "engines": { "node": "^12.14.0", - "npm": "^6.4.1", - "yarn": "^1.12.0" + "npm": "^6.13.1", + "yarn": "^1.21.1" }, "scripts": { "test": "npm run test:unit",