From 2423a54aad75b4c407b4b9bcc26b8c8d8c48a12c Mon Sep 17 00:00:00 2001
From: Martin Hierholzer <martin.hierholzer@desy.de>
Date: Tue, 18 Dec 2018 12:42:56 +0100
Subject: [PATCH] added missing &&
---
dockerfiles/bionic.docker | 10 +++++-----
dockerfiles/tumbleweed.docker | 4 ++--
dockerfiles/xenial.docker | 10 +++++-----
3 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/dockerfiles/bionic.docker b/dockerfiles/bionic.docker
index 116672d..1baf1dc 100644
--- a/dockerfiles/bionic.docker
+++ b/dockerfiles/bionic.docker
@@ -32,11 +32,11 @@ 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 \
- 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 \
+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 dabea58..db5774a 100644
--- a/dockerfiles/tumbleweed.docker
+++ b/dockerfiles/tumbleweed.docker
@@ -22,8 +22,8 @@ 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 sudo -u msk_jenkins git config --global http.proxy http://xfelproxy.desy.de:3128 \
+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
# 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 95dbcc2..ff27a75 100644
--- a/dockerfiles/xenial.docker
+++ b/dockerfiles/xenial.docker
@@ -33,11 +33,11 @@ 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 \
- 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 \
+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