From 33b2bd33fe7826a5a9c4966d0ebc83c4219a8bf9 Mon Sep 17 00:00:00 2001
From: William Wernert <william.wernert@securityonionsolutions.com>
Date: Thu, 4 Mar 2021 17:12:10 -0500
Subject: [PATCH] [fix] Also create config.json so containers use proxy

---
 setup/so-functions | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/setup/so-functions b/setup/so-functions
index 6d1c8cf27..8057500be 100755
--- a/setup/so-functions
+++ b/setup/so-functions
@@ -2265,7 +2265,7 @@ set_proxy() {
 
 	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 
 	printf '%s\n'\
@@ -2277,6 +2277,22 @@ set_proxy() {
 	systemctl daemon-reload
 	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
 	if [ "$OS" = 'centos' ]; then
 		echo "proxy=$so_proxy" >> /etc/yum.conf