From 886eb8531bd34ebf4040fa80c5bd60737473c7e8 Mon Sep 17 00:00:00 2001
From: Zoran Regvart <zregvart@apache.org>
Date: Fri, 4 Jan 2019 13:15:52 +0100
Subject: [PATCH] CAMEL-11500: for PnP to work we need Yarn 13+

Yarn 13+ patches `resolve` module to resolve from PnP[1].

[1] https://github.com/yarnpkg/yarn/pull/6816
---
 Dockerfile  | 13 +++++++++++++
 Jenkinsfile | 13 ++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)
 create mode 100644 Dockerfile

diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 000000000000..dea5f5588c78
--- /dev/null
+++ b/Dockerfile
@@ -0,0 +1,13 @@
+FROM node:lts-stretch
+
+ENV YARN_VERSION 1.13.0
+
+RUN set -ex \
+  && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
+  && curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
+  && gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
+  && mkdir -p /opt \
+  && tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
+  && ln -fs /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
+  && ln -fs /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
+&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz
diff --git a/Jenkinsfile b/Jenkinsfile
index e7f5010b261a..5699f62fd3a5 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -17,7 +17,6 @@
  * under the License.
  */
 def NODE = 'git-websites'
-def NODE_IMAGE = 'circleci/node:11-browsers'
 
 pipeline {
     agent {
@@ -42,11 +41,7 @@ pipeline {
     stages {
         stage('Theme') {
             agent {
-                docker {
-                    label "$NODE"
-                    image "$NODE_IMAGE"
-                    reuseNode true
-                }
+                dockerfile true
             }
 
             steps {
@@ -57,11 +52,7 @@ pipeline {
 
         stage('Website') {
             agent {
-                docker {
-                    label "$NODE"
-                    image "$NODE_IMAGE"
-                    reuseNode true
-                }
+                dockerfile true
             }
 
             steps {