Hello Giuseppe Lavagetto, Paladox, jenkins-bot,
I'd like you to do a code review. Please visit
https://gerrit.wikimedia.org/r/399837
to review the following change.
Change subject: Revert "Convert npm, npm-test to docker-pkg"
......................................................................
Revert "Convert npm, npm-test to docker-pkg"
npm 1.4.21 from Jessie fails when used behind a proxy:
TypeError: Request path contains unescaped characters
That prevent us from bootstrapping npm with:
"/usr/bin/nodejs" "/usr/bin/npm" "install" "-g" "[email protected]"
This reverts commit 2221c4280e86cb460e579aedd6617d8d23e1035f.
Bug: T177276
Change-Id: Ia18f22f8a081bb9d13eb67d14067161259014744
---
R dockerfiles/npm-test/Dockerfile
D dockerfiles/npm-test/changelog
D dockerfiles/npm-test/control
M dockerfiles/npm-test/example-run.sh
A dockerfiles/npm/Dockerfile
D dockerfiles/npm/Dockerfile.template
D dockerfiles/npm/changelog
D dockerfiles/npm/control
M jjb/job-templates.yaml
9 files changed, 34 insertions(+), 47 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/37/399837/1
diff --git a/dockerfiles/npm-test/Dockerfile.template
b/dockerfiles/npm-test/Dockerfile
similarity index 65%
rename from dockerfiles/npm-test/Dockerfile.template
rename to dockerfiles/npm-test/Dockerfile
index bfb7745..13b815d 100644
--- a/dockerfiles/npm-test/Dockerfile.template
+++ b/dockerfiles/npm-test/Dockerfile
@@ -1,4 +1,4 @@
-FROM {{ 'npm' | image_tag }}
+FROM wmfreleng/npm:latest
USER nobody
COPY run.sh /run.sh
diff --git a/dockerfiles/npm-test/changelog b/dockerfiles/npm-test/changelog
deleted file mode 100644
index e4527b1..0000000
--- a/dockerfiles/npm-test/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 2246c05..0000000
--- a/dockerfiles/npm-test/control
+++ /dev/null
@@ -1,4 +0,0 @@
-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 97ec777..21a8ce7 100644
--- a/dockerfiles/npm-test/example-run.sh
+++ b/dockerfiles/npm-test/example-run.sh
@@ -19,7 +19,7 @@
--volume /"$(pwd)"/log://var/lib/jenkins/log \
--volume /"$(pwd)"/cache://cache \
--volume /"$(pwd)"/src://src \
- docker-registry.wikimedia.org/releng/npm-test:latest
+ wmfreleng/npm-test:latest
if grep -q JSDuck src/docs/index.html; then
echo "JSDuck documentation has been generated"
@@ -33,4 +33,4 @@
--volume /"$(pwd)"/log://var/lib/jenkins/log \
--volume /"$(pwd)"/cache://cache \
--volume /"$(pwd)"/src://src \
- docker-registry.wikimedia.org/releng/npm-test:latest
+ wmfreleng/npm-test:latest
diff --git a/dockerfiles/npm/Dockerfile b/dockerfiles/npm/Dockerfile
new file mode 100644
index 0000000..9293153
--- /dev/null
+++ b/dockerfiles/npm/Dockerfile
@@ -0,0 +1,30 @@
+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
deleted file mode 100644
index d1052ca..0000000
--- a/dockerfiles/npm/Dockerfile.template
+++ /dev/null
@@ -1,25 +0,0 @@
-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
deleted file mode 100644
index d6b39e8..0000000
--- a/dockerfiles/npm/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index 196c68c..0000000
--- a/dockerfiles/npm/control
+++ /dev/null
@@ -1,4 +0,0 @@
-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 c89a291..9f1a058 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: 'docker-registry.wikimedia.org/releng/npm-test:0.1.0'
+ docker_image_var: 'wmfreleng/npm-test:v2017.12.11.16.37'
triggers:
- zuul
builders:
--
To view, visit https://gerrit.wikimedia.org/r/399837
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia18f22f8a081bb9d13eb67d14067161259014744
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
