Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 00:09:40 +02:00
Code Issues Releases Activity

resolve conflicts

Browse source
This commit is contained in:
ArrisLee 2021-09-08 11:27:53 +12:00
commit 1991475437
62 changed files with 1765 additions and 484 deletions
Download patch file Download diff file Expand all files Collapse all files

2
api/http/proxy/factory/agent.go
View file

@ -68,7 +68,7 @@ func (factory *ProxyFactory) NewAgentProxy(endpoint *portainer.Endpoint) (*Proxy
return nil, errors.Wrap(err, "failed starting proxy server")
}
return proxyServer, err
return proxyServer, nil
}
func (proxy *ProxyServer) start() error {