From a5c03b1772ad7083e223cb20204836273efc20eb Mon Sep 17 00:00:00 2001 From: Arve Knudsen Date: Mon, 12 Oct 2020 07:10:50 +0200 Subject: [PATCH] Chore: Upgrade Node to 12.19.0 (#28168) Signed-off-by: Arve Knudsen --- Dockerfile | 2 +- Dockerfile.ubuntu | 2 +- package.json | 2 +- .../docker/grafana-plugin-ci-e2e/scripts/deploy.sh | 4 ++-- scripts/build/ci-build/Dockerfile | 2 +- scripts/build/ci-e2e/Dockerfile | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 7dc1d1a7ab1..9635f0953a4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.18.3-alpine3.12 as js-builder +FROM node:12.19.0-alpine3.12 as js-builder WORKDIR /usr/src/app/ diff --git a/Dockerfile.ubuntu b/Dockerfile.ubuntu index 898f3c507c5..195d3b9289b 100644 --- a/Dockerfile.ubuntu +++ b/Dockerfile.ubuntu @@ -1,4 +1,4 @@ -FROM node:12.18.3-slim AS js-builder +FROM node:12.19.0-slim AS js-builder WORKDIR /usr/src/app/ diff --git a/package.json b/package.json index 2a7a23af508..140283c8376 100644 --- a/package.json +++ b/package.json @@ -312,6 +312,6 @@ "node": ">=12 <13" }, "volta": { - "node": "12.18.4" + "node": "12.19.0" } } diff --git a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh index e961830b07d..d77f6177c27 100755 --- a/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh +++ b/packages/grafana-toolkit/docker/grafana-plugin-ci-e2e/scripts/deploy.sh @@ -5,9 +5,9 @@ source "/etc/profile" source "./deploy-slim.sh" source "./deploy-common.sh" -NODEVER="v12.18.3-linux-x64" +NODEVER="v12.19.0-linux-x64" # Install Node -wget -O - "https://nodejs.org/dist/v12.18.3/node-${NODEVER}.tar.xz" | tar Jvxf - -C "/tmp" +wget -O - "https://nodejs.org/dist/v12.19.0/node-${NODEVER}.tar.xz" | tar Jvxf - -C "/tmp" # Move node to /usr/local so it's in the path pushd /tmp/node-${NODEVER} diff --git a/scripts/build/ci-build/Dockerfile b/scripts/build/ci-build/Dockerfile index 43eb757f555..7c784821fa4 100644 --- a/scripts/build/ci-build/Dockerfile +++ b/scripts/build/ci-build/Dockerfile @@ -88,7 +88,7 @@ FROM debian:stretch-20200908 ENV GOVERSION=1.15.1 \ PATH=/usr/local/go/bin:$PATH \ GOPATH=/go \ - NODEVERSION=12.18.4-1nodesource1 \ + NODEVERSION=12.19.0-1nodesource1 \ YARNVERSION=1.22.5-1 \ GO111MODULE=on diff --git a/scripts/build/ci-e2e/Dockerfile b/scripts/build/ci-e2e/Dockerfile index dfec25521dc..6423ee79dea 100644 --- a/scripts/build/ci-e2e/Dockerfile +++ b/scripts/build/ci-e2e/Dockerfile @@ -1,4 +1,4 @@ -FROM node:12.18-buster-slim +FROM node:12.19.0-buster-slim WORKDIR /root