jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/393071 )
Change subject: Do not pass env variables set by login to Docker
......................................................................
Do not pass env variables set by login to Docker
login sets environment variables (HOME, SHELL, PATH, LOGNAME, MAIL)
before execing the shell. They are set for the jenkins-deploy user and
do not make any sense inside the containers which run as nobody.
Else you get some expected results such as trying to write to
HOME=/mnt/home/jenkins-deploy instead of /nonexistent. Typically in
python:
HOME=/no python -c "import os; print(os.path.expanduser('~'))"
/no
Update:
apps-android-wikipedia-tox-docker
cergen-tox-docker
composer-package-php70-docker
composer-php70-docker
cumin-tox-docker
eventlogging-tox-docker
fundraising-tools-tox-docker
integration-config-tox-docker
labs-striker-tox-docker
labs-tox-docker
lintr-docker
lintr-docker-non-voting
mediawiki-core-php70-phan-docker
mediawiki-core-phpcs-docker
mwext-php70-phan-docker
mwgate-npm-node-6-docker
mwgate-tox-docker
npm-node-6-docker
operations-puppet-tests-docker
pywikibot-core-tox-doc-docker
pywikibot-core-tox-nose34-docker
pywikibot-core-tox-nose-docker
search-mjolnir-tox-docker
tox-docker
Bug: T177684
Change-Id: Ia6d48763b4a55e627ff6c5e4ad42402fb07c3bec
---
M jjb/castor.yaml
M jjb/macro-docker.yaml
M jjb/mediawiki.yaml
3 files changed, 7 insertions(+), 7 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/jjb/castor.yaml b/jjb/castor.yaml
index b6a6c27..4fcef75 100644
--- a/jjb/castor.yaml
+++ b/jjb/castor.yaml
@@ -64,7 +64,7 @@
- shell: |
echo "Clearing $WORKSPACE/cache"
exec docker run --rm \
- --env-file <(/usr/bin/env) \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
--volume "$(pwd)"/cache:/cache \
'wmfreleng/castor:v2017.10.30.21.03' clear || :
# nothing else can be executed due to exec
@@ -90,7 +90,7 @@
- docker-cache-dir
- shell: |
exec docker run --rm \
- --env-file <(/usr/bin/env) \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
--volume "${WORKSPACE}/cache":/cache \
wmfreleng/castor:v2017.10.30.21.03 \
load
diff --git a/jjb/macro-docker.yaml b/jjb/macro-docker.yaml
index 01b5387..d9ea506 100644
--- a/jjb/macro-docker.yaml
+++ b/jjb/macro-docker.yaml
@@ -33,7 +33,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
--volume "$(pwd)"/log:{logdir} \
{image}
# nothing else can be executed due to exec
@@ -53,7 +53,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
--volume "$(pwd)"/log:{logdir} \
--volume "$(pwd)"/cache:/cache \
{image}{obj:run_args|}
@@ -84,7 +84,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
--volume "$(pwd)"/src:/src \
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
@@ -102,7 +102,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
--volume "$(pwd)"/src:/src \
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index ab0f438..b162389 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -439,7 +439,7 @@
set -x
exec docker run \
--rm \
- --env-file <(/usr/bin/env) \
+ --env-file <(/usr/bin/env|egrep -v
'^(HOME|SHELL|PATH|LOGNAME|MAIL)=') \
--volume "$(pwd)"/src:/src \
--volume "$(pwd)"/cache:/cache \
--volume /srv/git:/srv/git \
--
To view, visit https://gerrit.wikimedia.org/r/393071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ia6d48763b4a55e627ff6c5e4ad42402fb07c3bec
Gerrit-PatchSet: 3
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <has...@free.fr>
Gerrit-Reviewer: Addshore <addshorew...@gmail.com>
Gerrit-Reviewer: Hashar <has...@free.fr>
Gerrit-Reviewer: Paladox <thomasmulhall...@yahoo.com>
Gerrit-Reviewer: Thcipriani <tcipri...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
