X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=installers%2Finstall_docker_ce.sh;h=90035dfe795781020447a13699867ed99c384a70;hb=93e14ef514e68b0d060f359c8b33c962f61393e2;hp=9d6387fde54bc09e3c4db32bc12e9e0d3ac7531e;hpb=0bc87527a95d1c5afc7725981ef0a2e3f55fd274;p=osm%2Fdevops.git diff --git a/installers/install_docker_ce.sh b/installers/install_docker_ce.sh index 9d6387fd..90035dfe 100755 --- a/installers/install_docker_ce.sh +++ b/installers/install_docker_ce.sh @@ -64,6 +64,25 @@ function install_docker_ce() { } EOF" fi + fi + if [ -n "${OSM_BEHIND_PROXY}" ] ; then + if ! [ -f /etc/systemd/system/docker.service.d/http-proxy.conf ] ; then + sudo mkdir -p /etc/systemd/system/docker.service.d + cat << EOF | sudo tee -a /etc/systemd/system/docker.service.d/http-proxy.conf +[Service] +EOF + fi + [ -n "${HTTP_PROXY}" ] && sudo bash -c "cat <> /etc/systemd/system/docker.service.d/http-proxy.conf +Environment=\"HTTP_PROXY=${HTTP_PROXY}\" +EOF" + [ -n "${HTTPS_PROXY}" ] && sudo bash -c "cat <> /etc/systemd/system/docker.service.d/http-proxy.conf +Environment=\"HTTPS_PROXY=${HTTPS_PROXY}\" +EOF" + [ -n "${NO_PROXY}" ] && sudo bash -c "cat <> /etc/systemd/system/docker.service.d/http-proxy.conf +Environment=\"NO_PROXY=${NO_PROXY}\" +EOF" + fi + if [ -n "${DOCKER_PROXY_URL}" ] || [ -n "${OSM_BEHIND_PROXY}" ] ; then #sudo systemctl enable docker sudo systemctl daemon-reload #sudo systemctl restart docker @@ -77,7 +96,10 @@ EOF" return 0 } -while getopts ":D:p:-: " o; do +OSM_BEHIND_PROXY="" +DOCKER_PROXY_URL="" + +while getopts ":D:p:-: P" o; do case "${o}" in D) OSM_DEVOPS="${OPTARG}" @@ -85,6 +107,9 @@ while getopts ":D:p:-: " o; do p) DOCKER_PROXY_URL="${OPTARG}" ;; + P) + OSM_BEHIND_PROXY="y" + ;; -) [ "${OPTARG}" == "debug" ] && DEBUG_INSTALL="y" && continue echo -e "Invalid option: '--$OPTARG'\n" >&2 @@ -108,6 +133,7 @@ source $OSM_DEVOPS/common/logging echo "DEBUG_INSTALL=$DEBUG_INSTALL" echo "DOCKER_PROXY_URL=$DOCKER_PROXY_URL" +echo "OSM_BEHIND_PROXY=$OSM_BEHIND_PROXY" echo "USER=$USER" install_docker_ce