You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by zr...@apache.org on 2019/01/04 12:16:01 UTC
[camel-website] 02/02: CAMEL-11500: for PnP to work we need Yarn 13+
This is an automated email from the ASF dual-hosted git repository.
zregvart pushed a commit to branch pnp
in repository https://gitbox.apache.org/repos/asf/camel-website.git
commit d4f2bbea561529505ba65cc7699d188ecd44c8ec
Author: Zoran Regvart <zr...@apache.org>
AuthorDate: Fri Jan 4 13:15:52 2019 +0100
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 | 5 ++---
2 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
new file mode 100644
index 0000000..dea5f55
--- /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 e7f5010..d336e32 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,9 +41,9 @@ pipeline {
stages {
stage('Theme') {
agent {
+ dockerfile true
docker {
label "$NODE"
- image "$NODE_IMAGE"
reuseNode true
}
}
@@ -57,9 +56,9 @@ pipeline {
stage('Website') {
agent {
+ dockerfile true
docker {
label "$NODE"
- image "$NODE_IMAGE"
reuseNode true
}
}