diff --git a/container_provisioner/docker-compose.yml b/container_provisioner/docker-compose.yml index ba8dc17..247946d 100644 --- a/container_provisioner/docker-compose.yml +++ b/container_provisioner/docker-compose.yml @@ -32,7 +32,7 @@ services: protocol: tcp # Set up a dedicated network networks: - - scraper + - container_provisioner # Service name redis: @@ -47,9 +47,12 @@ services: protocol: tcp # Set up a dedicated network networks: - - scraper + - container_provisioner + ## Config section # Define the network type networks: - scraper: + container_provisioner: + name: container_provisioner + driver: bridge external: false diff --git a/go.work.sum b/go.work.sum index ea82498..5a05a73 100644 --- a/go.work.sum +++ b/go.work.sum @@ -1,2 +1,3 @@ github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY= golang.org/x/text v0.8.0/go.mod h1:e1OnstbJyHTd6l/uOt8jFFHp6TRDWZR/bV3emEE/zU8= +golang.org/x/text v0.13.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE= diff --git a/proxy_pool/docker-compose-dev.yml b/proxy_pool/docker-compose-dev.yml index c14d280..752eca7 100644 --- a/proxy_pool/docker-compose-dev.yml +++ b/proxy_pool/docker-compose-dev.yml @@ -18,6 +18,7 @@ services: # Devices required to run OpenVPN devices: - '/dev/net/tun:/dev/net/tun' + # NOTE: These ports are only used when you are connecting to the proxy pool from outside of docker network without the container_provisioner. ports: # Squid proxy port - target: 8888 @@ -47,8 +48,8 @@ services: labels: - 'TaskOwner=PROXY' - 'vpn.region=SE' - - 'proxy.socks.port=8882' - - 'proxy.http.port=8889' + - 'proxy.socks.port=8881' + - 'proxy.http.port=8888' # Capabilities required to run OpenVPN cap_add: - NET_ADMIN @@ -82,8 +83,8 @@ services: labels: - 'TaskOwner=PROXY' - 'vpn.region=UK' - - 'proxy.socks.port=8883' - - 'proxy.http.port=8890' + - 'proxy.socks.port=8881' + - 'proxy.http.port=8888' # Capabilities required to run OpenVPN cap_add: - NET_ADMIN @@ -117,8 +118,8 @@ services: labels: - 'TaskOwner=PROXY' - 'vpn.region=BE' - - 'proxy.socks.port=8884' - - 'proxy.http.port=8891' + - 'proxy.socks.port=8881' + - 'proxy.http.port=8888' # Capabilities required to run OpenVPN cap_add: - NET_ADMIN diff --git a/proxy_pool/docker-compose.yml b/proxy_pool/docker-compose.yml index b0622fc..dab1fc7 100644 --- a/proxy_pool/docker-compose.yml +++ b/proxy_pool/docker-compose.yml @@ -18,6 +18,7 @@ services: # Devices required to run OpenVPN devices: - '/dev/net/tun:/dev/net/tun' + # NOTE: These port mappings are only used when you are connecting to the proxy pool from outside of docker network without the container_provisioner (e.g. from your host machine). ports: # Squid proxy port - target: 8888 @@ -47,8 +48,8 @@ services: labels: - 'TaskOwner=PROXY' - 'vpn.region=SE' - - 'proxy.socks.port=8882' - - 'proxy.http.port=8889' + - 'proxy.socks.port=8881' + - 'proxy.http.port=8888' # Capabilities required to run OpenVPN cap_add: - NET_ADMIN @@ -82,8 +83,8 @@ services: labels: - 'TaskOwner=PROXY' - 'vpn.region=UK' - - 'proxy.socks.port=8883' - - 'proxy.http.port=8890' + - 'proxy.socks.port=8881' + - 'proxy.http.port=8888' # Capabilities required to run OpenVPN cap_add: - NET_ADMIN @@ -117,8 +118,8 @@ services: labels: - 'TaskOwner=PROXY' - 'vpn.region=BE' - - 'proxy.socks.port=8884' - - 'proxy.http.port=8891' + - 'proxy.socks.port=8881' + - 'proxy.http.port=8888' # Capabilities required to run OpenVPN cap_add: - NET_ADMIN