Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-04 21:35:23 +02:00
Code Issues Releases Activity

fix(edge) EE-1720 activate tunnel and remove proxy cache when needed (#5775)

Browse source 
Co-authored-by: Simon Meng <simon.meng@portainer.io>
This commit is contained in:
cong meng 2021-10-15 18:13:20 +13:00 • committed by GitHub
parent 588ce549ad
commit 41999e149f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
18 changed files with 99 additions and 101 deletions
Download patch file Download diff file Expand all files Collapse all files

21
api/http/proxy/factory/docker/volumes.go
View file

@ -132,16 +132,12 @@ func (transport *Transport) decorateVolumeResourceCreationOperation(request *htt
volumeID := request.Header.Get("X-Portainer-VolumeName")
if volumeID != "" {
cli := transport.dockerClient
agentTargetHeader := request.Header.Get(portainer.PortainerAgentTargetHeader)
if agentTargetHeader != "" {
dockerClient, err := transport.dockerClientFactory.CreateClient(transport.endpoint, agentTargetHeader)
if err != nil {
return nil, err
}
defer dockerClient.Close()
cli = dockerClient
cli, err := transport.dockerClientFactory.CreateClient(transport.endpoint, agentTargetHeader)
if err != nil {
return nil, err
}
defer cli.Close()
_, err = cli.VolumeInspect(context.Background(), volumeID)
if err == nil {
@ -223,10 +219,13 @@ func (transport *Transport) getDockerID() (string, error) {
}
}
cli := transport.dockerClient
defer cli.Close()
client, err := transport.dockerClientFactory.CreateClient(transport.endpoint, "")
if err != nil {
return "", err
}
defer client.Close()
info, err := cli.Info(context.Background())
info, err := client.Info(context.Background())
if err != nil {
return "", err
}