Merge tag '1.14.2' into develop

Release 1.14.2

api/crypto/tls.go

@@ -12,30 +12,28 @@ import (
 func CreateTLSConfiguration(config *portainer.TLSConfiguration) (*tls.Config, error) {
 	TLSConfig := &tls.Config{}
 
-	if config.TLS {
-		if config.TLSCertPath != "" && config.TLSKeyPath != "" {
-			cert, err := tls.LoadX509KeyPair(config.TLSCertPath, config.TLSKeyPath)
-			if err != nil {
-				return nil, err
-			}
-
-			TLSConfig.Certificates = []tls.Certificate{cert}
+	if config.TLSCertPath != "" && config.TLSKeyPath != "" {
+		cert, err := tls.LoadX509KeyPair(config.TLSCertPath, config.TLSKeyPath)
+		if err != nil {
+			return nil, err
 		}
 
-		if !config.TLSSkipVerify {
-			caCert, err := ioutil.ReadFile(config.TLSCACertPath)
-			if err != nil {
-				return nil, err
-			}
-
-			caCertPool := x509.NewCertPool()
-			caCertPool.AppendCertsFromPEM(caCert)
+		TLSConfig.Certificates = []tls.Certificate{cert}
+	}
 
-			TLSConfig.RootCAs = caCertPool
+	if !config.TLSSkipVerify {
+		caCert, err := ioutil.ReadFile(config.TLSCACertPath)
+		if err != nil {
+			return nil, err
 		}
 
-		TLSConfig.InsecureSkipVerify = config.TLSSkipVerify
+		caCertPool := x509.NewCertPool()
+		caCertPool.AppendCertsFromPEM(caCert)
+
+		TLSConfig.RootCAs = caCertPool
 	}
 
+	TLSConfig.InsecureSkipVerify = config.TLSSkipVerify
+
 	return TLSConfig, nil
 }

api/portainer.go

@@ -345,7 +345,7 @@ type (
 
 const (
 	// APIVersion is the version number of the Portainer API.
-	APIVersion = "1.14.1"
+	APIVersion = "1.14.2"
 	// DBVersion is the version number of the Portainer database.
 	DBVersion = 4
 	// DefaultTemplatesURL represents the default URL for the templates definitions.

api/swagger.yaml

@@ -56,7 +56,7 @@ info:
 
     **NOTE**: You can find more information on how to query the Docker API in the [Docker official documentation](https://docs.docker.com/engine/api/v1.30/) as well as in [this Portainer example](https://gist.github.com/deviantony/77026d402366b4b43fa5918d41bc42f8).
 
-  version: "1.14.1"
+  version: "1.14.2"
   title: "Portainer API"
   contact:
     email: "info@portainer.io"
@@ -1869,7 +1869,7 @@ definitions:
         description: "Is analytics enabled"
       Version:
         type: "string"
-        example: "1.14.1"
+        example: "1.14.2"
         description: "Portainer API version"
   PublicSettingsInspectResponse:
     type: "object"

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "portainer",
-  "version": "1.14.1",
+  "version": "1.14.2",
   "homepage": "https://github.com/portainer/portainer",
   "authors": [
     "Anthony Lapenna <anthony.lapenna at gmail dot com>"

package.json

@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "1.14.1",
+  "version": "1.14.2",
   "repository": {
     "type": "git",
     "url": "git@github.com:portainer/portainer.git"