Skip to content

Commit

Permalink
CAMEL-11500: for PnP to work we need Yarn 13+
Browse files Browse the repository at this point in the history
Yarn 13+ patches `resolve` module to resolve from PnP[1].

[1] yarnpkg/yarn#6816
  • Loading branch information
zregvart committed Jan 4, 2019
1 parent 2778903 commit 886eb85
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 11 deletions.
13 changes: 13 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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
13 changes: 2 additions & 11 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* under the License.
*/
def NODE = 'git-websites'
def NODE_IMAGE = 'circleci/node:11-browsers'

pipeline {
agent {
Expand All @@ -42,11 +41,7 @@ pipeline {
stages {
stage('Theme') {
agent {
docker {
label "$NODE"
image "$NODE_IMAGE"
reuseNode true
}
dockerfile true
}

steps {
Expand All @@ -57,11 +52,7 @@ pipeline {

stage('Website') {
agent {
docker {
label "$NODE"
image "$NODE_IMAGE"
reuseNode true
}
dockerfile true
}

steps {
Expand Down

0 comments on commit 886eb85

Please sign in to comment.