Skip to content
Snippets Groups Projects
Commit 1bd90e16 authored by Martin Christoph Hierholzer's avatar Martin Christoph Hierholzer
Browse files

set proxy through build arguments (#10)


* proxy is set through build arguments.
settings stub for network, git , sudo has been removed.

* removed comments not parsed correctly by docker.

* changed: tumbleweed.docker proxy is set through build argument.

Co-authored-by: default avatarNadeem <nadeem.shehzad@desy.de>
parent b9d8f250
No related branches found
No related tags found
No related merge requests found
FROM ubuntu:focal
ENV http_proxy http://xfelproxy.desy.de:3128
ENV https_proxy http://xfelproxy.desy.de:3128
ENV http_proxy ${http_proxy}
ENV https_proxy ${https_proxy}
ENV DEBIAN_FRONTEND noninteractive
RUN apt-get update && \
......@@ -10,7 +10,7 @@ RUN apt-get update && \
apt-get update && \
apt-get upgrade -y && \
apt-get dist-upgrade -y && \
apt-get install -y sudo wget python3-pip locales pigz \
apt-get install -y sudo wget python3-pip locales pigz \
g++ valgrind cppcheck lcov doxygen procmail make git gdb cmake ninja-build \
libboost-all-dev libxml++2.6-dev \
libldap2-dev libzmq3-dev rpcbind \
......@@ -42,15 +42,8 @@ RUN apt-get update && \
ln -sfn /usr/lib/x86_64-linux-gnu/libzmq.so.5 /usr/lib/x86_64-linux-gnu/libzmq.so.3 && \
pip3 install meson
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 && \
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.
ADD lcov-to-cobertura-xml /common/lcov_cobertura-1.6
# Start rpcbind at launch of the container, required for DOOCS
......
FROM opensuse/tumbleweed:latest
ENV http_proxy http://xfelproxy.desy.de:3128
ENV https_proxy http://xfelproxy.desy.de:3128
ENV http_proxy ${http_proxy}
ENV https_proxy ${https_proxy}
RUN zypper refresh && \
zypper up -y && \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment