From 13851430e75a6efc4589696d413be6d360b9af74 Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Tue, 18 Dec 2018 12:45:33 +0100
Subject: [PATCH] added -H option to sudo
---
dockerfiles/bionic.docker | 4 ++--
dockerfiles/tumbleweed.docker | 4 ++--
dockerfiles/xenial.docker | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/dockerfiles/bionic.docker b/dockerfiles/bionic.docker
index 1baf1dc..155af34 100644
--- a/dockerfiles/bionic.docker
+++ b/dockerfiles/bionic.docker
@@ -36,8 +36,8 @@ RUN echo "Defaults set_home" >> /etc/sudoers && \
echo 'Acquire::http::proxy "http://xfelproxy.desy.de:3128/";' > /etc/apt/apt.conf && \
echo 'http_proxy=http://xfelproxy.desy.de:3128' >> /etc/environment && \
echo 'https_proxy=https://xfelproxy.desy.de:3128' >> /etc/environment && \
- sudo -u msk_jenkins git config --global http.proxy http://xfelproxy.desy.de:3128 && \
- sudo -u msk_jenkins git config --global https.proxy http://xfelproxy.desy.de:3128
+ sudo -H -u msk_jenkins git config --global http.proxy http://xfelproxy.desy.de:3128 && \
+ sudo -H -u msk_jenkins git config --global https.proxy http://xfelproxy.desy.de:3128
# NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
diff --git a/dockerfiles/tumbleweed.docker b/dockerfiles/tumbleweed.docker
index db5774a..98450f5 100644
--- a/dockerfiles/tumbleweed.docker
+++ b/dockerfiles/tumbleweed.docker
@@ -23,8 +23,8 @@ RUN zypper refresh && \
ln -sfn /usr/lib64/libzmq.so.5 /usr/lib64/libzmq.so.3
RUN echo "Defaults set_home" >> /etc/sudoers && \
- sudo -u msk_jenkins git config --global http.proxy http://xfelproxy.desy.de:3128 && \
- sudo -u msk_jenkins git config --global https.proxy http://xfelproxy.desy.de:3128
+ sudo -H -u msk_jenkins git config --global http.proxy http://xfelproxy.desy.de:3128 && \
+ sudo -H -u msk_jenkins git config --global https.proxy http://xfelproxy.desy.de:3128
# NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
diff --git a/dockerfiles/xenial.docker b/dockerfiles/xenial.docker
index ff27a75..ecfc463 100644
--- a/dockerfiles/xenial.docker
+++ b/dockerfiles/xenial.docker
@@ -37,8 +37,8 @@ RUN echo "Defaults set_home" >> /etc/sudoers && \
echo 'Acquire::http::proxy "http://xfelproxy.desy.de:3128/";' > /etc/apt/apt.conf && \
echo 'http_proxy=http://xfelproxy.desy.de:3128' >> /etc/environment && \
echo 'https_proxy=https://xfelproxy.desy.de:3128' >> /etc/environment && \
- sudo -u msk_jenkins git config --global http.proxy http://xfelproxy.desy.de:3128 && \
- sudo -u msk_jenkins git config --global https.proxy http://xfelproxy.desy.de:3128
+ sudo -H -u msk_jenkins git config --global http.proxy http://xfelproxy.desy.de:3128 && \
+ sudo -H -u msk_jenkins git config --global https.proxy http://xfelproxy.desy.de:3128
# NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
--
GitLab