jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/395555 )
Change subject: docker: add dev tools to npm-test base images ...................................................................... docker: add dev tools to npm-test base images node-gyp requires python else: stack Error: Can't find Python executable "python", you can set the PYTHON env variable. Add python-minimal. Some node modules require compiling files, typically for binding to a lib. Keep build-essential around. build-essential has been removed in d3d80ec7 since that made the image smaller. Turns out we have a few repositories that depends on module that have to be compiled. An example is mmmagic providing bindings for libmagic. New images: wmfreleng/npm:v2017.12.06.09.55 wmfreleng/npm-stretch:v2017.12.06.09.55 wmfreleng/npm-test:v2017.12.06.09.55 wmfreleng/npm-test-stretch:v2017.12.06.09.55 wmfreleng/npm-browser-test:v2017.12.06.09.55 Update job: mwgate-npm-browser-node-6-docker mwgate-npm-node-6-docker npm-node-6-docker wikibase-javascript-api-npm-browser-node-6-docker wikimedia-portals-deploy-npm-browser-node-6-docker Change-Id: I45ecfff17b08c3be170d0d770511ee22b3cf4fe5 --- M dockerfiles/npm-stretch/Dockerfile M dockerfiles/npm/Dockerfile M jjb/job-templates.yaml 3 files changed, 13 insertions(+), 5 deletions(-) Approvals: Hashar: Looks good to me, approved jenkins-bot: Verified diff --git a/dockerfiles/npm-stretch/Dockerfile b/dockerfiles/npm-stretch/Dockerfile index 872d9f2..755227f 100644 --- a/dockerfiles/npm-stretch/Dockerfile +++ b/dockerfiles/npm-stretch/Dockerfile @@ -6,12 +6,17 @@ # Manually link since COPY copies symlink destination instead of the actual symlink RUN ln -s ../lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm +# Install nodejs-legacy to provide /usr/bin/node alias +# +# build-essential for compilation +# python-minimal for node-gyp +# ruby/etc for jsduck RUN apt-get update && \ apt-get install --yes \ nodejs-legacy \ + python-minimal \ ruby ruby-dev rubygems-integration build-essential && \ gem install --no-rdoc --no-ri jsduck && \ - apt-get remove -y build-essential && apt-get autoremove -y && \ apt-get clean && rm -rf /var/lib/apt/lists/* # If no volume is mounted, make sure /cache exists diff --git a/dockerfiles/npm/Dockerfile b/dockerfiles/npm/Dockerfile index 9b68bd8..9293153 100644 --- a/dockerfiles/npm/Dockerfile +++ b/dockerfiles/npm/Dockerfile @@ -1,13 +1,16 @@ FROM wmfreleng/ci-jessie:latest # Install nodejs-legacy to provide /usr/bin/node alias +# +# build-essential for compilation +# python-minimal for node-gyp +# ruby/etc for jsduck RUN apt-get update && \ apt-get install --yes \ nodejs-legacy npm \ - # ruby/etc for jsduck + python-minimal \ ruby ruby2.1 ruby2.1-dev rubygems-integration build-essential && \ gem install --no-rdoc --no-ri jsduck && \ - apt-get remove -y build-essential && apt-get autoremove -y && \ apt-get clean && rm -rf /var/lib/apt/lists/* # DO NOT CHANGE VERSION WITHOUT INVOLVING Krinkle OR hashar diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml index f72f760..0a7b64a 100644 --- a/jjb/job-templates.yaml +++ b/jjb/job-templates.yaml @@ -167,7 +167,7 @@ name: 'npm-node-6-docker' node: DebianJessieDocker concurrent: true - docker_image_var: 'wmfreleng/npm-test:v2017.11.10.22.15' + docker_image_var: 'wmfreleng/npm-test:v2017.12.06.09.55' triggers: - zuul builders: @@ -196,7 +196,7 @@ - job-template: !!merge : *job_npm-node-6-docker name: '{name}-npm-browser-node-6-docker' - docker_image_var: 'wmfreleng/npm-browser-test:v2017.12.01.13.34' + docker_image_var: 'wmfreleng/npm-browser-test:v2017.12.06.09.55' # Reinject Zuul parameters since JJB strip for some reason triggers: - zuul -- To view, visit https://gerrit.wikimedia.org/r/395555 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I45ecfff17b08c3be170d0d770511ee22b3cf4fe5 Gerrit-PatchSet: 5 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> Gerrit-Reviewer: Hashar <has...@free.fr> Gerrit-Reviewer: Krinkle <krinklem...@gmail.com> 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