Skip to content

Commit 9ff97d3

Browse files
committed
CAMEL-11500: for PnP to work we need Yarn 13+
Yarn 13+ patches `resolve` module to resolve from PnP[1]. [1] yarnpkg/yarn#6816
1 parent 2778903 commit 9ff97d3

File tree

3 files changed

+18
-5
lines changed

3 files changed

+18
-5
lines changed

.dockerignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/*

Dockerfile

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
FROM node:lts-stretch
2+
3+
ENV YARN_VERSION 1.13.0
4+
5+
RUN set -ex \
6+
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
7+
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
8+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
9+
&& mkdir -p /opt \
10+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
11+
&& ln -fs /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
12+
&& ln -fs /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
13+
&& rm yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz

Jenkinsfile

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
* under the License.
1818
*/
1919
def NODE = 'git-websites'
20-
def NODE_IMAGE = 'circleci/node:11-browsers'
2120

2221
pipeline {
2322
agent {
@@ -42,9 +41,9 @@ pipeline {
4241
stages {
4342
stage('Theme') {
4443
agent {
45-
docker {
44+
dockerfile {
45+
dir 'camel-website'
4646
label "$NODE"
47-
image "$NODE_IMAGE"
4847
reuseNode true
4948
}
5049
}
@@ -57,9 +56,9 @@ pipeline {
5756

5857
stage('Website') {
5958
agent {
60-
docker {
59+
dockerfile {
60+
dir 'camel-website'
6161
label "$NODE"
62-
image "$NODE_IMAGE"
6362
reuseNode true
6463
}
6564
}

0 commit comments

Comments
 (0)