Hashar has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/390261 )

Change subject: docker: npm-test ENTRYPOINT to exec form
......................................................................

docker: npm-test ENTRYPOINT to exec form

That get rid of the `/bin/sh -c 'xxx'`.
Make run.sh executable

Update:
    mwgate-npm-node-6-docker
    npm-node-6-docker

Bug: T176747
Change-Id: I57f46848f651a0f84bc1eca00454608994cdff01
---
M dockerfiles/npm-test/Dockerfile
M dockerfiles/npm-test/run.sh
M jjb/job-templates.yaml
3 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/integration/config 
refs/changes/61/390261/1

diff --git a/dockerfiles/npm-test/Dockerfile b/dockerfiles/npm-test/Dockerfile
index c2e3cc3..13b815d 100644
--- a/dockerfiles/npm-test/Dockerfile
+++ b/dockerfiles/npm-test/Dockerfile
@@ -2,4 +2,4 @@
 
 USER nobody
 COPY run.sh /run.sh
-ENTRYPOINT /bin/bash /run.sh
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/npm-test/run.sh b/dockerfiles/npm-test/run.sh
old mode 100644
new mode 100755
diff --git a/jjb/job-templates.yaml b/jjb/job-templates.yaml
index 2ae8135..c3e8d50 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.11.09.10.57'
+        image: 'wmfreleng/npm-test:v2017.11.09.15.15'
         logdir: '/log'
     publishers:
      - archive-log-allow-empty

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I57f46848f651a0f84bc1eca00454608994cdff01
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to