diff --git a/container_provisioner/api/controllers.go b/container_provisioner/api/controllers.go index e31147c..da52ee5 100644 --- a/container_provisioner/api/controllers.go +++ b/container_provisioner/api/controllers.go @@ -146,7 +146,7 @@ func postProvision(c *fiber.Ctx) error { proxyContainers := containers.AcquireProxyContainer() // Generate the container config - scrapeConfig := containers.ContainerConfigGenerator(scrapeMode, scrapeTargetName, url, uploadIdentifier, proxyContainers.IPAddress, proxyContainers.VPNRegion) + scrapeConfig := containers.ContainerConfigGenerator(scrapeMode, scrapeTargetName, url, uploadIdentifier, proxyContainers.IPAddress, proxyContainers.VPNRegion, proxyContainers.VPNSOCKSPort) // Create the container containerID := containers.CreateContainer(scrapeConfig) diff --git a/container_provisioner/containers/helper.go b/container_provisioner/containers/helper.go index 9455922..352a451 100644 --- a/container_provisioner/containers/helper.go +++ b/container_provisioner/containers/helper.go @@ -56,7 +56,12 @@ func RemoveContainer(containerID string) { } // ContainerConfigGenerator generates the container config depending on the scrape target -func ContainerConfigGenerator(scrapeTarget string, scrapeTargetName string, scrapeURL string, uploadIdentifier string, proxyAddress string, proxyLocation string) *container.Config { +func ContainerConfigGenerator( + scrapeTarget string, + scrapeTargetName string, + scrapeURL string, uploadIdentifier string, + proxyAddress string, proxyLocation string, proxyPort string) *container.Config { + var scrapeContainerURL string var targetName string @@ -73,7 +78,7 @@ func ContainerConfigGenerator(scrapeTarget string, scrapeTargetName string, scra } scrapeMode := fmt.Sprintf("SCRAPE_MODE=%s", scrapeTarget) - proxySettings := fmt.Sprintf("PROXY_ADDRESS=%s", proxyAddress) + proxySettings := fmt.Sprintf("PROXY_ADDRESS=socks5://%s:%s", proxyAddress, proxyPort) return &container.Config{ Image: containerImage,