jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/387505 )

Change subject: Install jsduck in npm image
......................................................................


Install jsduck in npm image

Change-Id: Iad3eeb9ec4fad605609e3eebbfeb04ebf3746e04
---
M dockerfiles/npm/Dockerfile
M jjb/job-templates.yaml
2 files changed, 6 insertions(+), 2 deletions(-)

Approvals:
  Legoktm: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/dockerfiles/npm/Dockerfile b/dockerfiles/npm/Dockerfile
index 6c116e6..4fab209 100644
--- a/dockerfiles/npm/Dockerfile
+++ b/dockerfiles/npm/Dockerfile
@@ -3,7 +3,9 @@
 # Install nodejs-legacy to provide /usr/bin/node alias
 RUN apt-get update && \
     apt-get install --yes \
-        nodejs-legacy npm && \
+        nodejs-legacy npm \
+        # ruby/etc for jsduck
+        ruby ruby2.1 ruby2.1-dev rubygems-integration build-essential && \
     apt-get clean && rm -rf /var/lib/apt/lists/*
 
 # DO NOT CHANGE VERSION WITHOUT INVOLVING Krinkle OR hashar
@@ -12,6 +14,8 @@
 # If no volume is mounted, make sure /cache exists
 RUN install --directory /cache --owner nobody
 
+RUN gem install jsduck
+
 USER nobody
 
 # See <https://docs.npmjs.com/misc/config#environment-variables>
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 01b0ed2..ee0e9c6 100644
--- a/jjb/job-templates.yaml
+++ b/jjb/job-templates.yaml
@@ -176,7 +176,7 @@
      - docker-cache-dir
      - docker-ci-src-setup-simple
      - docker-run-with-log-cache-src:
-        image: 'wmfreleng/npm-test:v2017.10.28.21.59'
+        image: 'wmfreleng/npm-test:v2017.10.31.01.38'
         logdir: '/log'
     publishers:
      - archive-log-allow-empty

-- 
To view, visit https://gerrit.wikimedia.org/r/387505
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iad3eeb9ec4fad605609e3eebbfeb04ebf3746e04
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Legoktm <lego...@member.fsf.org>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to