Skip to content

Makes --proxy added in #46 available to Docker containers #995

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 28, 2024
Merged

Makes --proxy added in #46 available to Docker containers #995

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e9f48b2
Makes --proxy added in #46 available to Docker containers
mwalling-dc Apr 10, 2023
e8c0102
PR changes
mwalling-dc Aug 27, 2024
f890d67
Update indenting in configure-tentacle.sh
rhysparry Aug 27, 2024
7f6e0de
Update configure-tentacle.ps1
rhysparry Aug 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docker/linux/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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=""
Expand Down
6 changes: 6 additions & 0 deletions docker/linux/scripts/configure-tentacle.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'"
Expand Down Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions docker/windows/Scripts/configure-tentacle.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ $ServerPort=$env:ServerPort;
$Space=$env:Space;
$MachinePolicy=$env:MachinePolicy;
$AsKubernetesTentacle=$env:AsKubernetesTentacle;
$ProxyName=$env:ProxyName;

$TentacleExe=$Exe

Expand Down Expand Up @@ -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'"
Expand Down Expand Up @@ -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)) {
Expand Down