Skip to content

Commit 7bf401e

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 1937093 commit 7bf401e

File tree

3 files changed

+30
-5
lines changed

3 files changed

+30
-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: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
FROM node:lts-stretch
2+
3+
ENV YARN_VERSION 1.13.0
4+
5+
RUN set -ex \
6+
&& apt-get update \
7+
&& apt-get install -y --no-install-recommends \
8+
libasound2 \
9+
libatk-bridge2.0-0 \
10+
libgtk-3-0 \
11+
libnss3 \
12+
libx11-xcb1 \
13+
libxss1 \
14+
libxtst6 \
15+
&& rm -rf /var/lib/apt/lists/*
16+
17+
RUN set -ex \
18+
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz" \
19+
&& curl -fsSLO --compressed "https://yarnpkg.com/downloads/$YARN_VERSION/yarn-v$YARN_VERSION.tar.gz.asc" \
20+
&& gpg --batch --verify yarn-v$YARN_VERSION.tar.gz.asc yarn-v$YARN_VERSION.tar.gz \
21+
&& mkdir -p /opt \
22+
&& tar -xzf yarn-v$YARN_VERSION.tar.gz -C /opt/ \
23+
&& ln -fs /opt/yarn-v$YARN_VERSION/bin/yarn /usr/local/bin/yarn \
24+
&& ln -fs /opt/yarn-v$YARN_VERSION/bin/yarnpkg /usr/local/bin/yarnpkg \
25+
&& 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)