From 7af4af4b97d9195029637d7ea2e277c25bd9b43d Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Tue, 18 Dec 2018 11:42:06 +0100
Subject: [PATCH] added proxy settings
---
dockerfiles/bionic.docker | 7 ++++++-
dockerfiles/tumbleweed.docker | 7 ++++++-
dockerfiles/xenial.docker | 7 ++++++-
3 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/dockerfiles/bionic.docker b/dockerfiles/bionic.docker
index 484b69a..50e09e7 100644
--- a/dockerfiles/bionic.docker
+++ b/dockerfiles/bionic.docker
@@ -32,7 +32,12 @@ RUN apt-get update && \
useradd -u 30996 msk_jenkins && \
ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3
-RUN echo "Defaults set_home" >> /etc/sudoers
+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 \
# 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..bc56194 100644
--- a/dockerfiles/tumbleweed.docker
+++ b/dockerfiles/tumbleweed.docker
@@ -22,7 +22,12 @@ 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 \
+ 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 \
# 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 1ff4ca6..f028f15 100644
--- a/dockerfiles/xenial.docker
+++ b/dockerfiles/xenial.docker
@@ -33,7 +33,12 @@ RUN apt-get update && \
useradd -u 30996 msk_jenkins && \
ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3
-RUN echo "Defaults set_home" >> /etc/sudoers
+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 \
# 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