Merge branch 'master' into 2.0.X

# Conflicts:
#	package-lock.json
This commit is contained in:
Louis Lam 2023-08-30 01:39:16 +08:00
commit a13fc7079e
31 changed files with 403 additions and 81 deletions

View file

@ -80,8 +80,8 @@ class DockerHost {
options.socketPath = dockerHost.dockerDaemon;
} else if (dockerHost.dockerType === "tcp") {
options.baseURL = DockerHost.patchDockerURL(dockerHost.dockerDaemon);
options.httpsAgent = new https.Agent(DockerHost.getHttpsAgentOptions(dockerHost.dockerType, options.baseURL));
}
options.httpsAgent = new https.Agent(DockerHost.getHttpsAgentOptions(dockerHost.dockerType, options.baseURL));
let res = await axios.request(options);