[fix] Also create config.json so containers use proxy

This commit is contained in:
William Wernert
2021-03-04 17:12:10 -05:00
parent e0d0baafcc
commit 33b2bd33fe

View File

@@ -2265,7 +2265,7 @@ set_proxy() {
source /etc/profile.d/so-proxy.sh source /etc/profile.d/so-proxy.sh
[[ -d '/etc/systemd/system/docker.service.d' ]] || mkdir -p '/etc/systemd/system/docker.service.d' [[ -d '/etc/systemd/system/docker.service.d' ]] || mkdir -p /etc/systemd/system/docker.service.d
# Create proxy config for dockerd # Create proxy config for dockerd
printf '%s\n'\ printf '%s\n'\
@@ -2277,6 +2277,22 @@ set_proxy() {
systemctl daemon-reload systemctl daemon-reload
command -v docker &> /dev/null && systemctl restart docker command -v docker &> /dev/null && systemctl restart docker
# Create config.json for docker containers
[[ -d /root/.docker ]] || mkdir /root/.docker
printf '%s\n'\
"{"\
" \"proxies\":"\
" {"\
" \"default\":"\
" {"\
" \"httpProxy\":\"${so_proxy}\","\
" \"httpsProxy\":\"${so_proxy}\","\
" \"ftpProxy\":\"${so_proxy}\","\
" \"noProxy\":\"${no_proxy_string}\""\
" }"\
" }"\
"}" > /root/.docker/config.json
# Set proxy for package manager # Set proxy for package manager
if [ "$OS" = 'centos' ]; then if [ "$OS" = 'centos' ]; then
echo "proxy=$so_proxy" >> /etc/yum.conf echo "proxy=$so_proxy" >> /etc/yum.conf