Merge remote-tracking branch 'origin/main' into tmm/mount_helm_upgrad…

…e_cfg
OctopusDeploy · Nov 26, 2024 · 2112666 · 2112666
2 parents 118ba20 + 4f13a6d
commit 2112666
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/docker/kubernetes-agent-tentacle/dev/Dockerfile b/docker/kubernetes-agent-tentacle/dev/Dockerfile
@@ -83,6 +83,10 @@ ENV OCTOPUS__K8STENTACLE__DISABLEAUTOPODCLEANUP="False"
 ENV TentacleHome=""
 ENV TentacleApplications=""
 ENV TentacleCertificateBase64=""
+ENV TentaclePollingProxyHost=""
+ENV TentaclePollingProxyPort=""
+ENV TentaclePollingProxyUsername=""
+ENV TentaclePollingProxyPassword=""
 
 ENTRYPOINT [ "/dev-scripts/bootstrap.sh" ] 
 
@@ -114,4 +118,4 @@ LABEL \
 
 # RUN \
 #     cd ~/.local/share/JetBrains/RiderRemoteDebugger/${DEBUGGER_TOOLS_VERSION} \
-#     7z x debug_tools.zip
+#     7z x debug_tools.zip