From 5ad7f281988b53fe647a9338ee6e3ab09ca18aaa Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Tue, 18 Dec 2018 12:47:27 +0100
Subject: [PATCH] don't set git config, as the home directory is not accessible
here
---
dockerfiles/bionic.docker | 4 +---
dockerfiles/tumbleweed.docker | 4 +---
dockerfiles/xenial.docker | 6 ++----
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/dockerfiles/bionic.docker b/dockerfiles/bionic.docker
index 155af34..ff4bb23 100644
--- a/dockerfiles/bionic.docker
+++ b/dockerfiles/bionic.docker
@@ -35,9 +35,7 @@ RUN apt-get update && \
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 -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
+ echo 'https_proxy=https://xfelproxy.desy.de:3128' >> /etc/environment
# 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 98450f5..f7a78fd 100644
--- a/dockerfiles/tumbleweed.docker
+++ b/dockerfiles/tumbleweed.docker
@@ -22,9 +22,7 @@ RUN zypper refresh && \
useradd -u 30996 msk_jenkins && \
ln -sfn /usr/lib64/libzmq.so.5 /usr/lib64/libzmq.so.3
-RUN echo "Defaults set_home" >> /etc/sudoers && \
- 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
+RUN echo "Defaults set_home" >> /etc/sudoers
# 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 ecfc463..b6936ee 100644
--- a/dockerfiles/xenial.docker
+++ b/dockerfiles/xenial.docker
@@ -36,10 +36,8 @@ RUN apt-get update && \
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 -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
-
+ echo 'https_proxy=https://xfelproxy.desy.de:3128' >> /etc/environment
+
# NOTE: This last line (symlink for libzmq.so.3) is a hack for a bug in DOOCS serverlib, which has the version number hardcoded.
ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
--
GitLab