jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/396308 )
Change subject: docker: ci-src-setup entry point to exec form
......................................................................
docker: ci-src-setup entry point to exec form
Change-Id: I4f481ae76442777336b9a4b0178e3bf043cb308e
---
M dockerfiles/ci-src-setup-simple/Dockerfile
M dockerfiles/ci-src-setup-simple/run.sh
M jjb/macro-docker.yaml
3 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dockerfiles/ci-src-setup-simple/Dockerfile
b/dockerfiles/ci-src-setup-simple/Dockerfile
index a3c6fd1..c959946 100644
--- a/dockerfiles/ci-src-setup-simple/Dockerfile
+++ b/dockerfiles/ci-src-setup-simple/Dockerfile
@@ -2,4 +2,4 @@
USER nobody
COPY run.sh /run.sh
-ENTRYPOINT /bin/bash /run.sh
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/ci-src-setup-simple/run.sh
b/dockerfiles/ci-src-setup-simple/run.sh
old mode 100644
new mode 100755
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index 24582ee..d071416 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -119,5 +119,5 @@
--volume "$(pwd)"/src:/src \
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
- wmfreleng/ci-src-setup-simple:v2017.10.28.06.19
+ wmfreleng/ci-src-setup-simple:v2017.12.08.08.32
# nothing else can be executed due to exec
--
To view, visit https://gerrit.wikimedia.org/r/396308
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4f481ae76442777336b9a4b0178e3bf043cb308e
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Hashar <[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
