feat(toolkit): removed unused yarn command

* fix(migration): bubble up recovered panic in new error EE-1971

* improve code and add comments

api/bolt/migrate_data.go

@@ -18,13 +18,16 @@ const beforePortainerVersionUpgradeBackup = "portainer.db.bak"
 var migrateLog = plog.NewScopedLog("bolt, migrate")
 
 // FailSafeMigrate backup and restore DB if migration fail
-func (store *Store) FailSafeMigrate(migrator *migrator.Migrator) error {
+func (store *Store) FailSafeMigrate(migrator *migrator.Migrator) (err error) {
 	defer func() {
-		if err := recover(); err != nil {
-			migrateLog.Info(fmt.Sprintf("Error during migration, recovering [%v]", err))
+		if e := recover(); e != nil {
 			store.Rollback(true)
+			err = fmt.Errorf("%v", e)
 		}
 	}()
+
+	// !Important: we must use a named return value in the function definition and not a local
+	// !variable referenced from the closure or else the return value will be incorrectly set
 	return migrator.Migrate()
 }
 

api/bolt/migrator/migrate_dbversion31.go

@@ -218,8 +218,12 @@ func findResourcesToUpdateForDB32(dockerID string, volumesData map[string]interf
 		if !nameExist {
 			continue
 		}
+		createTime, createTimeExist := volume["CreatedAt"].(string)
+		if !createTimeExist {
+			continue
+		}
 
-		oldResourceID := fmt.Sprintf("%s%s", volumeName, volume["CreatedAt"].(string))
+		oldResourceID := fmt.Sprintf("%s%s", volumeName, createTime)
 		resourceControl, ok := volumeResourceControls[oldResourceID]
 
 		if ok {

api/bolt/stack/stack.go

@@ -192,8 +192,8 @@ func (service *Service) RefreshableStacks() ([]portainer.Stack, error) {
 		bucket := tx.Bucket([]byte(BucketName))
 		cursor := bucket.Cursor()
 
-		var stack portainer.Stack
 		for k, v := cursor.First(); k != nil; k, v = cursor.Next() {
+			stack := portainer.Stack{}
 			err := internal.UnmarshalObject(v, &stack)
 			if err != nil {
 				return err

api/chisel/service.go

@@ -3,6 +3,7 @@ package chisel
 import (
 	"context"
 	"fmt"
+	"github.com/portainer/portainer/api/http/proxy"
 	"log"
 	"net/http"
 	"strconv"
@@ -32,6 +33,7 @@ type Service struct {
 	snapshotService   portainer.SnapshotService
 	chiselServer      *chserver.Server
 	shutdownCtx       context.Context
+	ProxyManager      *proxy.Manager
 }
 
 // NewService returns a pointer to a new instance of Service
@@ -215,18 +217,13 @@ func (service *Service) checkTunnels() {
 			}
 		}
 
-		if len(tunnel.Jobs) > 0 {
-			endpointID, err := strconv.Atoi(item.Key)
-			if err != nil {
-				log.Printf("[ERROR] [chisel,conversion] Invalid environment identifier (id: %s): %s", item.Key, err)
-				continue
-			}
-
-			service.SetTunnelStatusToIdle(portainer.EndpointID(endpointID))
-		} else {
-			service.tunnelDetailsMap.Remove(item.Key)
+		endpointID, err := strconv.Atoi(item.Key)
+		if err != nil {
+			log.Printf("[ERROR] [chisel,conversion] Invalid environment identifier (id: %s): %s", item.Key, err)
+			continue
 		}
 
+		service.SetTunnelStatusToIdle(portainer.EndpointID(endpointID))
 	}
 }
 

api/chisel/tunnel.go

@@ -59,6 +59,12 @@ func (service *Service) GetTunnelDetails(endpointID portainer.EndpointID) *porta
 // GetActiveTunnel retrieves an active tunnel which allows communicating with edge agent
 func (service *Service) GetActiveTunnel(endpoint *portainer.Endpoint) (*portainer.TunnelDetails, error) {
 	tunnel := service.GetTunnelDetails(endpoint.ID)
+
+	if tunnel.Status == portainer.EdgeAgentActive {
+		// update the LastActivity
+		service.SetTunnelStatusToActive(endpoint.ID)
+	}
+
 	if tunnel.Status == portainer.EdgeAgentIdle || tunnel.Status == portainer.EdgeAgentManagementRequired {
 		err := service.SetTunnelStatusToRequired(endpoint.ID)
 		if err != nil {
@@ -74,9 +80,18 @@ func (service *Service) GetActiveTunnel(endpoint *portainer.Endpoint) (*portaine
 			endpoint.EdgeCheckinInterval = settings.EdgeAgentCheckinInterval
 		}
 
-		waitForAgentToConnect := time.Duration(endpoint.EdgeCheckinInterval) * time.Second
-		time.Sleep(waitForAgentToConnect * 2)
+		waitForAgentToConnect := 2 * time.Duration(endpoint.EdgeCheckinInterval)
+
+		for waitForAgentToConnect >= 0 {
+			waitForAgentToConnect--
+			time.Sleep(time.Second)
+			tunnel = service.GetTunnelDetails(endpoint.ID)
+			if tunnel.Status == portainer.EdgeAgentActive {
+				break
+			}
+		}
 	}
+
 	tunnel = service.GetTunnelDetails(endpoint.ID)
 
 	return tunnel, nil
@@ -112,6 +127,8 @@ func (service *Service) SetTunnelStatusToIdle(endpointID portainer.EndpointID) {
 
 	key := strconv.Itoa(int(endpointID))
 	service.tunnelDetailsMap.Set(key, tunnel)
+
+	service.ProxyManager.DeleteEndpointProxy(endpointID)
 }
 
 // SetTunnelStatusToRequired update the status of the tunnel associated to the specified environment(endpoint).

api/cmd/portainer/main.go

@@ -467,6 +467,8 @@ func buildServer(flags *portainer.CLIFlags) portainer.Server {
 
 	proxyManager := proxy.NewManager(dataStore, digitalSignatureService, reverseTunnelService, dockerClientFactory, kubernetesClientFactory, kubernetesTokenCacheManager)
 
+	reverseTunnelService.ProxyManager = proxyManager
+
 	dockerConfigPath := fileService.GetDockerConfigPath()
 
 	composeStackManager := initComposeStackManager(*flags.Assets, dockerConfigPath, reverseTunnelService, proxyManager)

api/docker/client.go

@@ -91,7 +91,11 @@ func createEdgeClient(endpoint *portainer.Endpoint, signatureService portainer.D
 		headers[portainer.PortainerAgentTargetHeader] = nodeName
 	}
 
-	tunnel := reverseTunnelService.GetTunnelDetails(endpoint.ID)
+	tunnel, err := reverseTunnelService.GetActiveTunnel(endpoint)
+	if err != nil {
+		return nil, err
+	}
+	
 	endpointURL := fmt.Sprintf("http://127.0.0.1:%d", tunnel.Port)
 
 	return client.NewClientWithOpts(

api/exec/swarm_stack.go

@@ -44,19 +44,26 @@ func NewSwarmStackManager(binaryPath, configPath string, signatureService portai
 }
 
 // Login executes the docker login command against a list of registries (including DockerHub).
-func (manager *SwarmStackManager) Login(registries []portainer.Registry, endpoint *portainer.Endpoint) {
-	command, args := manager.prepareDockerCommandAndArgs(manager.binaryPath, manager.configPath, endpoint)
+func (manager *SwarmStackManager) Login(registries []portainer.Registry, endpoint *portainer.Endpoint) error {
+	command, args, err := manager.prepareDockerCommandAndArgs(manager.binaryPath, manager.configPath, endpoint)
+	if err != nil {
+		return err
+	}
 	for _, registry := range registries {
 		if registry.Authentication {
 			registryArgs := append(args, "login", "--username", registry.Username, "--password", registry.Password, registry.URL)
 			runCommandAndCaptureStdErr(command, registryArgs, nil, "")
 		}
 	}
+	return nil
 }
 
 // Logout executes the docker logout command.
 func (manager *SwarmStackManager) Logout(endpoint *portainer.Endpoint) error {
-	command, args := manager.prepareDockerCommandAndArgs(manager.binaryPath, manager.configPath, endpoint)
+	command, args, err := manager.prepareDockerCommandAndArgs(manager.binaryPath, manager.configPath, endpoint)
+	if err != nil {
+		return err
+	}
 	args = append(args, "logout")
 	return runCommandAndCaptureStdErr(command, args, nil, "")
 }
@@ -64,7 +71,10 @@ func (manager *SwarmStackManager) Logout(endpoint *portainer.Endpoint) error {
 // Deploy executes the docker stack deploy command.
 func (manager *SwarmStackManager) Deploy(stack *portainer.Stack, prune bool, endpoint *portainer.Endpoint) error {
 	filePaths := stackutils.GetStackFilePaths(stack)
-	command, args := manager.prepareDockerCommandAndArgs(manager.binaryPath, manager.configPath, endpoint)
+	command, args, err := manager.prepareDockerCommandAndArgs(manager.binaryPath, manager.configPath, endpoint)
+	if err != nil {
+		return err
+	}
 
 	if prune {
 		args = append(args, "stack", "deploy", "--prune", "--with-registry-auth")
@@ -84,7 +94,10 @@ func (manager *SwarmStackManager) Deploy(stack *portainer.Stack, prune bool, end
 
 // Remove executes the docker stack rm command.
 func (manager *SwarmStackManager) Remove(stack *portainer.Stack, endpoint *portainer.Endpoint) error {
-	command, args := manager.prepareDockerCommandAndArgs(manager.binaryPath, manager.configPath, endpoint)
+	command, args, err := manager.prepareDockerCommandAndArgs(manager.binaryPath, manager.configPath, endpoint)
+	if err != nil {
+		return err
+	}
 	args = append(args, "stack", "rm", stack.Name)
 	return runCommandAndCaptureStdErr(command, args, nil, "")
 }
@@ -108,7 +121,7 @@ func runCommandAndCaptureStdErr(command string, args []string, env []string, wor
 	return nil
 }
 
-func (manager *SwarmStackManager) prepareDockerCommandAndArgs(binaryPath, configPath string, endpoint *portainer.Endpoint) (string, []string) {
+func (manager *SwarmStackManager) prepareDockerCommandAndArgs(binaryPath, configPath string, endpoint *portainer.Endpoint) (string, []string, error) {
 	// Assume Linux as a default
 	command := path.Join(binaryPath, "docker")
 
@@ -121,7 +134,10 @@ func (manager *SwarmStackManager) prepareDockerCommandAndArgs(binaryPath, config
 
 	endpointURL := endpoint.URL
 	if endpoint.Type == portainer.EdgeAgentOnDockerEnvironment {
-		tunnel := manager.reverseTunnelService.GetTunnelDetails(endpoint.ID)
+		tunnel, err := manager.reverseTunnelService.GetActiveTunnel(endpoint)
+		if err != nil {
+			return "", nil, err
+		}
 		endpointURL = fmt.Sprintf("tcp://127.0.0.1:%d", tunnel.Port)
 	}
 
@@ -141,7 +157,7 @@ func (manager *SwarmStackManager) prepareDockerCommandAndArgs(binaryPath, config
 		}
 	}
 
-	return command, args
+	return command, args, nil
 }
 
 func (manager *SwarmStackManager) updateDockerCLIConfiguration(configPath string) error {

api/go.mod

@@ -30,7 +30,7 @@ require (
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/orcaman/concurrent-map v0.0.0-20190826125027-8c72a8bb44f6
 	github.com/pkg/errors v0.9.1
-	github.com/portainer/docker-compose-wrapper v0.0.0-20210909083948-8be0d98451a1
+	github.com/portainer/docker-compose-wrapper v0.0.0-20211018221743-10a04c9d4f19
 	github.com/portainer/libcrypto v0.0.0-20210422035235-c652195c5c3a
 	github.com/portainer/libhelm v0.0.0-20210929000907-825e93d62108
 	github.com/portainer/libhttp v0.0.0-20190806161843-ba068f58be33

api/go.sum

@@ -600,8 +600,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/portainer/docker-compose-wrapper v0.0.0-20210909083948-8be0d98451a1 h1:0ZGSu3Atz7RHMDsoITHV676igRfsb51mlgELGo37ELU=
-github.com/portainer/docker-compose-wrapper v0.0.0-20210909083948-8be0d98451a1/go.mod h1:WxDlJWZxCnicdLCPnLNEv7/gRhjeIVuCGmsv+iOPH3c=
+github.com/portainer/docker-compose-wrapper v0.0.0-20211018221743-10a04c9d4f19 h1:tG2gU4mkm5yElj35XpU3lgllOYQxN3kaM1Jab7AqTDs=
+github.com/portainer/docker-compose-wrapper v0.0.0-20211018221743-10a04c9d4f19/go.mod h1:WxDlJWZxCnicdLCPnLNEv7/gRhjeIVuCGmsv+iOPH3c=
 github.com/portainer/libcrypto v0.0.0-20210422035235-c652195c5c3a h1:qY8TbocN75n5PDl16o0uVr5MevtM5IhdwSelXEd4nFM=
 github.com/portainer/libcrypto v0.0.0-20210422035235-c652195c5c3a/go.mod h1:n54EEIq+MM0NNtqLeCby8ljL+l275VpolXO0ibHegLE=
 github.com/portainer/libhelm v0.0.0-20210929000907-825e93d62108 h1:5e8KAnDa2G3cEHK7aV/ue8lOaoQwBZUzoALslwWkR04=

api/http/handler/endpointproxy/proxy_docker.go

@@ -2,14 +2,12 @@ package endpointproxy
 
 import (
 	"errors"
-	"strconv"
-	"strings"
-	"time"
-
 	httperror "github.com/portainer/libhttp/error"
 	"github.com/portainer/libhttp/request"
 	"github.com/portainer/portainer/api"
 	bolterrors "github.com/portainer/portainer/api/bolt/errors"
+	"strconv"
+	"strings"
 
 	"net/http"
 )
@@ -37,22 +35,9 @@ func (handler *Handler) proxyRequestsToDockerAPI(w http.ResponseWriter, r *http.
 			return &httperror.HandlerError{http.StatusInternalServerError, "No Edge agent registered with the environment", errors.New("No agent available")}
 		}
 
-		tunnel := handler.ReverseTunnelService.GetTunnelDetails(endpoint.ID)
-		if tunnel.Status == portainer.EdgeAgentIdle {
-			handler.ProxyManager.DeleteEndpointProxy(endpoint)
-
-			err := handler.ReverseTunnelService.SetTunnelStatusToRequired(endpoint.ID)
-			if err != nil {
-				return &httperror.HandlerError{http.StatusInternalServerError, "Unable to update tunnel status", err}
-			}
-
-			settings, err := handler.DataStore.Settings().Settings()
-			if err != nil {
-				return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve settings from the database", err}
-			}
-
-			waitForAgentToConnect := time.Duration(settings.EdgeAgentCheckinInterval) * time.Second
-			time.Sleep(waitForAgentToConnect * 2)
+		_, err := handler.ReverseTunnelService.GetActiveTunnel(endpoint)
+		if err != nil {
+			return &httperror.HandlerError{http.StatusInternalServerError, "Unable to get the active tunnel", err}
 		}
 	}
 

api/http/handler/endpointproxy/proxy_kubernetes.go

@@ -3,13 +3,11 @@ package endpointproxy
 import (
 	"errors"
 	"fmt"
-	"strings"
-	"time"
-
 	httperror "github.com/portainer/libhttp/error"
 	"github.com/portainer/libhttp/request"
 	portainer "github.com/portainer/portainer/api"
 	bolterrors "github.com/portainer/portainer/api/bolt/errors"
+	"strings"
 
 	"net/http"
 )
@@ -37,22 +35,9 @@ func (handler *Handler) proxyRequestsToKubernetesAPI(w http.ResponseWriter, r *h
 			return &httperror.HandlerError{http.StatusInternalServerError, "No Edge agent registered with the environment", errors.New("No agent available")}
 		}
 
-		tunnel := handler.ReverseTunnelService.GetTunnelDetails(endpoint.ID)
-		if tunnel.Status == portainer.EdgeAgentIdle {
-			handler.ProxyManager.DeleteEndpointProxy(endpoint)
-
-			err := handler.ReverseTunnelService.SetTunnelStatusToRequired(endpoint.ID)
-			if err != nil {
-				return &httperror.HandlerError{http.StatusInternalServerError, "Unable to update tunnel status", err}
-			}
-
-			settings, err := handler.DataStore.Settings().Settings()
-			if err != nil {
-				return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve settings from the database", err}
-			}
-
-			waitForAgentToConnect := time.Duration(settings.EdgeAgentCheckinInterval) * time.Second
-			time.Sleep(waitForAgentToConnect * 2)
+		_, err := handler.ReverseTunnelService.GetActiveTunnel(endpoint)
+		if err != nil {
+			return &httperror.HandlerError{http.StatusInternalServerError, "Unable to get the active tunnel", err}
 		}
 	}
 

api/http/handler/endpoints/endpoint_delete.go

@@ -49,7 +49,7 @@ func (handler *Handler) endpointDelete(w http.ResponseWriter, r *http.Request) *
 		return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove environment from the database", err}
 	}
 
-	handler.ProxyManager.DeleteEndpointProxy(endpoint)
+	handler.ProxyManager.DeleteEndpointProxy(endpoint.ID)
 
 	err = handler.DataStore.EndpointRelation().DeleteEndpointRelation(endpoint.ID)
 	if err != nil {

api/http/handler/handler.go

@@ -74,7 +74,7 @@ type Handler struct {
 }
 
 // @title PortainerCE API
-// @version 2.9.1
+// @version 2.9.2
 // @description.markdown api-description.md
 // @termsOfService
 

api/http/handler/settings/settings_update.go

@@ -54,11 +54,8 @@ func (payload *settingsUpdatePayload) Validate(r *http.Request) error {
 	if payload.TemplatesURL != nil && *payload.TemplatesURL != "" && !govalidator.IsURL(*payload.TemplatesURL) {
 		return errors.New("Invalid external templates URL. Must correspond to a valid URL format")
 	}
-	if payload.HelmRepositoryURL != nil && *payload.HelmRepositoryURL != "" {
-		err := libhelm.ValidateHelmRepositoryURL(*payload.HelmRepositoryURL)
-		if err != nil {
-			return errors.Wrap(err, "Invalid Helm repository URL. Must correspond to a valid URL format")
-		}
+	if payload.HelmRepositoryURL != nil && *payload.HelmRepositoryURL != "" && !govalidator.IsURL(*payload.HelmRepositoryURL) {
+		return errors.New("Invalid Helm repository URL. Must correspond to a valid URL format")
 	}
 	if payload.UserSessionTimeout != nil {
 		_, err := time.ParseDuration(*payload.UserSessionTimeout)
@@ -114,7 +111,18 @@ func (handler *Handler) settingsUpdate(w http.ResponseWriter, r *http.Request) *
 	}
 
 	if payload.HelmRepositoryURL != nil {
-		settings.HelmRepositoryURL = strings.TrimSuffix(strings.ToLower(*payload.HelmRepositoryURL), "/")
+		newHelmRepo := strings.TrimSuffix(strings.ToLower(*payload.HelmRepositoryURL), "/")
+
+		if newHelmRepo != settings.HelmRepositoryURL && newHelmRepo != portainer.DefaultHelmRepositoryURL {
+			err := libhelm.ValidateHelmRepositoryURL(*payload.HelmRepositoryURL)
+			if err != nil {
+				return &httperror.HandlerError{http.StatusBadRequest, "Invalid Helm repository URL. Must correspond to a valid URL format", err}
+			}
+		}
+
+		settings.HelmRepositoryURL = newHelmRepo
+	} else {
+		settings.HelmRepositoryURL = ""
 	}
 
 	if payload.BlackListedLabels != nil {

api/http/handler/stacks/stack_list.go

@@ -27,7 +27,7 @@ type stackListOperationFilters struct {
 // @description **Access policy**: authenticated
 // @tags stacks
 // @security jwt
-// @param filters query string false "Filters to process on the stack list. Encoded as JSON (a map[string]string). For example, {"SwarmID": "jpofkc0i9uo9wtx1zesuk649w"} will only return stacks that are part of the specified Swarm cluster. Available filters: EndpointID, SwarmID."
+// @param filters query string false "Filters to process on the stack list. Encoded as JSON (a map[string]string). For example, {'SwarmID': 'jpofkc0i9uo9wtx1zesuk649w'} will only return stacks that are part of the specified Swarm cluster. Available filters: EndpointID, SwarmID."
 // @success 200 {array} portainer.Stack "Success"
 // @success 204 "Success"
 // @failure 400 "Invalid request"

api/http/handler/stacks/stack_update_git.go

@@ -146,6 +146,10 @@ func (handler *Handler) stackUpdateGit(w http.ResponseWriter, r *http.Request) *
 			Username: payload.RepositoryUsername,
 			Password: password,
 		}
+		_, err = handler.GitService.LatestCommitID(stack.GitConfig.URL, stack.GitConfig.ReferenceName, stack.GitConfig.Authentication.Username, stack.GitConfig.Authentication.Password)
+		if err != nil {
+			return &httperror.HandlerError{StatusCode: http.StatusInternalServerError, Message: "Unable to fetch git repository", Err: err}
+		}
 	}
 
 	if payload.AutoUpdate != nil && payload.AutoUpdate.Interval != "" {

api/http/handler/stacks/update_kubernetes_stack.go

@@ -74,6 +74,10 @@ func (handler *Handler) updateKubernetesStack(r *http.Request, stack *portainer.
 				Username: payload.RepositoryUsername,
 				Password: password,
 			}
+			_, err := handler.GitService.LatestCommitID(stack.GitConfig.URL, stack.GitConfig.ReferenceName, stack.GitConfig.Authentication.Username, stack.GitConfig.Authentication.Password)
+			if err != nil {
+				return &httperror.HandlerError{StatusCode: http.StatusInternalServerError, Message: "Unable to fetch git repository", Err: err}
+			}
 		} else {
 			stack.GitConfig.Authentication = nil
 		}

api/http/handler/websocket/proxy.go

@@ -12,7 +12,10 @@ import (
 )
 
 func (handler *Handler) proxyEdgeAgentWebsocketRequest(w http.ResponseWriter, r *http.Request, params *webSocketRequestParams) error {
-	tunnel := handler.ReverseTunnelService.GetTunnelDetails(params.endpoint.ID)
+	tunnel, err := handler.ReverseTunnelService.GetActiveTunnel(params.endpoint)
+	if err != nil {
+		return err
+	}
 
 	endpointURL, err := url.Parse(fmt.Sprintf("http://127.0.0.1:%d", tunnel.Port))
 	if err != nil {

api/http/proxy/factory/docker.go

@@ -32,12 +32,13 @@ func (factory *ProxyFactory) newDockerLocalProxy(endpoint *portainer.Endpoint) (
 }
 
 func (factory *ProxyFactory) newDockerHTTPProxy(endpoint *portainer.Endpoint) (http.Handler, error) {
+	rawURL := endpoint.URL
 	if endpoint.Type == portainer.EdgeAgentOnDockerEnvironment {
 		tunnel := factory.reverseTunnelService.GetTunnelDetails(endpoint.ID)
-		endpoint.URL = fmt.Sprintf("http://127.0.0.1:%d", tunnel.Port)
+		rawURL = fmt.Sprintf("http://127.0.0.1:%d", tunnel.Port)
 	}
 
-	endpointURL, err := url.Parse(endpoint.URL)
+	endpointURL, err := url.Parse(rawURL)
 	if err != nil {
 		return nil, err
 	}

api/http/proxy/factory/docker/access_control.go

@@ -122,17 +122,11 @@ func (transport *Transport) createPrivateResourceControl(resourceIdentifier stri
 }
 
 func (transport *Transport) getInheritedResourceControlFromServiceOrStack(resourceIdentifier, nodeName string, resourceType portainer.ResourceControlType, resourceControls []portainer.ResourceControl) (*portainer.ResourceControl, error) {
-	client := transport.dockerClient
-
-	if nodeName != "" {
-		dockerClient, err := transport.dockerClientFactory.CreateClient(transport.endpoint, nodeName)
-		if err != nil {
-			return nil, err
-		}
-		defer dockerClient.Close()
-
-		client = dockerClient
+	client, err := transport.dockerClientFactory.CreateClient(transport.endpoint, nodeName)
+	if err != nil {
+		return nil, err
 	}
+	defer client.Close()
 
 	switch resourceType {
 	case portainer.ContainerResourceControl:

api/http/proxy/factory/docker/transport.go

@@ -14,7 +14,6 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/docker/docker/client"
 	portainer "github.com/portainer/portainer/api"
 	"github.com/portainer/portainer/api/docker"
 	"github.com/portainer/portainer/api/http/proxy/factory/utils"
@@ -33,7 +32,6 @@ type (
 		dataStore            portainer.DataStore
 		signatureService     portainer.DigitalSignatureService
 		reverseTunnelService portainer.ReverseTunnelService
-		dockerClient         *client.Client
 		dockerClientFactory  *docker.ClientFactory
 	}
 
@@ -63,11 +61,6 @@ type (
 
 // NewTransport returns a pointer to a new Transport instance.
 func NewTransport(parameters *TransportParameters, httpTransport *http.Transport) (*Transport, error) {
-	dockerClient, err := parameters.DockerClientFactory.CreateClient(parameters.Endpoint, "")
-	if err != nil {
-		return nil, err
-	}
-
 	transport := &Transport{
 		endpoint:             parameters.Endpoint,
 		dataStore:            parameters.DataStore,
@@ -75,7 +68,6 @@ func NewTransport(parameters *TransportParameters, httpTransport *http.Transport
 		reverseTunnelService: parameters.ReverseTunnelService,
 		dockerClientFactory:  parameters.DockerClientFactory,
 		HTTPTransport:        httpTransport,
-		dockerClient:         dockerClient,
 	}
 
 	return transport, nil

api/http/proxy/factory/docker/volumes.go

@@ -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
 	}

api/http/proxy/factory/kubernetes.go

@@ -52,9 +52,9 @@ func (factory *ProxyFactory) newKubernetesLocalProxy(endpoint *portainer.Endpoin
 
 func (factory *ProxyFactory) newKubernetesEdgeHTTPProxy(endpoint *portainer.Endpoint) (http.Handler, error) {
 	tunnel := factory.reverseTunnelService.GetTunnelDetails(endpoint.ID)
-	endpoint.URL = fmt.Sprintf("http://localhost:%d", tunnel.Port)
+	rawURL := fmt.Sprintf("http://127.0.0.1:%d", tunnel.Port)
 
-	endpointURL, err := url.Parse(endpoint.URL)
+	endpointURL, err := url.Parse(rawURL)
 	if err != nil {
 		return nil, err
 	}

api/http/proxy/factory/kubernetes/namespaces.go

@@ -46,5 +46,19 @@ func (transport *baseTransport) proxyNamespaceDeleteOperation(request *http.Requ
 			}
 		}
 	}
+
+	stacks, err := transport.dataStore.Stack().Stacks()
+	if err != nil {
+		return nil, err
+	}
+
+	for _, s := range stacks {
+		if s.Namespace == namespace && s.EndpointID == transport.endpoint.ID {
+			if err := transport.dataStore.Stack().DeleteStack(s.ID); err != nil {
+				return nil, err
+			}
+		}
+	}
+
 	return transport.executeKubernetesRequest(request)
 }

api/http/proxy/manager.go

@@ -67,9 +67,9 @@ func (manager *Manager) GetEndpointProxy(endpoint *portainer.Endpoint) http.Hand
 // DeleteEndpointProxy deletes the proxy associated to a key
 // and cleans the k8s environment(endpoint) client cache. DeleteEndpointProxy
 // is currently only called for edge connection clean up.
-func (manager *Manager) DeleteEndpointProxy(endpoint *portainer.Endpoint) {
-	manager.endpointProxies.Remove(fmt.Sprint(endpoint.ID))
-	manager.k8sClientFactory.RemoveKubeClient(endpoint)
+func (manager *Manager) DeleteEndpointProxy(endpointID portainer.EndpointID) {
+	manager.endpointProxies.Remove(fmt.Sprint(endpointID))
+	manager.k8sClientFactory.RemoveKubeClient(endpointID)
 }
 
 // CreateLegacyExtensionProxy creates a new HTTP reverse proxy for a legacy extension and adds it to the registered proxies

api/kubernetes/cli/client.go

@@ -2,11 +2,11 @@ package cli
 
 import (
 	"fmt"
+	cmap "github.com/orcaman/concurrent-map"
 	"net/http"
 	"strconv"
 	"sync"
 
-	cmap "github.com/orcaman/concurrent-map"
 	"github.com/pkg/errors"
 
 	portainer "github.com/portainer/portainer/api"
@@ -45,8 +45,8 @@ func NewClientFactory(signatureService portainer.DigitalSignatureService, revers
 }
 
 // Remove the cached kube client so a new one can be created
-func (factory *ClientFactory) RemoveKubeClient(endpoint *portainer.Endpoint) {
-	factory.endpointClients.Remove(strconv.Itoa(int(endpoint.ID)))
+ func (factory *ClientFactory) RemoveKubeClient(endpointID portainer.EndpointID) {
+	factory.endpointClients.Remove(strconv.Itoa(int(endpointID)))
 }
 
 // GetKubeClient checks if an existing client is already registered for the environment(endpoint) and returns it if one is found.
@@ -123,7 +123,6 @@ func (factory *ClientFactory) buildEdgeClient(endpoint *portainer.Endpoint) (*ku
 	if err != nil {
 		return nil, errors.Wrap(err, "failed activating tunnel")
 	}
-
 	endpointURL := fmt.Sprintf("http://127.0.0.1:%d/kubernetes", tunnel.Port)
 
 	return factory.createRemoteClient(endpointURL)

api/kubernetes/cli/role.go

@@ -11,7 +11,7 @@ import (
 func getPortainerUserDefaultPolicies() []rbacv1.PolicyRule {
 	return []rbacv1.PolicyRule{
 		{
-			Verbs:     []string{"list"},
+			Verbs:     []string{"list", "get"},
 			Resources: []string{"namespaces", "nodes"},
 			APIGroups: []string{""},
 		},
@@ -21,8 +21,8 @@ func getPortainerUserDefaultPolicies() []rbacv1.PolicyRule {
 			APIGroups: []string{"storage.k8s.io"},
 		},
 		{
-			Verbs:     []string{"list"},
-			Resources: []string{"namespaces", "pods"},
+			Verbs:     []string{"list", "get"},
+			Resources: []string{"namespaces", "pods", "nodes"},
 			APIGroups: []string{"metrics.k8s.io"},
 		},
 	}

api/portainer.go

@@ -1392,7 +1392,7 @@ type (
 
 	// SwarmStackManager represents a service to manage Swarm stacks
 	SwarmStackManager interface {
-		Login(registries []Registry, endpoint *Endpoint)
+		Login(registries []Registry, endpoint *Endpoint) error
 		Logout(endpoint *Endpoint) error
 		Deploy(stack *Stack, prune bool, endpoint *Endpoint) error
 		Remove(stack *Stack, endpoint *Endpoint) error
@@ -1470,9 +1470,9 @@ type (
 
 const (
 	// APIVersion is the version number of the Portainer API
-	APIVersion = "2.9.1"
+	APIVersion = "2.9.2"
 	// DBVersion is the version number of the Portainer database
-	DBVersion = 32
+	DBVersion = 33
 	// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax
 	ComposeSyntaxMaxVersion = "3.9"
 	// AssetsServerURL represents the URL of the Portainer asset server

app/app.js

@@ -1,4 +1,5 @@
 import $ from 'jquery';
+import { PortainerEndpointTypes } from 'Portainer/models/endpoint/models';
 
 angular.module('portainer').run([
   '$rootScope',
@@ -49,7 +50,7 @@ angular.module('portainer').run([
 
 function ping(EndpointProvider, SystemService) {
   let endpoint = EndpointProvider.currentEndpoint();
-  if (endpoint !== undefined && endpoint.Type === 4) {
+  if (endpoint !== undefined && endpoint.Type == PortainerEndpointTypes.EdgeAgentOnDockerEnvironment) {
     SystemService.ping(endpoint.Id);
   }
 }

app/assets/css/theme.css

@@ -217,7 +217,7 @@ html {
   --border-table-color: var(--grey-19);
   --border-table-top-color: var(--grey-19);
   --border-datatable-top-color: var(--grey-10);
-  --border-blocklist-color: var(--grey-44) ccc;
+  --border-blocklist-color: var(--grey-44);
   --border-input-group-addon-color: var(--grey-44);
   --border-btn-default-color: var(--grey-44);
   --border-boxselector-color: var(--grey-6);
@@ -571,6 +571,7 @@ html {
   --border-pre-color: var(--grey-3);
   --border-codemirror-cursor-color: var(--white-color);
   --border-modal: 1px solid var(--white-color);
+  --border-blocklist-color: var(--white-color);
 
   --hover-sidebar-color: var(--blue-9);
   --hover-sidebar-color: var(--black-color);

app/azure/views/containerinstances/container-instance-details/containerInstanceDetailsController.js

@@ -21,7 +21,7 @@ class ContainerInstanceDetailsController {
       this.container = await this.ContainerGroupService.containerGroup(subscriptionId, resourceGroupId, containerGroupId);
       this.resourceGroup = await this.ResourceGroupService.resourceGroup(subscriptionId, resourceGroupId);
     } catch (err) {
-      this.Notifications.error('Failure', err, 'Unable to retrive container instance details');
+      this.Notifications.error('Failure', err, 'Unable to retrieve container instance details');
     }
     this.state.loading = false;
   }

app/docker/components/imageRegistry/por-image-registry.controller.js

@@ -15,12 +15,14 @@ class porImageRegistryController {
     this.Notifications = Notifications;
 
     this.onRegistryChange = this.onRegistryChange.bind(this);
+    this.onImageChange = this.onImageChange.bind(this);
 
     this.registries = [];
     this.images = [];
     this.defaultRegistry = new DockerHubViewModel();
 
     this.$scope.$watch(() => this.model.Registry, this.onRegistryChange);
+    this.$scope.$watch(() => this.model.Image, this.onImageChange);
   }
 
   isKnownRegistry(registry) {
@@ -62,6 +64,12 @@ class porImageRegistryController {
     }
   }
 
+  async onImageChange() {
+    if (!this.isDockerHubRegistry()) {
+      this.setValidity(true);
+    }
+  }
+
   displayedRegistryURL() {
     return this.getRegistryURL(this.model.Registry) || 'docker.io';
   }
@@ -69,13 +77,19 @@ class porImageRegistryController {
   async reloadRegistries() {
     return this.$async(async () => {
       try {
-        const registries = await this.EndpointService.registries(this.endpoint.Id, this.namespace);
-        this.registries = _.concat(this.defaultRegistry, registries);
+        let showDefaultRegistry = false;
+        this.registries = await this.EndpointService.registries(this.endpoint.Id, this.namespace);
+
+        // hide default(anonymous) dockerhub registry if user has an authenticated one
+        if (!this.registries.some((registry) => registry.Type === RegistryTypes.DOCKERHUB)) {
+          showDefaultRegistry = true;
+          this.registries.push(this.defaultRegistry);
+        }
 
         const id = this.model.Registry.Id;
         const registry = _.find(this.registries, { Id: id });
         if (!registry) {
-          this.model.Registry = this.defaultRegistry;
+          this.model.Registry = showDefaultRegistry ? this.defaultRegistry : this.registries[0];
         }
       } catch (err) {
         this.Notifications.error('Failure', err, 'Unable to retrieve registries');

app/docker/components/imageRegistry/por-image-registry.html

@@ -6,7 +6,7 @@
     </label>
     <div ng-class="$ctrl.inputClass">
       <select
-        ng-options="registry as registry.Name for registry in $ctrl.registries track by registry.Name"
+        ng-options="registry as registry.Name for registry in $ctrl.registries track by registry.Id"
         ng-model="$ctrl.model.Registry"
         id="image_registry"
         class="form-control"
@@ -24,7 +24,7 @@
           uib-typeahead="image for image in $ctrl.availableImages | filter:$viewValue | limitTo:5"
           ng-model="$ctrl.model.Image"
           name="image_name"
-          placeholder="e.g. myImage:myTag"
+          placeholder="e.g. my-image:my-tag"
           ng-change="$ctrl.onImageChange()"
           required
           data-cy="component-imageInput"
@@ -54,7 +54,7 @@
       </span>
       <label for="image_name" ng-class="$ctrl.labelClass" class="control-label text-left">Image </label>
       <div ng-class="$ctrl.inputClass">
-        <input type="text" class="form-control" ng-model="$ctrl.model.Image" name="image_name" placeholder="e.g. registry:port/myImage:myTag" required />
+        <input type="text" class="form-control" ng-model="$ctrl.model.Image" name="image_name" placeholder="e.g. registry:port/my-image:my-tag" required />
       </div>
     </div>
   </div>

app/docker/models/container.js

@@ -100,7 +100,7 @@ export function ContainerStatsViewModel(data) {
     }
   }
   this.Networks = _.values(data.networks);
-  if (data.blkio_stats !== undefined) {
+  if (data.blkio_stats !== undefined && data.blkio_stats.io_service_bytes_recursive !== null) {
     //TODO: take care of multiple block devices
     var readData = data.blkio_stats.io_service_bytes_recursive.find((d) => d.op === 'Read');
     if (readData === undefined) {

app/docker/views/containers/create/createContainerController.js

@@ -580,7 +580,7 @@ angular.module('portainer.docker').controller('CreateContainerController', [
           $scope.formValues.RegistryModel = model;
         })
         .catch(function error(err) {
-          Notifications.error('Failure', err, 'Unable to retrive registry');
+          Notifications.error('Failure', err, 'Unable to retrieve registry');
         });
     }
 

app/docker/views/images/build/buildimage.html

@@ -49,7 +49,7 @@
                         <!-- name-input -->
                         <div class="input-group col-sm-5 input-group-sm">
                           <span class="input-group-addon">name</span>
-                          <input type="text" class="form-control" ng-model="item.Name" placeholder="e.g. myImage:myTag" auto-focus />
+                          <input type="text" class="form-control" ng-model="item.Name" placeholder="e.g. my-image:my-tag" auto-focus />
                           <span class="input-group-addon"
                             ><i ng-class="{ true: 'fa fa-check green-icon', false: 'fa fa-times red-icon' }[item.Name !== '']" aria-hidden="true"></i
                           ></span>

app/docker/views/images/edit/image.html

@@ -82,7 +82,7 @@
           <!-- !tag-note -->
           <div class="form-group">
             <div class="col-sm-12">
-              <button type="button" class="btn btn-primary btn-sm" ng-disabled="!state.pullImageValidity || !formValues.RegistryModel.Image" ng-click="tagImage()">Tag</button>
+              <button type="button" class="btn btn-primary btn-sm" ng-disabled="!formValues.RegistryModel.Image" ng-click="tagImage()">Tag</button>
             </div>
           </div>
         </form>

app/docker/views/images/edit/imageController.js

@@ -17,6 +17,8 @@ angular.module('portainer.docker').controller('ImageController', [
   'FileSaver',
   'Blob',
   'endpoint',
+  'EndpointService',
+  'RegistryModalService',
   function (
     $async,
     $q,
@@ -32,7 +34,9 @@ angular.module('portainer.docker').controller('ImageController', [
     ModalService,
     FileSaver,
     Blob,
-    endpoint
+    endpoint,
+    EndpointService,
+    RegistryModalService
   ) {
     $scope.endpoint = endpoint;
     $scope.isAdmin = Authentication.isAdmin();
@@ -84,11 +88,13 @@ angular.module('portainer.docker').controller('ImageController', [
 
     async function pushTag(repository) {
       return $async(async () => {
-        $('#uploadResourceHint').show();
         try {
-          const registryModel = await RegistryService.retrievePorRegistryModelFromRepository(repository, endpoint.Id);
-          await ImageService.pushImage(registryModel);
-          Notifications.success('Image successfully pushed', repository);
+          const registryModel = await RegistryModalService.registryModal(repository, $scope.registries);
+          if (registryModel) {
+            $('#uploadResourceHint').show();
+            await ImageService.pushImage(registryModel);
+            Notifications.success('Image successfully pushed', repository);
+          }
         } catch (err) {
           Notifications.error('Failure', err, 'Unable to push image to repository');
         } finally {
@@ -100,11 +106,13 @@ angular.module('portainer.docker').controller('ImageController', [
     $scope.pullTag = pullTag;
     async function pullTag(repository) {
       return $async(async () => {
-        $('#downloadResourceHint').show();
         try {
-          const registryModel = await RegistryService.retrievePorRegistryModelFromRepository(repository, endpoint.Id);
-          await ImageService.pullImage(registryModel);
-          Notifications.success('Image successfully pulled', repository);
+          const registryModel = await RegistryModalService.registryModal(repository, $scope.registries);
+          if (registryModel) {
+            $('#downloadResourceHint').show();
+            await ImageService.pullImage(registryModel);
+            Notifications.success('Image successfully pulled', repository);
+          }
         } catch (err) {
           Notifications.error('Failure', err, 'Unable to pull image from repository');
         } finally {
@@ -171,8 +179,15 @@ angular.module('portainer.docker').controller('ImageController', [
       });
     };
 
-    function initView() {
+    async function initView() {
       HttpRequestHelper.setPortainerAgentTargetHeader($transition$.params().nodeName);
+
+      try {
+        $scope.registries = await RegistryService.loadRegistriesForDropdown(endpoint.Id);
+      } catch (err) {
+        this.Notifications.error('Failure', err, 'Unable to load registries');
+      }
+
       $q.all({
         image: ImageService.image($transition$.params().id),
         history: ImageService.history($transition$.params().id),

app/docker/views/services/edit/serviceController.js

@@ -53,6 +53,7 @@ angular.module('portainer.docker').controller('ServiceController', [
   'clipboard',
   'WebhookHelper',
   'NetworkService',
+  'RegistryService',
   'endpoint',
   function (
     $q,
@@ -84,6 +85,7 @@ angular.module('portainer.docker').controller('ServiceController', [
     clipboard,
     WebhookHelper,
     NetworkService,
+    RegistryService,
     endpoint
   ) {
     $scope.endpoint = endpoint;
@@ -353,22 +355,22 @@ angular.module('portainer.docker').controller('ServiceController', [
       $('#copyNotification').fadeOut(2000);
     };
 
-    $scope.cancelChanges = function cancelChanges(service, keys) {
+    $scope.cancelChanges = async function cancelChanges(service, keys) {
       if (keys) {
         // clean out the keys only from the list of modified keys
-        keys.forEach(function (key) {
+        for (const key of keys) {
           if (key === 'Image') {
-            $scope.formValues.RegistryModel.Image = '';
+            $scope.formValues.RegistryModel = await RegistryService.retrievePorRegistryModelFromRepository(originalService.Image, endpoint.Id);
           } else {
             var index = previousServiceValues.indexOf(key);
             if (index >= 0) {
               previousServiceValues.splice(index, 1);
             }
           }
-        });
+        }
       } else {
         // clean out all changes
-        $scope.formValues.RegistryModel.Image = '';
+        $scope.formValues.RegistryModel = await RegistryService.retrievePorRegistryModelFromRepository(originalService.Image, endpoint.Id);
         keys = Object.keys(service);
         previousServiceValues = [];
       }
@@ -382,7 +384,9 @@ angular.module('portainer.docker').controller('ServiceController', [
       var hasChanges = false;
       elements.forEach(function (key) {
         if (key === 'Image') {
-          hasChanges = hasChanges || $scope.formValues.RegistryModel.Image ? true : false;
+          const originalImage = service ? service.Model.Spec.TaskTemplate.ContainerSpec.Image : null;
+          const currentImage = ImageHelper.createImageConfigForContainer($scope.formValues.RegistryModel).fromImage;
+          hasChanges = hasChanges || originalImage !== currentImage;
         } else {
           hasChanges = hasChanges || previousServiceValues.indexOf(key) >= 0;
         }
@@ -763,6 +767,11 @@ angular.module('portainer.docker').controller('ServiceController', [
             $scope.state.sliderMaxCpu = 32;
           }
 
+          const image = $scope.service.Model.Spec.TaskTemplate.ContainerSpec.Image;
+          RegistryService.retrievePorRegistryModelFromRepository(image, endpoint.Id).then((model) => {
+            $scope.formValues.RegistryModel = model;
+          });
+
           // Default values
           $scope.state.addSecret = { override: false };
 

app/kubernetes/components/helm/helm-templates/helm-templates.controller.js

@@ -98,8 +98,9 @@ export default class HelmTemplatesController {
     try {
       // fetch globally set helm repo and user helm repos (parallel)
       const { GlobalRepository, UserRepositories } = await this.HelmService.getHelmRepositories(this.endpoint.Id);
+      this.state.globalRepository = GlobalRepository;
       const userHelmReposUrls = UserRepositories.map((repo) => repo.URL);
-      const uniqueHelmRepos = [...new Set([GlobalRepository, ...userHelmReposUrls])].map((url) => url.toLowerCase()); // remove duplicates, to lowercase
+      const uniqueHelmRepos = [...new Set([GlobalRepository, ...userHelmReposUrls])].map((url) => url.toLowerCase()).filter((url) => url); // remove duplicates and blank, to lowercase
       this.state.repos = uniqueHelmRepos;
       return uniqueHelmRepos;
     } catch (err) {
@@ -169,6 +170,8 @@ export default class HelmTemplatesController {
         chartsLoading: false,
         resourcePoolsLoading: false,
         viewReady: false,
+        isAdmin: this.Authentication.isAdmin(),
+        globalRepository: undefined,
       };
 
       const helmRepos = await this.getHelmRepoURLs();

app/kubernetes/components/helm/helm-templates/helm-templates.html

@@ -8,6 +8,11 @@
       <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
       This is a first version for Helm charts, for more information see this <a href="https://www.portainer.io/blog/portainer-now-with-helm-support" target="_blank">blog post</a>.
     </p>
+    <p ng-if="$ctrl.state.globalRepository === ''">
+      <i class="fa fa-exclamation-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+      <span>The Global Helm Repository is not configured.</span>
+      <a ng-if="$ctrl.state.isAdmin" ui-sref="portainer.settings">Configure Global Helm Repository in Settings</a>
+    </p>
   </span>
 </information-panel>
 

app/kubernetes/components/kubernetes-sidebar/kubernetes-sidebar.html

@@ -28,7 +28,7 @@
   Namespaces
 </sidebar-menu-item>
 
-<sidebar-menu-item path="kubernetes.templates.helm" path-params="{ endpointId: $ctrl.endpointId }" icon-class="fa-dharmachakra fa-fw" class-name="sidebar-list">
+<sidebar-menu-item path="kubernetes.templates.helm" path-params="{ endpointId: $ctrl.endpointId }" icon-class="fa-dharmachakra fa-fw" class-name="sidebar-list" data-cy="k8sSidebar-helm">
   Helm
 </sidebar-menu-item>
 

app/kubernetes/helm/service.js

@@ -45,7 +45,7 @@ export function HelmService(HelmFactory) {
   }
 
   /**
-   * @description: Show values helm of a helm chart, this basically runs `helm show values`
+   * @description: Get a list of all the helm repositories available for the current user
    * @returns {Promise} - Resolves with an object containing list of user helm repos and default/global settings helm repo
    * @throws {PortainerError} - Rejects with error if helm show fails
    */

app/kubernetes/registries/kube-registry-access-view/kube-registry-access-view.html

@@ -15,7 +15,7 @@
             <label class="col-sm-3 col-lg-2 control-label text-left" style="padding-top: 0;">
               Select namespaces
             </label>
-            <div class="col-sm-9 col-lg-4">
+            <div class="col-sm-9 col-lg-4" style="margin-bottom: 15px;">
               <span class="small text-muted" ng-if="!$ctrl.resourcePools.length">
                 No namespaces available.
               </span>
@@ -33,6 +33,10 @@
               >
               </span>
             </div>
+            <div class="col-sm-12 small text-muted">
+              <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+              Note: adding this registry will expose the registry credentials to all users of this namespace
+            </div>
           </div>
 
           <!-- actions -->

app/kubernetes/views/applications/create/createApplication.html

@@ -1771,7 +1771,7 @@
                   ng-if="ctrl.state.appType === ctrl.KubernetesDeploymentTypes.APPLICATION_FORM"
                   type="button"
                   class="btn btn-primary btn-sm"
-                  ng-disabled="!kubernetesApplicationCreationForm.$valid || ctrl.isDeployUpdateButtonDisabled() || !ctrl.state.pullImageValidity"
+                  ng-disabled="!kubernetesApplicationCreationForm.$valid || ctrl.isDeployUpdateButtonDisabled() || !ctrl.imageValidityIsValid()"
                   ng-click="ctrl.deployApplication()"
                   button-spinner="ctrl.state.actionInProgress"
                   data-cy="k8sAppCreate-deployButton"

app/kubernetes/views/applications/create/createApplicationController.js

@@ -2,6 +2,7 @@ import angular from 'angular';
 import _ from 'lodash-es';
 import filesizeParser from 'filesize-parser';
 import * as JsonPatch from 'fast-json-patch';
+import { RegistryTypes } from '@/portainer/models/registryTypes';
 
 import {
   KubernetesApplicationDataAccessPolicies,
@@ -193,6 +194,10 @@ class KubernetesCreateApplicationController {
     this.state.pullImageValidity = validity;
   }
 
+  imageValidityIsValid() {
+    return this.state.pullImageValidity || this.formValues.ImageModel.Registry.Type !== RegistryTypes.DOCKERHUB;
+  }
+
   onChangeName() {
     const existingApplication = _.find(this.applications, { Name: this.formValues.Name });
     this.state.alreadyExists = (this.state.isEdit && existingApplication && this.application.Id !== existingApplication.Id) || (!this.state.isEdit && existingApplication);

app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.controller.js

@@ -25,21 +25,13 @@ class GitFormComposeAuthFieldsetController {
     if (!auth) {
       this.authValues.username = this.model.RepositoryUsername;
       this.authValues.password = this.model.RepositoryPassword;
-      this.onChange({
-        ...this.model,
-        RepositoryAuthentication: true,
-        RepositoryUsername: '',
-        RepositoryPassword: '',
-      });
-
-      return;
     }
 
     this.onChange({
       ...this.model,
-      RepositoryAuthentication: false,
-      RepositoryUsername: this.authValues.username,
-      RepositoryPassword: this.authValues.password,
+      RepositoryAuthentication: auth,
+      RepositoryUsername: auth ? this.authValues.username : '',
+      RepositoryPassword: auth ? this.authValues.password : '',
     });
   }
 

app/portainer/components/forms/git-form/git-form-auth-fieldset/git-form-auth-fieldset.html

@@ -41,7 +41,7 @@
         class="form-control"
         ng-model="$ctrl.model.RepositoryPassword"
         name="repository_password"
-        placeholder="personal access token"
+        placeholder="*******"
         ng-change="$ctrl.onChangePassword($ctrl.model.RepositoryPassword)"
         ng-required="!$ctrl.isEdit"
         data-cy="component-gitPasswordInput"

app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.controller.js

@@ -1,3 +1,5 @@
+import { FORCE_REDEPLOYMENT } from '@/portainer/feature-flags/feature-ids';
+
 class GitFormAutoUpdateFieldsetController {
   /* @ngInject */
   constructor(clipboard) {
@@ -5,6 +7,8 @@ class GitFormAutoUpdateFieldsetController {
     this.onChangeMechanism = this.onChangeField('RepositoryMechanism');
     this.onChangeInterval = this.onChangeField('RepositoryFetchInterval');
     this.clipboard = clipboard;
+
+    this.limitedFeature = FORCE_REDEPLOYMENT;
   }
 
   copyWebhook() {

app/portainer/components/forms/git-form/git-form-auto-update-fieldset/git-form-auto-update-fieldset.html

@@ -1,12 +1,12 @@
 <ng-form name="autoUpdateForm">
   <div class="form-group">
     <div class="col-sm-12">
-      <por-switch-field name="autoUpdate" ng-model="$ctrl.model.RepositoryAutomaticUpdates" label="Automatic updates" on-change="($ctrl.onChangeAutoUpdate)"></por-switch-field>
+      <por-switch-field name="autoUpdate" ng-model="$ctrl.model.RepositoryAutomaticUpdates" label="Automatic Updates" on-change="($ctrl.onChangeAutoUpdate)"></por-switch-field>
     </div>
   </div>
   <div class="small text-warning" style="margin: 5px 0 10px 0;" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
     <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
-    <span class="text-muted">Any changes to this stack made locally in Portainer will be overriden by the definition in git and may cause service interruption.</span>
+    <span class="text-muted">Any changes to this stack made locally in Portainer will be overriden by an updated git definition, which may cause service interruption.</span>
   </div>
   <div class="form-group" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
     <label for="repository_mechanism" class="col-sm-1 control-label text-left">
@@ -57,6 +57,15 @@
       />
     </div>
   </div>
+  <div class="form-group" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
+    <div class="col-sm-12">
+      <por-switch-field name="forceUpdate" feature="$ctrl.limitedFeature" ng-model="$ctrl.model.RepositoryAutomaticUpdatesForce" label="Force Redeployment"></por-switch-field>
+    </div>
+  </div>
+  <div class="small text-warning" style="margin: 5px 0 10px 0;" ng-if="$ctrl.model.RepositoryAutomaticUpdates">
+    <i class="fa fa-exclamation-circle" aria-hidden="true"></i>
+    <span class="text-muted">Any changes to this stack made locally in Portainer will be overriden by the current git definition and may cause service interruption.</span>
+  </div>
   <div class="form-group col-md-12" ng-show="autoUpdateForm.repository_fetch_interval.$touched && autoUpdateForm.repository_fetch_interval.$invalid">
     <div class="small text-warning">
       <div ng-messages="autoUpdateForm.repository_fetch_interval.$error">

app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.controller.js

@@ -34,6 +34,7 @@ class KubernetesRedeployAppGitFormController {
 
     this.onChange = this.onChange.bind(this);
     this.onChangeRef = this.onChangeRef.bind(this);
+    this.onChangeAutoUpdate = this.onChangeAutoUpdate.bind(this);
   }
 
   onChangeRef(value) {
@@ -48,6 +49,15 @@ class KubernetesRedeployAppGitFormController {
     this.state.hasUnsavedChanges = angular.toJson(this.savedFormValues) !== angular.toJson(this.formValues);
   }
 
+  onChangeAutoUpdate(values) {
+    this.onChange({
+      AutoUpdate: {
+        ...this.formValues.AutoUpdate,
+        ...values,
+      },
+    });
+  }
+
   buildAnalyticsProperties() {
     const metadata = {
       'automatic-updates': automaticUpdatesLabel(this.formValues.AutoUpdate.RepositoryAutomaticUpdates, this.formValues.AutoUpdate.RepositoryMechanism),

app/portainer/components/forms/kubernetes-redeploy-app-git-form/kubernetes-redeploy-app-git-form.html

@@ -9,7 +9,7 @@
       </p>
     </div>
   </div>
-  <git-form-auto-update-fieldset model="$ctrl.formValues.AutoUpdate" on-change="($ctrl.onChange)"></git-form-auto-update-fieldset>
+  <git-form-auto-update-fieldset model="$ctrl.formValues.AutoUpdate" on-change="($ctrl.onChangeAutoUpdate)"></git-form-auto-update-fieldset>
   <div class="form-group">
     <div class="col-sm-12">
       <p>
@@ -36,7 +36,6 @@
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.pullAndRedeployApplication()"
-    ng-if="!$ctrl.formValues.AutoUpdate.RepositoryAutomaticUpdates"
     ng-disabled="$ctrl.isSubmitButtonDisabled() || $ctrl.state.hasUnsavedChanges|| !$ctrl.redeployGitForm.$valid"
     style="margin-top: 7px; margin-left: 0;"
     button-spinner="$ctrl.state.redeployInProgress"

app/portainer/components/forms/stack-redeploy-git-form/stack-redeploy-git-form.html

@@ -5,6 +5,7 @@
   <git-form-info-panel
     class-name="text-muted small"
     url="$ctrl.model.URL"
+    type="stack"
     config-file-path="$ctrl.model.ConfigFilePath"
     additional-files="$ctrl.stack.AdditionalFiles"
   ></git-form-info-panel>
@@ -37,7 +38,6 @@
   <button
     class="btn btn-sm btn-primary"
     ng-click="$ctrl.submit()"
-    ng-if="!$ctrl.formValues.AutoUpdate.RepositoryAutomaticUpdates"
     ng-disabled="$ctrl.isSubmitButtonDisabled() || $ctrl.state.hasUnsavedChanges || !$ctrl.redeployGitForm.$valid"
     style="margin-top: 7px; margin-left: 0;"
     button-spinner="$ctrl.state.redeployInProgress"

app/portainer/feature-flags/feature-flags.service.js

@@ -29,6 +29,7 @@ export function featureService() {
       [FEATURE_IDS.REGISTRY_MANAGEMENT]: EDITIONS.BE,
       [FEATURE_IDS.S3_BACKUP_SETTING]: EDITIONS.BE,
       [FEATURE_IDS.TEAM_MEMBERSHIP]: EDITIONS.BE,
+      [FEATURE_IDS.FORCE_REDEPLOYMENT]: EDITIONS.BE,
     };
 
     state.currentEdition = currentEdition;

app/portainer/feature-flags/feature-ids.js

@@ -9,3 +9,4 @@ export const TEAM_MEMBERSHIP = 'team-membership';
 export const HIDE_INTERNAL_AUTH = 'hide-internal-auth';
 export const EXTERNAL_AUTH_LDAP = 'external-auth-ldap';
 export const ACTIVITY_AUDIT = 'activity-audit';
+export const FORCE_REDEPLOYMENT = 'force-redeployment';

app/portainer/helpers/endpointHelper.js

@@ -21,6 +21,10 @@ export default class EndpointHelper {
     ].includes(endpoint.Type);
   }
 
+  static isEdgeEndpoint(endpoint) {
+    return [PortainerEndpointTypes.EdgeAgentOnDockerEnvironment, PortainerEndpointTypes.EdgeAgentOnKubernetesEnvironment].includes(endpoint.Type);
+  }
+
   static mapGroupNameToEndpoint(endpoints, groups) {
     for (var i = 0; i < endpoints.length; i++) {
       var endpoint = endpoints[i];

app/portainer/rbac/components/access-viewer/access-viewer-datatable/access-viewer-datatable.html

@@ -33,10 +33,10 @@
           <td
             >{{ item.TeamName ? 'Team' : 'User' }} <code ng-if="item.TeamName">{{ item.TeamName }}</code> access defined on {{ item.AccessLocation }}
             <code ng-if="item.GroupName">{{ item.GroupName }}</code>
-            <a ng-if="item.AccessLocation === 'endpoint'" ui-sref="portainer.endpoints.endpoint.access({id: item.EndpointId})"
+            <a ng-if="!item.GroupName" ui-sref="portainer.endpoints.endpoint.access({id: item.EndpointId})"
               ><i style="margin-left: 5px;" class="fa fa-users" aria-hidden="true"></i> Manage access
             </a>
-            <a ng-if="item.AccessLocation === 'endpoint group'" ui-sref="portainer.groups.group.access({id: item.GroupId})"
+            <a ng-if="item.GroupName" ui-sref="portainer.groups.group.access({id: item.GroupId})"
               ><i style="margin-left: 5px;" class="fa fa-users" aria-hidden="true"></i> Manage access
             </a>
           </td>

app/portainer/services/api/registryService.js

@@ -22,6 +22,8 @@ angular.module('portainer.app').factory('RegistryService', [
       createRegistry,
       createGitlabRegistries,
       retrievePorRegistryModelFromRepository,
+      retrievePorRegistryModelFromRepositoryWithRegistries,
+      loadRegistriesForDropdown,
     };
 
     function registries() {
@@ -107,17 +109,45 @@ angular.module('portainer.app').factory('RegistryService', [
       return url;
     }
 
+    // findBestMatchRegistry finds out the best match registry for repository
+    // matching precedence:
+    // 1. registryId matched
+    // 2. both domain name and username matched (for dockerhub only)
+    // 3. only URL matched
+    // 4. pick up the first dockerhub registry
+    function findBestMatchRegistry(repository, registries, registryId) {
+      let match2, match3, match4;
+
+      for (const registry of registries) {
+        if (registry.Id == registryId) {
+          return registry;
+        }
+
+        if (registry.Type === RegistryTypes.DOCKERHUB) {
+          // try to match repository examples:
+          //   <USERNAME>/nginx:latest
+          //   docker.io/<USERNAME>/nginx:latest
+          if (repository.startsWith(registry.Username + '/') || repository.startsWith(getURL(registry) + '/' + registry.Username + '/')) {
+            match2 = registry;
+          }
+
+          // try to match repository examples:
+          //   portainer/portainer-ee:latest
+          //   <NON-USERNAME>/portainer-ee:latest
+          match4 = match4 || registry;
+        }
+
+        if (_.includes(repository, getURL(registry))) {
+          match3 = registry;
+        }
+      }
+
+      return match2 || match3 || match4;
+    }
+
     function retrievePorRegistryModelFromRepositoryWithRegistries(repository, registries, registryId) {
       const model = new PorImageRegistryModel();
-      const registry = registries.find((reg) => {
-        if (registryId) {
-          return reg.Id === registryId;
-        }
-        if (reg.Type === RegistryTypes.DOCKERHUB) {
-          return _.includes(repository, reg.Username);
-        }
-        return _.includes(repository, getURL(reg));
-      });
+      const registry = findBestMatchRegistry(repository, registries, registryId);
       if (registry) {
         const url = getURL(registry);
         let lastIndex = repository.lastIndexOf(url);
@@ -148,5 +178,22 @@ angular.module('portainer.app').factory('RegistryService', [
         }
       });
     }
+
+    function loadRegistriesForDropdown(endpointId, namespace) {
+      return $async(async () => {
+        try {
+          const registries = await EndpointService.registries(endpointId, namespace);
+
+          // hide default(anonymous) dockerhub registry if user has an authenticated one
+          if (!registries.some((registry) => registry.Type === RegistryTypes.DOCKERHUB)) {
+            registries.push(new DockerHubViewModel());
+          }
+
+          return registries;
+        } catch (err) {
+          throw { msg: 'Unable to retrieve the registries', err: err };
+        }
+      });
+    }
   },
 ]);

app/portainer/services/api/resourceControlService.js

@@ -103,7 +103,7 @@ angular.module('portainer.app').factory('ResourceControlService', [
     }
 
     /**
-     * Retrive users and team details for ResourceControlViewModel
+     * Retrieve users and team details for ResourceControlViewModel
      * @param {ResourceControlViewModel} resourceControl ResourceControl view model
      */
     function retrieveOwnershipDetails(resourceControl) {

app/portainer/services/chartService.js

@@ -39,6 +39,7 @@ angular.module('portainer.app').factory('ChartService', [
               ticks: {
                 beginAtZero: true,
                 callback: scalesCallback,
+                precision: 0,
               },
             },
           ],

app/portainer/services/modalService.js

@@ -308,6 +308,17 @@ angular.module('portainer.app').factory('ModalService', [
       );
     };
 
+    service.selectRegistry = function (options) {
+      var box = bootbox.prompt({
+        title: 'Which registry do you want to use?',
+        inputType: 'select',
+        value: options.defaultValue,
+        inputOptions: options.options,
+        callback: options.callback,
+      });
+      applyBoxCSS(box);
+    };
+
     return service;
   },
 ]);

app/portainer/services/registryModalService.js

@@ -0,0 +1,39 @@
+import _ from 'lodash';
+
+angular.module('portainer.app').factory('RegistryModalService', ModalServiceFactory);
+
+function ModalServiceFactory($q, ModalService, RegistryService) {
+  const service = {};
+
+  function registries2Options(registries) {
+    return registries.map((r) => ({
+      text: r.Name,
+      value: String(r.Id),
+    }));
+  }
+
+  service.registryModal = async function (repository, registries) {
+    const deferred = $q.defer();
+
+    const options = registries2Options(registries);
+    const registryModel = RegistryService.retrievePorRegistryModelFromRepositoryWithRegistries(repository, registries);
+    const defaultValue = String(_.get(registryModel, 'Registry.Id', '0'));
+
+    ModalService.selectRegistry({
+      options,
+      defaultValue,
+      callback: (registryId) => {
+        if (registryId) {
+          const registryModel = RegistryService.retrievePorRegistryModelFromRepositoryWithRegistries(repository, registries, registryId);
+          deferred.resolve(registryModel);
+        } else {
+          deferred.resolve(null);
+        }
+      },
+    });
+
+    return deferred.promise;
+  };
+
+  return service;
+}

app/portainer/views/endpoints/endpointsController.js

@@ -3,11 +3,16 @@ import EndpointHelper from 'Portainer/helpers/endpointHelper';
 
 angular.module('portainer.app').controller('EndpointsController', EndpointsController);
 
-function EndpointsController($q, $scope, $state, $async, EndpointService, GroupService, Notifications) {
+function EndpointsController($q, $scope, $state, $async, EndpointService, GroupService, ModalService, Notifications) {
   $scope.removeAction = removeAction;
 
   function removeAction(endpoints) {
-    return $async(removeActionAsync, endpoints);
+    ModalService.confirmDeletion('This action will remove all configurations associated to your environment(s). Continue?', (confirmed) => {
+      if (!confirmed) {
+        return;
+      }
+      return $async(removeActionAsync, endpoints);
+    });
   }
 
   async function removeActionAsync(endpoints) {

build/build_binary.sh

@@ -1,9 +1,14 @@
-binary="portainer"
+set -x
+
 mkdir -p dist
 
-cd 'api/cmd/portainer'
-
+cd api
+# the go get adds 8 seconds
 go get -t -d -v ./...
-GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s'
 
-mv "${binary}" "../../../dist/portainer"
+# the build takes 2 seconds
+GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build \
+	--installsuffix cgo \
+	--ldflags '-s' \
+	-o "../dist/portainer" \
+	./cmd/portainer/

build/linux/dev-toolkit/README.md

@@ -0,0 +1,112 @@
+The entire Portainer development stack inside a container (including the IDE!).
+
+Inspired/made after reading https://www.gitpod.io/blog/openvscode-server-launch
+
+## Requirements
+
+All you need to have installed is Docker.
+
+## (optional) Build the toolkit image locally
+
+Assuming the toolkit is not built/provided by Portainer or you want to tweak it, use the following instructions to build the toolkit locally:
+
+```
+cd build/linux/dev-toolkit/
+docker build -t portainer-development-toolkit -f toolkit.Dockerfile .
+```
+
+Note: If using WSL2, you might need to use the `--network host` build option.
+
+## How to use it
+
+Assuming the image is built and available under `portainer-development-toolkit`.
+
+Start the development environment inside a container, this must be executed in the root folder of the Portainer project:
+
+```
+# First, let's create a space to persist our code, dependencies and VS extensions
+$ mkdir -pv /home/alapenna/workspaces/portainer-toolkit
+
+# Export the space as an env var
+$ export TOOLKIT_ROOT=/home/alapenna/workspaces/portainer-toolkit
+
+# Run the toolkit
+$ docker run -it --init \
+-p 3000:3000 \
+-p 9000:9000 -p 9443:9443 -p 8000:8000 \
+-v ${TOOLKIT_ROOT}:/home/workspace:cached \
+--name portainer-development-toolkit \
+portainer-development-toolkit
+```
+
+Now you can access VScode directly at http://localhost:3000 and start coding (almost)!
+
+## Legacy deployment (running as a container on the host)
+
+You can still run Portainer through a base container with the host but you will need to pass extra parameters when deploying the toolkit container:
+
+```
+$ docker run -it --init -p 3000:3000 \
+-v /var/run/docker.sock:/var/run/docker.sock \
+-v ${TOOLKIT_ROOT}:/home/workspace:cached \
+-e PORTAINER_PROJECT=${TOOLKIT_ROOT}/portainer \
+--name portainer-development-toolkit \
+portainer-development-toolkit
+```
+
+### Why do I need PORTAINER_PROJECT?
+
+This environment variable defines where the Portainer project root folder resides on your machine and will be used by Docker to bind mount the `/dist` folder when deploying the local development Portainer instance.
+
+# What's next?
+
+## Extensibility
+
+Developers should be able to customize the environment to their liking (I prefer work with zsh as a shell for example), we need to provide instructions on how they can use this build system as a base and extend it to their liking.
+
+## Improved dev workflow/UX
+
+Multiple steps are required for the dev environment to be ready:
+
+- Downloading the front-end (FE) dependencies (aka node_modules)
+- Downloading the back-end (BE) dependencies (go libraries)
+- Downloading the runtime BE assets (Docker, Kubernetes binaries...)
+
+There should be a way to install/refresh these via yarn:
+
+- yarn fe:install and yarn fe:update, shortcuts: yarn fe:i and yarn fe:u
+
+  - this is actually done via yarn to install, and then yarn add/upgrade/delete for package management
+
+- yarn be:install and yarn be:update, shortcuts: yarn be:i and yarn be:u
+  - this is actually done through go build, and then go get -u when another dependency version is needed
+- yarn assets:install and yarn assets:update, shortcuts yarn assets:i and yarn assets:u
+
+There should be a way to init the environment for the first time to install all the dependencies:
+
+- yarn init
+  - instead there should be a command that will build backend+frontend and run it
+
+Once the environment is ready, a developer can work on different dimensions:
+
+- The FE
+- The BE
+- Both
+
+(?) A developer should be able to run Portainer in multiple ways (?)
+
+- Directly running the binary
+- Starting Portainer running inside a container
+
+A developer should be able to:
+
+- Rebuild the backend without restarting the entire webpack/watch process
+- Clean the entire project (FE+BE)
+
+## Updating the toolkit
+
+A developer should be able to update the toolkit to a more recent version (to support a newer Golang version for example) without having to rebuild the entire system/container.
+
+## VSCode + zsh
+
+https://medium.com/fbdevclagos/updating-visual-studio-code-default-terminal-shell-from-bash-to-zsh-711c40d6f8dc

build/linux/dev-toolkit/run.sh

@@ -1,99 +0,0 @@
-#!/usr/bin/env bash
-
-# Script used to init the Portainer development environment inside the dev-toolkit image
-
-### COLOR OUTPUT ###
-
-ESeq="\x1b["
-RCol="$ESeq"'0m'    # Text Reset
-
-# Regular               Bold                    Underline               High Intensity          BoldHigh Intens         Background              High Intensity Backgrounds
-Bla="$ESeq"'0;30m';     BBla="$ESeq"'1;30m';    UBla="$ESeq"'4;30m';    IBla="$ESeq"'0;90m';    BIBla="$ESeq"'1;90m';   On_Bla="$ESeq"'40m';    On_IBla="$ESeq"'0;100m';
-Red="$ESeq"'0;31m';     BRed="$ESeq"'1;31m';    URed="$ESeq"'4;31m';    IRed="$ESeq"'0;91m';    BIRed="$ESeq"'1;91m';   On_Red="$ESeq"'41m';    On_IRed="$ESeq"'0;101m';
-Gre="$ESeq"'0;32m';     BGre="$ESeq"'1;32m';    UGre="$ESeq"'4;32m';    IGre="$ESeq"'0;92m';    BIGre="$ESeq"'1;92m';   On_Gre="$ESeq"'42m';    On_IGre="$ESeq"'0;102m';
-Yel="$ESeq"'0;33m';     BYel="$ESeq"'1;33m';    UYel="$ESeq"'4;33m';    IYel="$ESeq"'0;93m';    BIYel="$ESeq"'1;93m';   On_Yel="$ESeq"'43m';    On_IYel="$ESeq"'0;103m';
-Blu="$ESeq"'0;34m';     BBlu="$ESeq"'1;34m';    UBlu="$ESeq"'4;34m';    IBlu="$ESeq"'0;94m';    BIBlu="$ESeq"'1;94m';   On_Blu="$ESeq"'44m';    On_IBlu="$ESeq"'0;104m';
-Pur="$ESeq"'0;35m';     BPur="$ESeq"'1;35m';    UPur="$ESeq"'4;35m';    IPur="$ESeq"'0;95m';    BIPur="$ESeq"'1;95m';   On_Pur="$ESeq"'45m';    On_IPur="$ESeq"'0;105m';
-Cya="$ESeq"'0;36m';     BCya="$ESeq"'1;36m';    UCya="$ESeq"'4;36m';    ICya="$ESeq"'0;96m';    BICya="$ESeq"'1;96m';   On_Cya="$ESeq"'46m';    On_ICya="$ESeq"'0;106m';
-Whi="$ESeq"'0;37m';     BWhi="$ESeq"'1;37m';    UWhi="$ESeq"'4;37m';    IWhi="$ESeq"'0;97m';    BIWhi="$ESeq"'1;97m';   On_Whi="$ESeq"'47m';    On_IWhi="$ESeq"'0;107m';
-
-printSection() {
-  echo -e "${BIYel}>>>> ${BIWhi}${1}${RCol}"
-}
-
-info() {
-  echo -e "${BIWhi}${1}${RCol}"
-}
-
-success() {
-  echo -e "${BIGre}${1}${RCol}"
-}
-
-error() {
-  echo -e "${BIRed}${1}${RCol}"
-}
-
-errorAndExit() {
-  echo -e "${BIRed}${1}${RCol}"
-  exit 1
-}
-
-### !COLOR OUTPUT ###
-
-SETUP_FILE=/setup-done
-
-display_configuration() {
-  info "Portainer dev-toolkit container configuration"
-  info "Go version"
-  /usr/local/go/bin/go version
-  info "Node version"
-  node -v
-  info "Yarn version"
-  yarn -v
-  info "Docker version"
-  docker version
-}
-
-main() {
-    [[ -z $PUSER ]] && errorAndExit "Unable to find PUSER environment variable. Please ensure PUSER is set before running this script."
-    [[ -z $PUID ]] && errorAndExit "Unable to find PUID environment variable. Please ensure PUID is set before running this script."
-    [[ -z $PGID ]] && errorAndExit "Unable to find PGID environment variable. Please ensure PGID is set before running this script."
-    [[ -z $DOCKERGID ]] && errorAndExit "Unable to find DOCKERGID environment variable. Please ensure DOCKERGID is set before running this script."
-
-    if [[ -f "${SETUP_FILE}" ]]; then
-        info "Portainer dev-toolkit container already configured."
-        display_configuration
-    else
-        info "Creating user group..."
-        groupadd -g $PGID $PUSER
-
-        info "Creating user..."
-        useradd -l -u $PUID -g $PUSER $PUSER
-
-        info "Setting up home..."
-        install -d -m 0755 -o $PUSER -g $PUSER /home/$PUSER
-
-        info "Configuring Docker..."
-        groupadd -g $DOCKERGID docker
-        usermod -aG docker $PUSER
-
-        info "Configuring Go..."
-        echo "PATH=\"$PATH:/usr/local/go/bin\"" > /etc/environment
-
-        info "Configuring Git..."
-        su $PUSER -c "git config --global url.git@github.com:.insteadOf https://github.com/"
-
-        info "Configuring SSH..."
-        mkdir /home/$PUSER/.ssh
-        cp /host-ssh/* /home/$PUSER/.ssh/
-        chown -R $PUSER:$PUSER /home/$PUSER/.ssh
-
-        touch "${SETUP_FILE}"
-        success "Portainer dev-toolkit container successfully configured."
-
-        display_configuration
-    fi
-}
-
-main
-su $PUSER -s "$@"

build/linux/dev-toolkit/toolkit.Dockerfile

@@ -1,17 +1,17 @@
-FROM ubuntu:20.04
+FROM gitpod/openvscode-server:latest
 
-# Expose port for the Portainer UI and Edge server
-EXPOSE 9000
+EXPOSE 3000
 EXPOSE 9443
+EXPOSE 9000
 EXPOSE 8000
 
-WORKDIR /src/portainer
+USER root
 
 # Set TERM as noninteractive to suppress debconf errors
 RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
 
 # Set default go version
-ARG GO_VERSION=go1.16.6.linux-amd64
+ARG GO_VERSION=go1.16.9.linux-amd64
 
 # Install packages
 RUN apt-get update --fix-missing && apt-get install -qq \
@@ -51,8 +51,5 @@ RUN cd /tmp \
 	&& tar -xf ${GO_VERSION}.tar.gz \
 	&& mv go /usr/local
 
-# Copy run script
-COPY run.sh /
-RUN chmod +x /run.sh
-
-ENTRYPOINT ["/run.sh"]
+# Configuring Golang
+ENV PATH "$PATH:/usr/local/go/bin"

build/windows/Dockerfile

@@ -1,6 +1,6 @@
 ARG OSVERSION
 FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OSVERSION} as core
-FROM --platform=linux/amd64 alpine:3.13.0 as downloader
+FROM --platform=linux/amd64 alpine:3.14 as downloader
 ENV GIT_VERSION 2.30.0
 ENV GIT_PATCH_VERSION 2
 

gruntfile.js

@@ -1,14 +1,13 @@
-var os = require('os');
-var loadGruntTasks = require('load-grunt-tasks');
+const os = require('os');
+const loadGruntTasks = require('load-grunt-tasks');
 const webpackDevConfig = require('./webpack/webpack.develop');
 const webpackProdConfig = require('./webpack/webpack.production');
 const webpackTestingConfig = require('./webpack/webpack.testing');
 
-var arch = os.arch();
-if (arch === 'x64') arch = 'amd64';
-
-var portainer_data = '${PORTAINER_DATA:-/tmp/portainer}';
-var portainer_root = process.env.PORTAINER_PROJECT ? process.env.PORTAINER_PROJECT : process.env.PWD;
+let arch = os.arch();
+if (arch === 'x64') {
+  arch = 'amd64';
+}
 
 module.exports = function (grunt) {
   loadGruntTasks(grunt, {
@@ -28,78 +27,53 @@ module.exports = function (grunt) {
       komposeVersion: 'v1.22.0',
       kubectlVersion: 'v1.18.0',
     },
-    config: gruntfile_cfg.config,
-    env: gruntfile_cfg.env,
-    src: gruntfile_cfg.src,
-    clean: gruntfile_cfg.clean,
-    eslint: gruntfile_cfg.eslint,
-    shell: gruntfile_cfg.shell,
-    copy: gruntfile_cfg.copy,
-    webpack: gruntfile_cfg.webpack,
+    env: gruntConfig.env,
+    clean: gruntConfig.clean,
+    shell: gruntConfig.shell,
+    webpack: gruntConfig.webpack,
   });
 
   grunt.registerTask('lint', ['eslint']);
 
-  grunt.registerTask('build:server', [
-    'shell:build_binary:linux:' + arch,
-    'shell:download_docker_binary:linux:' + arch,
-    'shell:download_docker_compose_binary:linux:' + arch,
-    'shell:download_helm_binary:linux:' + arch,
-    'shell:download_kompose_binary:linux:' + arch,
-    'shell:download_kubectl_binary:linux:' + arch,
-  ]);
+  grunt.registerTask('build:server', [`shell:build_binary:linux:${arch}`, `download_binaries:linux:${arch}`]);
 
-  grunt.registerTask('build:client', ['config:dev', 'env:dev', 'webpack:dev']);
+  grunt.registerTask('build:client', ['webpack:dev']);
 
-  grunt.registerTask('build', ['build:server', 'build:client', 'copy:assets']);
+  grunt.registerTask('build', ['build:server', 'build:client']);
 
-  grunt.registerTask('start:server', ['build:server', 'copy:assets', 'shell:run_container']);
+  grunt.registerTask('start:server', ['build:server', 'shell:run_container']);
 
-  grunt.registerTask('start:localserver', ['shell:build_binary:linux:' + arch, 'shell:run_localserver']);
+  grunt.registerTask('start:localserver', [`shell:build_binary:linux:${arch}`, 'shell:run_localserver']);
 
-  grunt.registerTask('start:client', ['shell:install_yarndeps', 'config:dev', 'env:dev', 'webpack:devWatch']);
+  grunt.registerTask('start:client', ['shell:install_yarndeps', 'webpack:devWatch']);
 
   grunt.registerTask('start', ['start:server', 'start:client']);
 
   grunt.registerTask('start:toolkit', ['start:localserver', 'start:client']);
 
-  grunt.task.registerTask('release', 'release:<platform>:<arch>', function (p = 'linux', a = arch) {
-    grunt.task.run([
-      'config:prod',
-      'env:prod',
-      'clean:all',
-      'copy:assets',
-      'shell:build_binary:' + p + ':' + a,
-      'shell:download_docker_binary:' + p + ':' + a,
-      'shell:download_docker_compose_binary:' + p + ':' + a,
-      'shell:download_helm_binary:' + p + ':' + a,
-      'shell:download_kompose_binary:' + p + ':' + a,
-      'shell:download_kubectl_binary:' + p + ':' + a,
-      'webpack:prod',
-    ]);
+  grunt.task.registerTask('release', 'release:<platform>:<arch>', function (platform = 'linux', a = arch) {
+    grunt.task.run(['env:prod', 'clean:all', `shell:build_binary:${platform}:${a}`, `download_binaries:${platform}:${a}`, 'webpack:prod']);
   });
 
-  grunt.task.registerTask('devopsbuild', 'devopsbuild:<platform>:<arch>:<env>', function (p, a, env = 'prod') {
+  grunt.task.registerTask('devopsbuild', 'devopsbuild:<platform>:<arch>:<env>', function (platform, a = arch, env = 'prod') {
+    grunt.task.run([`env:${env}`, 'clean:all', `shell:build_binary_azuredevops:${platform}:${a}`, `download_binaries:${platform}:${a}`, `webpack:${env}`]);
+  });
+
+  grunt.task.registerTask('download_binaries', 'download_binaries:<platform>:<arch>', function (platform = 'linux', a = arch) {
     grunt.task.run([
-      'config:prod',
-      `env:${env}`,
-      'clean:all',
-      'copy:assets',
-      'shell:build_binary_azuredevops:' + p + ':' + a,
-      'shell:download_docker_binary:' + p + ':' + a,
-      'shell:download_docker_compose_binary:' + p + ':' + a,
-      'shell:download_helm_binary:' + p + ':' + a,
-      'shell:download_kompose_binary:' + p + ':' + a,
-      'shell:download_kubectl_binary:' + p + ':' + a,
-      `webpack:${env}`,
+      `shell:download_docker_binary:${platform}:${a}`,
+      `shell:download_docker_compose_binary:${platform}:${a}`,
+      `shell:download_helm_binary:${platform}:${a}`,
+      `shell:download_kompose_binary:${platform}:${a}`,
+      `shell:download_kubectl_binary:${platform}:${a}`,
     ]);
   });
 };
 
 /***/
-var gruntfile_cfg = {};
+const gruntConfig = {};
 
-gruntfile_cfg.env = {
+gruntConfig.env = {
   dev: {
     NODE_ENV: 'development',
   },
@@ -111,44 +85,20 @@ gruntfile_cfg.env = {
   },
 };
 
-gruntfile_cfg.webpack = {
+gruntConfig.webpack = {
   dev: webpackDevConfig,
   devWatch: Object.assign({ watch: true }, webpackDevConfig),
   prod: webpackProdConfig,
   testing: webpackTestingConfig,
 };
 
-gruntfile_cfg.config = {
-  dev: { options: { variables: { environment: 'development' } } },
-  prod: { options: { variables: { environment: 'production' } } },
-};
-
-gruntfile_cfg.src = {
-  js: ['app/**/__module.js', 'app/**/*.js', '!app/**/*.spec.js'],
-  jsTpl: ['<%= distdir %>/templates/**/*.js'],
-  html: ['index.html'],
-  tpl: ['app/**/*.html'],
-  css: ['assets/css/app.css', 'app/**/*.css'],
-};
-
-gruntfile_cfg.clean = {
+gruntConfig.clean = {
   server: ['<%= root %>/portainer'],
   client: ['<%= distdir %>/*'],
   all: ['<%= root %>/*'],
 };
 
-gruntfile_cfg.eslint = {
-  src: ['gruntfile.js', '<%= src.js %>'],
-  options: { configFile: '.eslintrc.yml' },
-};
-
-gruntfile_cfg.copy = {
-  assets: {
-    files: [],
-  },
-};
-
-gruntfile_cfg.shell = {
+gruntConfig.shell = {
   build_binary: { command: shell_build_binary },
   build_binary_azuredevops: { command: shell_build_binary_azuredevops },
   download_docker_binary: { command: shell_download_docker_binary },
@@ -161,34 +111,50 @@ gruntfile_cfg.shell = {
   install_yarndeps: { command: shell_install_yarndeps },
 };
 
-function shell_build_binary(p, a) {
-  var binfile = 'dist/portainer';
-  if (p === 'linux') {
-    return ['if [ -f ' + binfile + ' ]; then', 'echo "Portainer binary exists";', 'else', 'build/build_binary.sh ' + p + ' ' + a + ';', 'fi'].join(' ');
-  } else {
-    return [
-      'powershell -Command "& {if (Get-Item -Path ' + binfile + '.exe -ErrorAction:SilentlyContinue) {',
-      'Write-Host "Portainer binary exists"',
-      '} else {',
-      '& ".\\build\\build_binary.ps1" -platform ' + p + ' -arch ' + a + '',
-      '}}"',
-    ].join(' ');
+function shell_build_binary(platform, arch) {
+  const binfile = 'dist/portainer';
+  if (platform === 'linux') {
+    return `
+      if [ -f ${binfile} ]; then
+        echo "Portainer binary exists";
+      else
+        build/build_binary.sh ${platform} ${arch};
+      fi
+    `;
   }
+
+  // windows
+  return `
+      powershell -Command "& {if (Get-Item -Path ${binfile}.exe -ErrorAction:SilentlyContinue) {
+        Write-Host "Portainer binary exists"
+      } else {
+        & ".\\build\\build_binary.ps1" -platform ${platform} -arch ${arch}
+      }}"
+    `;
 }
 
-function shell_build_binary_azuredevops(p, a) {
-  return 'build/build_binary_azuredevops.sh ' + p + ' ' + a + ';';
+function shell_build_binary_azuredevops(platform, arch) {
+  return `build/build_binary_azuredevops.sh ${platform} ${arch};`;
 }
 
 function shell_run_container() {
-  return [
-    'docker rm -f portainer',
-    'docker run -d -p 8000:8000 -p 9000:9000 -p 9443:9443 -v ' +
-      portainer_root +
-      '/dist:/app -v ' +
-      portainer_data +
-      ':/data -v /var/run/docker.sock:/var/run/docker.sock:z -v /var/run/docker.sock:/var/run/alternative.sock:z -v /tmp:/tmp --name portainer portainer/base /app/portainer',
-  ].join(';');
+  const portainerRoot = process.env.PORTAINER_PROJECT ? process.env.PORTAINER_PROJECT : process.env.PWD;
+
+  return `
+    docker rm -f portainer
+    docker run -d \
+      -p 8000:8000 \
+      -p 9000:9000 \
+      -p 9443:9443 \
+      -v ${portainerRoot}/dist:/app \
+      -v portainer_dev:/data \
+      -v /var/run/docker.sock:/var/run/docker.sock:z \
+      -v /var/run/docker.sock:/var/run/alternative.sock:z \
+      -v /tmp:/tmp \
+      --name portainer \
+      portainer/base \
+      /app/portainer
+  `;
 }
 
 function shell_run_localserver() {
@@ -199,20 +165,21 @@ function shell_install_yarndeps() {
   return 'yarn';
 }
 
-function shell_download_docker_binary(p, a) {
-  var ps = { windows: 'win', darwin: 'mac' };
-  var as = { amd64: 'x86_64', arm: 'armhf', arm64: 'aarch64' };
-  var ip = ps[p] === undefined ? p : ps[p];
-  var ia = as[a] === undefined ? a : as[a];
-  var binaryVersion = p === 'windows' ? '<%= binaries.dockerWindowsVersion %>' : '<%= binaries.dockerLinuxVersion %>';
+function shell_download_docker_binary(platform, arch) {
+  const ps = { windows: 'win', darwin: 'mac' };
+  const as = { amd64: 'x86_64', arm: 'armhf', arm64: 'aarch64' };
 
-  return [
-    'if [ -f dist/docker ] || [ -f dist/docker.exe ]; then',
-    'echo "docker binary exists";',
-    'else',
-    'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';',
-    'fi',
-  ].join(' ');
+  const ip = ps[platform] === undefined ? platform : ps[platform];
+  const ia = as[arch] === undefined ? arch : as[arch];
+  const binaryVersion = platform === 'windows' ? '<%= binaries.dockerWindowsVersion %>' : '<%= binaries.dockerLinuxVersion %>';
+
+  return `
+    if [ -f dist/docker ] || [ -f dist/docker.exe ]; then
+      echo "docker binary exists";
+    else
+      build/download_docker_binary.sh ${ip} ${ia} ${binaryVersion};
+    fi
+  `;
 }
 
 function shell_download_docker_compose_binary(p, a) {
@@ -242,38 +209,38 @@ function shell_download_docker_compose_binary(p, a) {
     fi`;
 }
 
-function shell_download_helm_binary(p, a) {
+function shell_download_helm_binary(platform, arch) {
   var binaryVersion = '<%= binaries.helmVersion %>';
 
-  return [
-    'if [ -f dist/helm ] || [ -f dist/helm.exe ]; then',
-    'echo "helm binary exists";',
-    'else',
-    'build/download_helm_binary.sh ' + p + ' ' + a + ' ' + binaryVersion + ';',
-    'fi',
-  ].join(' ');
+  return `
+    if [ -f dist/helm ] || [ -f dist/helm.exe ]; then
+    echo "helm binary exists";
+    else
+      build/download_helm_binary.sh ${platform} ${arch} ${binaryVersion};
+    fi
+  `;
 }
 
-function shell_download_kompose_binary(p, a) {
-  var binaryVersion = '<%= binaries.komposeVersion %>';
+function shell_download_kompose_binary(platform, arch) {
+  const binaryVersion = '<%= binaries.komposeVersion %>';
 
-  return [
-    'if [ -f dist/kompose ] || [ -f dist/kompose.exe ]; then',
-    'echo "kompose binary exists";',
-    'else',
-    'build/download_kompose_binary.sh ' + p + ' ' + a + ' ' + binaryVersion + ';',
-    'fi',
-  ].join(' ');
+  return `
+    if [ -f dist/kompose ] || [ -f dist/kompose.exe ]; then
+      echo "kompose binary exists";
+    else
+      build/download_kompose_binary.sh ${platform} ${arch} ${binaryVersion};
+    fi
+  `;
 }
 
-function shell_download_kubectl_binary(p, a) {
+function shell_download_kubectl_binary(platform, arch) {
   var binaryVersion = '<%= binaries.kubectlVersion %>';
 
-  return [
-    'if [ -f dist/kubectl ] || [ -f dist/kubectl.exe ]; then',
-    'echo "kubectl binary exists";',
-    'else',
-    'build/download_kubectl_binary.sh ' + p + ' ' + a + ' ' + binaryVersion + ';',
-    'fi',
-  ].join(' ');
+  return `
+    if [ -f dist/kubectl ] || [ -f dist/kubectl.exe ]; then
+      echo "kubectl binary exists";
+    else
+      build/download_kubectl_binary.sh ${platform} ${arch} ${binaryVersion};
+    fi
+  `;
 }

package.json

@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "2.9.1",
+  "version": "2.9.2",
   "repository": {
     "type": "git",
     "url": "git@github.com:portainer/portainer.git"
@@ -30,14 +30,14 @@
     "start:client": "grunt clean:client && grunt start:client",
     "dev:client": "grunt clean:client && webpack-dev-server --config=./webpack/webpack.develop.js",
     "dev:client:prod": "grunt clean:client && webpack-dev-server --config=./webpack/webpack.production.js",
-    "dev:nodl": "grunt clean:server && grunt clean:client && grunt build:server && grunt copy:assets && grunt start:client",
-    "start:toolkit": "grunt start:toolkit",
+    "dev:nodl": "grunt clean:server && grunt clean:client && grunt build:server && grunt start:client",
     "build:server:offline": "cd ./api/cmd/portainer && CGO_ENABLED=0 go build --installsuffix cgo --ldflags '-s' && mv -f portainer ../../../dist/portainer",
     "clean:all": "grunt clean:all",
     "format": "prettier --loglevel warn --write \"**/*.{js,css,html}\"",
     "lint": "yarn lint:client; yarn lint:server",
     "lint:server": "cd api && golangci-lint run -E exportloopref",
-    "lint:client": "eslint --cache --fix ."
+    "lint:client": "eslint --cache --fix .",
+    "test:server": "cd api && go test ./..."
   },
   "scriptsComments": {
     "build": "Build the entire app (backend/frontend) in development mode",
@@ -82,7 +82,7 @@
     "bootbox": "^5.4.0",
     "bootstrap": "^3.4.0",
     "chardet": "^1.3.0",
-    "chart.js": "~2.6.0",
+    "chart.js": "~2.7.0",
     "codemirror": "~5.30.0",
     "core-js": "2",
     "fast-json-patch": "^3.0.0-1",
@@ -126,7 +126,6 @@
     "file-loader": "^1.1.11",
     "grunt": "^1.1.0",
     "grunt-cli": "^1.3.2",
-    "grunt-config": "^1.0.0",
     "grunt-contrib-clean": "^2.0.0",
     "grunt-contrib-copy": "^1.0.0",
     "grunt-env": "^0.4.4",
@@ -176,4 +175,4 @@
     "*.js": "eslint --cache --fix",
     "*.{js,css,md,html}": "prettier --write"
   }
-}
+}

tool-versions.json

@@ -0,0 +1,6 @@
+{
+    "description": "This file contains current tool versions",
+    "go_version": "v1.16.6",
+    "node_version": "12.x",
+    "yarn_version": "1.x"
+}

yarn.lock

@@ -2447,13 +2447,13 @@ chardet@^1.3.0:
   resolved "https://registry.yarnpkg.com/chardet/-/chardet-1.3.0.tgz#a56ed2d9e4517a7128721340a0cb9a10a8fac238"
   integrity sha512-cyTQGGptIjIT+CMGT5J/0l9c6Fb+565GCFjjeUTKxUO7w3oR+FcNCMEKTn5xtVKaLFmladN7QF68IiQsv5Fbdw==
 
-chart.js@~2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.6.0.tgz#308f9a4b0bfed5a154c14f5deb1d9470d22abe71"
-  integrity sha1-MI+aSwv+1aFUwU9d6x2UcNIqvnE=
+chart.js@~2.7.0:
+  version "2.7.3"
+  resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-2.7.3.tgz#cdb61618830bf216dc887e2f7b1b3c228b73c57e"
+  integrity sha512-3+7k/DbR92m6BsMUYP6M0dMsMVZpMnwkUyNSAbqolHKsbIzH2Q4LWVEHHYq7v0fmEV8whXE0DrjANulw9j2K5g==
   dependencies:
     chartjs-color "^2.1.0"
-    moment "^2.10.6"
+    moment "^2.10.2"
 
 chartjs-color-string@^0.6.0:
   version "0.6.0"
@@ -5296,13 +5296,6 @@ grunt-cli@~1.2.0:
     nopt "~3.0.6"
     resolve "~1.1.0"
 
-grunt-config@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/grunt-config/-/grunt-config-1.0.0.tgz#e0a20e4cbadb8ae90843697a8afa05af8aeb860c"
-  integrity sha1-4KIOTLrbiukIQ2l6ivoFr4rrhgw=
-  dependencies:
-    chalk "^1.1.0"
-
 grunt-contrib-clean@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/grunt-contrib-clean/-/grunt-contrib-clean-2.0.0.tgz#3be7ca480da4b740aa5e9d863e2f7e8b24f8a68b"
@@ -7432,7 +7425,12 @@ mkdirp@~1.0.3:
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
   integrity sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==
 
-moment@^2.10.6, moment@^2.16.0, moment@^2.21.0:
+moment@^2.10.2:
+  version "2.29.1"
+  resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz#b2be769fa31940be9eeea6469c075e35006fa3d3"
+  integrity sha512-kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ==
+
+moment@^2.16.0, moment@^2.21.0:
   version "2.27.0"
   resolved "https://registry.yarnpkg.com/moment/-/moment-2.27.0.tgz#8bff4e3e26a236220dfe3e36de756b6ebaa0105d"
   integrity sha512-al0MUK7cpIcglMv3YF13qSgdAIqxHTO7brRtaz3DlSULbqfazqkc5kEjNrLDOM7fsjshoFIihnU8snrP7zUvhQ==