From a729cdec439f525ebae92fe5719ccca485258103 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20de=20la=20Pe=C3=B1a?= Date: Tue, 11 Feb 2020 11:10:32 +0100 Subject: [PATCH] chore: Use kibana's Node version for tests --- .ci/end2end.groovy | 2 +- x-pack/legacy/plugins/apm/e2e/ci/Dockerfile | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.ci/end2end.groovy b/.ci/end2end.groovy index 8ddded4f5ef2b..8ad810717d86e 100644 --- a/.ci/end2end.groovy +++ b/.ci/end2end.groovy @@ -107,7 +107,7 @@ pipeline { dir("${BASE_DIR}"){ sh ''' jobs -l - docker build --tag cypress ${CYPRESS_DIR}/ci + docker build --tag cypress --build-arg NODE_VERSION=$(cat .node-version) ${CYPRESS_DIR}/ci docker run --rm -t --user "$(id -u):$(id -g)" \ -v `pwd`:/app --network="host" \ --name cypress cypress''' diff --git a/x-pack/legacy/plugins/apm/e2e/ci/Dockerfile b/x-pack/legacy/plugins/apm/e2e/ci/Dockerfile index 1f0a867b4225b..2bcc5a5fd843a 100644 --- a/x-pack/legacy/plugins/apm/e2e/ci/Dockerfile +++ b/x-pack/legacy/plugins/apm/e2e/ci/Dockerfile @@ -1,4 +1,5 @@ -FROM node:10.19.0 +ARG NODE_VERSION +FROM node:$NODE_VERSION RUN apt-get -qq update \ && apt-get -y -qq install xvfb \