From d849d3488e17a00c662e32b8ea3f0d8e10dd1fe0 Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Tue, 18 Dec 2018 12:48:55 +0100
Subject: [PATCH] system git configuration
---
dockerfiles/bionic.docker | 4 +++-
dockerfiles/tumbleweed.docker | 4 +++-
dockerfiles/xenial.docker | 4 +++-
3 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/dockerfiles/bionic.docker b/dockerfiles/bionic.docker
index ff4bb23..7ed766c 100644
--- a/dockerfiles/bionic.docker
+++ b/dockerfiles/bionic.docker
@@ -35,7 +35,9 @@ 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
+ echo 'https_proxy=https://xfelproxy.desy.de:3128' >> /etc/environment && \
+ git config --system http.proxy http://xfelproxy.desy.de:3128 && \
+ git config --system 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 f7a78fd..f14d058 100644
--- a/dockerfiles/tumbleweed.docker
+++ b/dockerfiles/tumbleweed.docker
@@ -22,7 +22,9 @@ 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
+RUN echo "Defaults set_home" >> /etc/sudoers && \
+ git config --system http.proxy http://xfelproxy.desy.de:3128 && \
+ git config --system 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 b6936ee..8ac1837 100644
--- a/dockerfiles/xenial.docker
+++ b/dockerfiles/xenial.docker
@@ -36,7 +36,9 @@ 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
+ echo 'https_proxy=https://xfelproxy.desy.de:3128' >> /etc/environment && \
+ git config --system http.proxy http://xfelproxy.desy.de:3128 && \
+ git config --system 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