github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

fix(libcompose): fix an issue with TLS enabled endpoints (#2071)

pull/2072/head
Anthony Lapenna 2018-07-24 11:11:47 +02:00 committed by GitHub
parent 4de83f793f
commit 1cf77bf9e9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 20 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
api/libcompose/compose_stack.go
View File

@ -27,17 +27,27 @@ func NewComposeStackManager(dataPath string) *ComposeStackManager {
} }
} }
func createClient(endpoint *portainer.Endpoint) (client.Factory, error) {
clientOpts := client.Options{
Host: endpoint.URL,
APIVersion: portainer.SupportedDockerAPIVersion,
}
if endpoint.TLSConfig.TLS {
clientOpts.TLS = endpoint.TLSConfig.TLS
clientOpts.TLSVerify = !endpoint.TLSConfig.TLSSkipVerify
clientOpts.TLSCAFile = endpoint.TLSConfig.TLSCACertPath
clientOpts.TLSCertFile = endpoint.TLSConfig.TLSCertPath
clientOpts.TLSKeyFile = endpoint.TLSConfig.TLSKeyPath
}
return client.NewDefaultFactory(clientOpts)
}
// Up will deploy a compose stack (equivalent of docker-compose up) // Up will deploy a compose stack (equivalent of docker-compose up)
func (manager *ComposeStackManager) Up(stack *portainer.Stack, endpoint *portainer.Endpoint) error { func (manager *ComposeStackManager) Up(stack *portainer.Stack, endpoint *portainer.Endpoint) error {
clientFactory, err := client.NewDefaultFactory(client.Options{
TLS: endpoint.TLSConfig.TLS, clientFactory, err := createClient(endpoint)
TLSVerify: endpoint.TLSConfig.TLSSkipVerify,
Host: endpoint.URL,
TLSCAFile: endpoint.TLSCACertPath,
TLSCertFile: endpoint.TLSCertPath,
TLSKeyFile: endpoint.TLSKeyPath,
APIVersion: portainer.SupportedDockerAPIVersion,
})
if err != nil { if err != nil {
return err return err
} }
@ -75,15 +85,7 @@ func (manager *ComposeStackManager) Up(stack *portainer.Stack, endpoint *portain
// Down will shutdown a compose stack (equivalent of docker-compose down) // Down will shutdown a compose stack (equivalent of docker-compose down)
func (manager *ComposeStackManager) Down(stack *portainer.Stack, endpoint *portainer.Endpoint) error { func (manager *ComposeStackManager) Down(stack *portainer.Stack, endpoint *portainer.Endpoint) error {
clientFactory, err := client.NewDefaultFactory(client.Options{ clientFactory, err := createClient(endpoint)
TLS: endpoint.TLSConfig.TLS,
TLSVerify: endpoint.TLSConfig.TLSSkipVerify,
Host: endpoint.URL,
TLSCAFile: endpoint.TLSCACertPath,
TLSCertFile: endpoint.TLSCertPath,
TLSKeyFile: endpoint.TLSKeyPath,
APIVersion: portainer.SupportedDockerAPIVersion,
})
if err != nil { if err != nil {
return err return err
} }