Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403896 )
Change subject: Convert npm, npm-test to docker-pkg (2)
......................................................................
Convert npm, npm-test to docker-pkg (2)
Redoing the change this time with node-tunnel-agent 0.4.3. That fix npm
1.4.21 no being able to communicate with a http proxy under NodeJs 4.
Update jobs:
apps-android-wikipedia-npm-node-6-docker
fundraising-dash-npm-node-6-docker
mapdata-npm-node-6-docker
marvin-npm-node-6-docker
mediawiki-core-npm-node-6-docker
mediawiki-core-php70-phan-docker
mwgate-npm-node-6-docker
npm-node-6-docker
pywikibot-i18n-npm-node-6-docker
visualeditor-npm-run-doc-node-6-docker
Bug: T177276
Change-Id: I639c9dc317e66659c3a599ff6e414b71b58e7e87
---
R dockerfiles/npm-test/Dockerfile.template
A dockerfiles/npm-test/changelog
A dockerfiles/npm-test/control
M dockerfiles/npm-test/example-run.sh
D dockerfiles/npm/Dockerfile
A dockerfiles/npm/Dockerfile.template
A dockerfiles/npm/changelog
A dockerfiles/npm/control
M jjb/job-templates.yaml
9 files changed, 59 insertions(+), 34 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/96/403896/1
diff --git a/dockerfiles/npm-test/Dockerfile
b/dockerfiles/npm-test/Dockerfile.template
similarity index 65%
rename from dockerfiles/npm-test/Dockerfile
rename to dockerfiles/npm-test/Dockerfile.template
index 13b815d..bfb7745 100644
--- a/dockerfiles/npm-test/Dockerfile
+++ b/dockerfiles/npm-test/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/npm:latest
+FROM {{ 'npm' | image_tag }}
USER nobody
COPY run.sh /run.sh
diff --git a/dockerfiles/npm-test/changelog b/dockerfiles/npm-test/changelog
new file mode 100644
index 0000000..d5ebc3e
--- /dev/null
+++ b/dockerfiles/npm-test/changelog
@@ -0,0 +1,11 @@
+npm-test (0.2.0) wikimedia; urgency=medium
+
+ * Build with node-tunnel-agent 0.4.3 (T183569)
+
+ -- Antoine Musso <[email protected]> Fri, 12 Jan 2018 10:28:22 +0100
+
+npm-test (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Fri, 03 Nov 2017 15:22:53
+0100
diff --git a/dockerfiles/npm-test/control b/dockerfiles/npm-test/control
new file mode 100644
index 0000000..2246c05
--- /dev/null
+++ b/dockerfiles/npm-test/control
@@ -0,0 +1,4 @@
+Package: npm-test
+Description: Docker image with npm for running npm tests
+Depends: npm
+Maintainer: Kunal Mehta <[email protected]>
diff --git a/dockerfiles/npm-test/example-run.sh
b/dockerfiles/npm-test/example-run.sh
index 98ff073..4cee239 100644
--- a/dockerfiles/npm-test/example-run.sh
+++ b/dockerfiles/npm-test/example-run.sh
@@ -18,7 +18,7 @@
--volume /"$(pwd)"/log://var/lib/jenkins/log \
--volume /"$(pwd)"/cache://cache \
--volume /"$(pwd)"/src://src \
- wmfreleng/npm-test:latest \
+ docker-registry.wikimedia.org/releng/npm-test:latest \
doc
if grep -q JSDuck src/docs/index.html; then
@@ -33,4 +33,4 @@
--volume /"$(pwd)"/log://var/lib/jenkins/log \
--volume /"$(pwd)"/cache://cache \
--volume /"$(pwd)"/src://src \
- wmfreleng/npm-test:latest
+ docker-registry.wikimedia.org/releng/npm-test:latest
diff --git a/dockerfiles/npm/Dockerfile b/dockerfiles/npm/Dockerfile
deleted file mode 100644
index 9293153..0000000
--- a/dockerfiles/npm/Dockerfile
+++ /dev/null
@@ -1,30 +0,0 @@
-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 \
- python-minimal \
- ruby ruby2.1 ruby2.1-dev rubygems-integration build-essential && \
- gem install --no-rdoc --no-ri jsduck && \
- apt-get clean && rm -rf /var/lib/apt/lists/*
-
-# DO NOT CHANGE VERSION WITHOUT INVOLVING Krinkle OR hashar
-RUN npm install -g [email protected]
-
-# If no volume is mounted, make sure /cache exists
-RUN install --directory /cache --owner nobody
-
-USER nobody
-
-# See <https://docs.npmjs.com/misc/config#environment-variables>
-# and <https://docs.npmjs.com/cli/cache>
-ENV NPM_CONFIG_CACHE=/cache
-ENV BABEL_CACHE_PATH=$XDG_CACHE_HOME/babel-cache.json
-
-ENTRYPOINT ["npm"]
-CMD ["--help"]
diff --git a/dockerfiles/npm/Dockerfile.template
b/dockerfiles/npm/Dockerfile.template
new file mode 100644
index 0000000..d1052ca
--- /dev/null
+++ b/dockerfiles/npm/Dockerfile.template
@@ -0,0 +1,25 @@
+FROM {{ "ci-jessie" | image_tag }}
+
+# DO NOT CHANGE VERSION WITHOUT INVOLVING Krinkle OR hashar
+ARG NPM_VERSION="3.8.3"
+
+# Install nodejs-legacy to provide /usr/bin/node alias
+#
+# build-essential for compilation
+# python-minimal for node-gyp
+# ruby/etc for jsduck
+RUN {{ "nodejs-legacy npm ruby ruby2.1 ruby2.1-dev rubygems-integration
python-minimal build-essential" | apt_install }} \
+ && npm install -g npm@${NPM_VERSION} \
+ && gem install --no-rdoc --no-ri jsduck \
+ # if no volume is mounted, make sure /cache exists
+ && install --directory /cache --owner nobody
+
+USER nobody
+
+# See <https://docs.npmjs.com/misc/config#environment-variables>
+# and <https://docs.npmjs.com/cli/cache>
+ENV NPM_CONFIG_CACHE=/cache
+ENV BABEL_CACHE_PATH=$XDG_CACHE_HOME/babel-cache.json
+
+ENTRYPOINT ["npm"]
+CMD ["--help"]
diff --git a/dockerfiles/npm/changelog b/dockerfiles/npm/changelog
new file mode 100644
index 0000000..6345402
--- /dev/null
+++ b/dockerfiles/npm/changelog
@@ -0,0 +1,11 @@
+npm (0.2.0) wikimedia; urgency=medium
+
+ * Build with node-tunnel-agent 0.4.3 (T183569)
+
+ -- Antoine Musso <[email protected]> Fri, 12 Jan 2018 10:29:01 +0100
+
+npm (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Fri, 03 Nov 2017 15:06:53
+0100
diff --git a/dockerfiles/npm/control b/dockerfiles/npm/control
new file mode 100644
index 0000000..196c68c
--- /dev/null
+++ b/dockerfiles/npm/control
@@ -0,0 +1,4 @@
+Package: npm
+Description: Docker image with npm and jsduck installed
+Depends: ci-jessie
+Maintainer: Kunal Mehta <[email protected]>
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 8cbbf03..21548ec 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:v2018.01.02.16.08'
+ docker_image_var: 'docker-registry.wikimedia.org/releng/npm-test:0.2.0'
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/403896
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I639c9dc317e66659c3a599ff6e414b71b58e7e87
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
