diff --git a/docker/linux/Dockerfile b/docker/linux/Dockerfile index f1f18713b..a8e4836e0 100644 --- a/docker/linux/Dockerfile +++ b/docker/linux/Dockerfile @@ -49,6 +49,7 @@ ENV DISABLE_DIND=N ENV ListeningPort="" ENV MachinePolicy="Default Machine Policy" ENV PublicHostNameConfiguration="ComputerName" +ENV ProxyName="" ENV ServerApiKey="" ENV ServerPassword="" ENV ServerCommsAddress="" diff --git a/docker/linux/scripts/configure-tentacle.sh b/docker/linux/scripts/configure-tentacle.sh index e64e69044..9f4c354d7 100644 --- a/docker/linux/scripts/configure-tentacle.sh +++ b/docker/linux/scripts/configure-tentacle.sh @@ -90,6 +90,9 @@ function validateVariables() { echo " - communication mode 'Listening' (Passive)" fi echo " - registered port $ListeningPort" + if [[ ! -z "$ProxyName" ]]; then + echo " - proxy '$ProxyName'" + fi fi if [[ ! -z "$TargetWorkerPool" ]]; then echo " - worker pool '$TargetWorkerPool'" @@ -211,6 +214,9 @@ function registerTentacle() { if [[ ! -z "$ListeningPort" && "$ListeningPort" != "$internalListeningPort" ]]; then ARGS+=('--tentacle-comms-port' $ListeningPort) fi + if [[ ! -z "$ProxyName" ]]; then + ARGS+=('--proxy' "$ProxyName") + fi fi if [[ ! -z "$ServerApiKey" ]]; then diff --git a/docker/windows/Scripts/configure-tentacle.ps1 b/docker/windows/Scripts/configure-tentacle.ps1 index f022fbe7c..36ff8874d 100644 --- a/docker/windows/Scripts/configure-tentacle.ps1 +++ b/docker/windows/Scripts/configure-tentacle.ps1 @@ -25,6 +25,7 @@ $ServerPort=$env:ServerPort; $Space=$env:Space; $MachinePolicy=$env:MachinePolicy; $AsKubernetesTentacle=$env:AsKubernetesTentacle; +$ProxyName=$env:ProxyName; $TentacleExe=$Exe @@ -132,6 +133,9 @@ function Validate-Variables() { Write-Log " - communication mode 'Listening' (Passive)" } Write-Log " - registered port $ListeningPort" + if ($null -ne $ProxyName) { + Write-Log " - proxy '$ProxyName'" + } } if ($null -ne $TargetWorkerPool) { Write-Log " - worker pool '$TargetWorkerPool'" @@ -254,6 +258,10 @@ function Register-Tentacle(){ $arg += "--tentacle-comms-port" $arg += $ListeningPort } + if ($null -ne $ProxyName) { + $arg += "--proxy" + $arg += $ProxyName + } } if(!($ServerApiKey -eq $null)) {