TyleoDvDelaware3217/GoDoxy
1
0
Fork 0
mirror of https://github.com/yusing/godoxy.git synced 2025-05-19 20:32:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(agent): disable socket proxy by default

Browse source
This commit is contained in:
yusing 2025-05-10 12:26:06 +08:00
parent fc0dbd940c
commit e0e0fab127
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
agent/pkg/agent/templates/agent.compose.yml
View file

@ -9,9 +9,9 @@ services:
AGENT_PORT: "{{.Port}}" AGENT_PORT: "{{.Port}}"
AGENT_CA_CERT: "{{.CACert}}" AGENT_CA_CERT: "{{.CACert}}"
AGENT_SSL_CERT: "{{.SSLCert}}" AGENT_SSL_CERT: "{{.SSLCert}}"
# docker socket proxy: [host]:port # use agent as a docker socket proxy: [host]:port
# unset DOCKER_SOCKET_ADDR to disable # set LISTEN_ADDR to enable (e.g. 127.0.0.1:2375)
DOCKER_SOCKET_ADDR: 127.0.0.1:2375 LISTEN_ADDR:
POST: false POST: false
ALLOW_RESTARTS: false ALLOW_RESTARTS: false
ALLOW_START: false ALLOW_START: false

2
agent/pkg/env/env.go vendored
View file

@ -20,6 +20,7 @@ var (
AgentSkipClientCertCheck bool AgentSkipClientCertCheck bool
AgentCACert string AgentCACert string
AgentSSLCert string AgentSSLCert string
DockerSocket string
) )
func init() { func init() {
@ -27,6 +28,7 @@ func init() {
} }
func Load() { func Load() {
DockerSocket = common.GetEnvString("DOCKER_SOCKET", "/var/run/docker.sock")
AgentName = common.GetEnvString("AGENT_NAME", DefaultAgentName()) AgentName = common.GetEnvString("AGENT_NAME", DefaultAgentName())
AgentPort = common.GetEnvInt("AGENT_PORT", 8890) AgentPort = common.GetEnvInt("AGENT_PORT", 8890)
AgentSkipClientCertCheck = common.GetEnvBool("AGENT_SKIP_CLIENT_CERT_CHECK", false) AgentSkipClientCertCheck = common.GetEnvBool("AGENT_SKIP_CLIENT_CERT_CHECK", false)

2
socket-proxy/pkg/env.go
View file

@ -68,7 +68,7 @@ func stringstring(s string) (string, error) {
} }
func Load() { func Load() {
DockerSocket = GetEnvString("DOCKER_SOCKET", GetEnvString("DOCKER_HOST", "/var/run/docker.sock")) DockerSocket = GetEnvString("DOCKER_SOCKET", "/var/run/docker.sock")
ListenAddr = GetEnvString("LISTEN_ADDR", GetEnvString("DOCKER_SOCKET_ADDR", "")) // default to disabled ListenAddr = GetEnvString("LISTEN_ADDR", GetEnvString("DOCKER_SOCKET_ADDR", "")) // default to disabled
DockerPost = GetEnvBool("POST", false) DockerPost = GetEnvBool("POST", false)