diff --git a/.codefresh/codefresh_branch.yml b/.codefresh/codefresh_branch.yml index 4c5fb1222..0d6e52555 100644 --- a/.codefresh/codefresh_branch.yml +++ b/.codefresh/codefresh_branch.yml @@ -18,7 +18,7 @@ steps: - mv api/cmd/portainer/portainer dist/ get_docker_version: - image: alpine + image: alpine:3.7 working_directory: ${{build_frontend}} commands: - cf_export DOCKER_VERSION=`cat gruntfile.js | grep -m 1 'shippedDockerVersion' | cut -d\' -f2` diff --git a/.codefresh/codefresh_pullrequest.yml b/.codefresh/codefresh_pullrequest.yml index e3e2652c0..d48b9870f 100644 --- a/.codefresh/codefresh_pullrequest.yml +++ b/.codefresh/codefresh_pullrequest.yml @@ -18,7 +18,7 @@ steps: - mv api/cmd/portainer/portainer dist/ get_docker_version: - image: alpine + image: alpine:3.7 working_directory: ${{build_frontend}} commands: - cf_export DOCKER_VERSION=`cat gruntfile.js | grep -m 1 'shippedDockerVersion' | cut -d\' -f2` diff --git a/api/bolt/datastore.go b/api/bolt/datastore.go index e898d4ec2..a6a921acf 100644 --- a/api/bolt/datastore.go +++ b/api/bolt/datastore.go @@ -18,6 +18,7 @@ import ( "github.com/portainer/portainer/bolt/tag" "github.com/portainer/portainer/bolt/team" "github.com/portainer/portainer/bolt/teammembership" + "github.com/portainer/portainer/bolt/template" "github.com/portainer/portainer/bolt/user" "github.com/portainer/portainer/bolt/version" ) @@ -43,6 +44,7 @@ type Store struct { TagService *tag.Service TeamMembershipService *teammembership.Service TeamService *team.Service + TemplateService *template.Service UserService *user.Service VersionService *version.Service } @@ -212,6 +214,12 @@ func (store *Store) initServices() error { } store.TeamService = teamService + templateService, err := template.NewService(store.db) + if err != nil { + return err + } + store.TemplateService = templateService + userService, err := user.NewService(store.db) if err != nil { return err diff --git a/api/bolt/endpoint/endpoint.go b/api/bolt/endpoint/endpoint.go index 79672eb36..6dfff48df 100644 --- a/api/bolt/endpoint/endpoint.go +++ b/api/bolt/endpoint/endpoint.go @@ -82,8 +82,11 @@ func (service *Service) CreateEndpoint(endpoint *portainer.Endpoint) error { return service.db.Update(func(tx *bolt.Tx) error { bucket := tx.Bucket([]byte(BucketName)) - id, _ := bucket.NextSequence() - endpoint.ID = portainer.EndpointID(id) + // We manually manage sequences for endpoints + err := bucket.SetSequence(uint64(endpoint.ID)) + if err != nil { + return err + } data, err := internal.MarshalObject(endpoint) if err != nil { @@ -94,6 +97,11 @@ func (service *Service) CreateEndpoint(endpoint *portainer.Endpoint) error { }) } +// GetNextIdentifier returns the next identifier for an endpoint. +func (service *Service) GetNextIdentifier() int { + return internal.GetNextIdentifier(service.db, BucketName) +} + // Synchronize creates, updates and deletes endpoints inside a single transaction. func (service *Service) Synchronize(toCreate, toUpdate, toDelete []*portainer.Endpoint) error { return service.db.Update(func(tx *bolt.Tx) error { diff --git a/api/bolt/migrator/migrate_dbversion12.go b/api/bolt/migrator/migrate_dbversion12.go new file mode 100644 index 000000000..0d2bf0554 --- /dev/null +++ b/api/bolt/migrator/migrate_dbversion12.go @@ -0,0 +1,17 @@ +package migrator + +import "github.com/portainer/portainer" + +func (m *Migrator) updateSettingsToVersion13() error { + legacySettings, err := m.settingsService.Settings() + if err != nil { + return err + } + + legacySettings.LDAPSettings.AutoCreateUsers = false + legacySettings.LDAPSettings.GroupSearchSettings = []portainer.LDAPGroupSearchSettings{ + portainer.LDAPGroupSearchSettings{}, + } + + return m.settingsService.UpdateSettings(legacySettings) +} diff --git a/api/bolt/migrator/migrator.go b/api/bolt/migrator/migrator.go index 5e32366ff..9c61fc2c7 100644 --- a/api/bolt/migrator/migrator.go +++ b/api/bolt/migrator/migrator.go @@ -170,5 +170,13 @@ func (m *Migrator) Migrate() error { } } + // Portainer 1.19.0 + if m.currentDBVersion < 13 { + err := m.updateSettingsToVersion13() + if err != nil { + return err + } + } + return m.versionService.StoreDBVersion(portainer.DBVersion) } diff --git a/api/bolt/template/template.go b/api/bolt/template/template.go new file mode 100644 index 000000000..d60f64c0e --- /dev/null +++ b/api/bolt/template/template.go @@ -0,0 +1,95 @@ +package template + +import ( + "github.com/portainer/portainer" + "github.com/portainer/portainer/bolt/internal" + + "github.com/boltdb/bolt" +) + +const ( + // BucketName represents the name of the bucket where this service stores data. + BucketName = "templates" +) + +// Service represents a service for managing endpoint data. +type Service struct { + db *bolt.DB +} + +// NewService creates a new instance of a service. +func NewService(db *bolt.DB) (*Service, error) { + err := internal.CreateBucket(db, BucketName) + if err != nil { + return nil, err + } + + return &Service{ + db: db, + }, nil +} + +// Templates return an array containing all the templates. +func (service *Service) Templates() ([]portainer.Template, error) { + var templates = make([]portainer.Template, 0) + + err := service.db.View(func(tx *bolt.Tx) error { + bucket := tx.Bucket([]byte(BucketName)) + + cursor := bucket.Cursor() + for k, v := cursor.First(); k != nil; k, v = cursor.Next() { + var template portainer.Template + err := internal.UnmarshalObject(v, &template) + if err != nil { + return err + } + templates = append(templates, template) + } + + return nil + }) + + return templates, err +} + +// Template returns a template by ID. +func (service *Service) Template(ID portainer.TemplateID) (*portainer.Template, error) { + var template portainer.Template + identifier := internal.Itob(int(ID)) + + err := internal.GetObject(service.db, BucketName, identifier, &template) + if err != nil { + return nil, err + } + + return &template, nil +} + +// CreateTemplate creates a new template. +func (service *Service) CreateTemplate(template *portainer.Template) error { + return service.db.Update(func(tx *bolt.Tx) error { + bucket := tx.Bucket([]byte(BucketName)) + + id, _ := bucket.NextSequence() + template.ID = portainer.TemplateID(id) + + data, err := internal.MarshalObject(template) + if err != nil { + return err + } + + return bucket.Put(internal.Itob(int(template.ID)), data) + }) +} + +// UpdateTemplate saves a template. +func (service *Service) UpdateTemplate(ID portainer.TemplateID, template *portainer.Template) error { + identifier := internal.Itob(int(ID)) + return internal.UpdateObject(service.db, BucketName, identifier, template) +} + +// DeleteTemplate deletes a template. +func (service *Service) DeleteTemplate(ID portainer.TemplateID) error { + identifier := internal.Itob(int(ID)) + return internal.DeleteObject(service.db, BucketName, identifier) +} diff --git a/api/cli/cli.go b/api/cli/cli.go index b9e00ca66..7c6febac2 100644 --- a/api/cli/cli.go +++ b/api/cli/cli.go @@ -16,10 +16,12 @@ import ( type Service struct{} const ( - errInvalidEndpointProtocol = portainer.Error("Invalid endpoint protocol: Portainer only supports unix:// or tcp://") - errSocketNotFound = portainer.Error("Unable to locate Unix socket") + errInvalidEndpointProtocol = portainer.Error("Invalid endpoint protocol: Portainer only supports unix://, npipe:// or tcp://") + errSocketOrNamedPipeNotFound = portainer.Error("Unable to locate Unix socket or named pipe") errEndpointsFileNotFound = portainer.Error("Unable to locate external endpoints file") + errTemplateFileNotFound = portainer.Error("Unable to locate template file on disk") errInvalidSyncInterval = portainer.Error("Invalid synchronization interval") + errInvalidSnapshotInterval = portainer.Error("Invalid snapshot interval") errEndpointExcludeExternal = portainer.Error("Cannot use the -H flag mutually with --external-endpoints") errNoAuthExcludeAdminPassword = portainer.Error("Cannot use --no-auth with --admin-password or --admin-password-file") errAdminPassExcludeAdminPassFile = portainer.Error("Cannot use --admin-password with --admin-password-file") @@ -46,11 +48,14 @@ func (*Service) ParseFlags(version string) (*portainer.CLIFlags, error) { SSLCert: kingpin.Flag("sslcert", "Path to the SSL certificate used to secure the Portainer instance").Default(defaultSSLCertPath).String(), SSLKey: kingpin.Flag("sslkey", "Path to the SSL key used to secure the Portainer instance").Default(defaultSSLKeyPath).String(), SyncInterval: kingpin.Flag("sync-interval", "Duration between each synchronization via the external endpoints source").Default(defaultSyncInterval).String(), + Snapshot: kingpin.Flag("snapshot", "Start a background job to create endpoint snapshots").Default(defaultSnapshot).Bool(), + SnapshotInterval: kingpin.Flag("snapshot-interval", "Duration between each endpoint snapshot job").Default(defaultSnapshotInterval).String(), AdminPassword: kingpin.Flag("admin-password", "Hashed admin password").String(), AdminPasswordFile: kingpin.Flag("admin-password-file", "Path to the file containing the password for the admin user").String(), Labels: pairs(kingpin.Flag("hide-label", "Hide containers with a specific label in the UI").Short('l')), Logo: kingpin.Flag("logo", "URL for the logo displayed in the UI").String(), - Templates: kingpin.Flag("templates", "URL to the templates (apps) definitions").Short('t').String(), + Templates: kingpin.Flag("templates", "URL to the templates definitions.").Short('t').String(), + TemplateFile: kingpin.Flag("template-file", "Path to the templates (app) definitions on the filesystem").Default(defaultTemplateFile).String(), } kingpin.Parse() @@ -73,7 +78,12 @@ func (*Service) ValidateFlags(flags *portainer.CLIFlags) error { return errEndpointExcludeExternal } - err := validateEndpointURL(*flags.EndpointURL) + err := validateTemplateFile(*flags.TemplateFile) + if err != nil { + return err + } + + err = validateEndpointURL(*flags.EndpointURL) if err != nil { return err } @@ -88,6 +98,11 @@ func (*Service) ValidateFlags(flags *portainer.CLIFlags) error { return err } + err = validateSnapshotInterval(*flags.SnapshotInterval) + if err != nil { + return err + } + if *flags.NoAuth && (*flags.AdminPassword != "" || *flags.AdminPasswordFile != "") { return errNoAuthExcludeAdminPassword } @@ -101,15 +116,16 @@ func (*Service) ValidateFlags(flags *portainer.CLIFlags) error { func validateEndpointURL(endpointURL string) error { if endpointURL != "" { - if !strings.HasPrefix(endpointURL, "unix://") && !strings.HasPrefix(endpointURL, "tcp://") { + if !strings.HasPrefix(endpointURL, "unix://") && !strings.HasPrefix(endpointURL, "tcp://") && !strings.HasPrefix(endpointURL, "npipe://") { return errInvalidEndpointProtocol } - if strings.HasPrefix(endpointURL, "unix://") { + if strings.HasPrefix(endpointURL, "unix://") || strings.HasPrefix(endpointURL, "npipe://") { socketPath := strings.TrimPrefix(endpointURL, "unix://") + socketPath = strings.TrimPrefix(socketPath, "npipe://") if _, err := os.Stat(socketPath); err != nil { if os.IsNotExist(err) { - return errSocketNotFound + return errSocketOrNamedPipeNotFound } return err } @@ -130,6 +146,16 @@ func validateExternalEndpoints(externalEndpoints string) error { return nil } +func validateTemplateFile(templateFile string) error { + if _, err := os.Stat(templateFile); err != nil { + if os.IsNotExist(err) { + return errTemplateFileNotFound + } + return err + } + return nil +} + func validateSyncInterval(syncInterval string) error { if syncInterval != defaultSyncInterval { _, err := time.ParseDuration(syncInterval) @@ -139,3 +165,13 @@ func validateSyncInterval(syncInterval string) error { } return nil } + +func validateSnapshotInterval(snapshotInterval string) error { + if snapshotInterval != defaultSnapshotInterval { + _, err := time.ParseDuration(snapshotInterval) + if err != nil { + return errInvalidSnapshotInterval + } + } + return nil +} diff --git a/api/cli/defaults.go b/api/cli/defaults.go index 419e5fd81..1913e4915 100644 --- a/api/cli/defaults.go +++ b/api/cli/defaults.go @@ -3,18 +3,21 @@ package cli const ( - defaultBindAddress = ":9000" - defaultDataDirectory = "/data" - defaultAssetsDirectory = "./" - defaultNoAuth = "false" - defaultNoAnalytics = "false" - defaultTLS = "false" - defaultTLSSkipVerify = "false" - defaultTLSCACertPath = "/certs/ca.pem" - defaultTLSCertPath = "/certs/cert.pem" - defaultTLSKeyPath = "/certs/key.pem" - defaultSSL = "false" - defaultSSLCertPath = "/certs/portainer.crt" - defaultSSLKeyPath = "/certs/portainer.key" - defaultSyncInterval = "60s" + defaultBindAddress = ":9000" + defaultDataDirectory = "/data" + defaultAssetsDirectory = "./" + defaultNoAuth = "false" + defaultNoAnalytics = "false" + defaultTLS = "false" + defaultTLSSkipVerify = "false" + defaultTLSCACertPath = "/certs/ca.pem" + defaultTLSCertPath = "/certs/cert.pem" + defaultTLSKeyPath = "/certs/key.pem" + defaultSSL = "false" + defaultSSLCertPath = "/certs/portainer.crt" + defaultSSLKeyPath = "/certs/portainer.key" + defaultSyncInterval = "60s" + defaultSnapshot = "true" + defaultSnapshotInterval = "5m" + defaultTemplateFile = "/templates.json" ) diff --git a/api/cli/defaults_windows.go b/api/cli/defaults_windows.go index 2bd909c22..e2ee01795 100644 --- a/api/cli/defaults_windows.go +++ b/api/cli/defaults_windows.go @@ -1,18 +1,21 @@ package cli const ( - defaultBindAddress = ":9000" - defaultDataDirectory = "C:\\data" - defaultAssetsDirectory = "./" - defaultNoAuth = "false" - defaultNoAnalytics = "false" - defaultTLS = "false" - defaultTLSSkipVerify = "false" - defaultTLSCACertPath = "C:\\certs\\ca.pem" - defaultTLSCertPath = "C:\\certs\\cert.pem" - defaultTLSKeyPath = "C:\\certs\\key.pem" - defaultSSL = "false" - defaultSSLCertPath = "C:\\certs\\portainer.crt" - defaultSSLKeyPath = "C:\\certs\\portainer.key" - defaultSyncInterval = "60s" + defaultBindAddress = ":9000" + defaultDataDirectory = "C:\\data" + defaultAssetsDirectory = "./" + defaultNoAuth = "false" + defaultNoAnalytics = "false" + defaultTLS = "false" + defaultTLSSkipVerify = "false" + defaultTLSCACertPath = "C:\\certs\\ca.pem" + defaultTLSCertPath = "C:\\certs\\cert.pem" + defaultTLSKeyPath = "C:\\certs\\key.pem" + defaultSSL = "false" + defaultSSLCertPath = "C:\\certs\\portainer.crt" + defaultSSLKeyPath = "C:\\certs\\portainer.key" + defaultSyncInterval = "60s" + defaultSnapshot = "true" + defaultSnapshotInterval = "5m" + defaultTemplateFile = "/templates.json" ) diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index 54b7ebb5b..470c5d136 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -1,6 +1,7 @@ package main // import "github.com/portainer/portainer" import ( + "encoding/json" "strings" "github.com/portainer/portainer" @@ -8,6 +9,7 @@ import ( "github.com/portainer/portainer/cli" "github.com/portainer/portainer/cron" "github.com/portainer/portainer/crypto" + "github.com/portainer/portainer/docker" "github.com/portainer/portainer/exec" "github.com/portainer/portainer/filesystem" "github.com/portainer/portainer/git" @@ -100,25 +102,41 @@ func initGitService() portainer.GitService { return &git.Service{} } -func initEndpointWatcher(endpointService portainer.EndpointService, externalEnpointFile string, syncInterval string) bool { - authorizeEndpointMgmt := true - if externalEnpointFile != "" { - authorizeEndpointMgmt = false - log.Println("Using external endpoint definition. Endpoint management via the API will be disabled.") - endpointWatcher := cron.NewWatcher(endpointService, syncInterval) - err := endpointWatcher.WatchEndpointFile(externalEnpointFile) - if err != nil { - log.Fatal(err) - } - } - return authorizeEndpointMgmt +func initClientFactory(signatureService portainer.DigitalSignatureService) *docker.ClientFactory { + return docker.NewClientFactory(signatureService) } -func initStatus(authorizeEndpointMgmt bool, flags *portainer.CLIFlags) *portainer.Status { +func initSnapshotter(clientFactory *docker.ClientFactory) portainer.Snapshotter { + return docker.NewSnapshotter(clientFactory) +} + +func initJobScheduler(endpointService portainer.EndpointService, snapshotter portainer.Snapshotter, flags *portainer.CLIFlags) (portainer.JobScheduler, error) { + jobScheduler := cron.NewJobScheduler(endpointService, snapshotter) + + if *flags.ExternalEndpoints != "" { + log.Println("Using external endpoint definition. Endpoint management via the API will be disabled.") + err := jobScheduler.ScheduleEndpointSyncJob(*flags.ExternalEndpoints, *flags.SyncInterval) + if err != nil { + return nil, err + } + } + + if *flags.Snapshot { + err := jobScheduler.ScheduleSnapshotJob(*flags.SnapshotInterval) + if err != nil { + return nil, err + } + } + + return jobScheduler, nil +} + +func initStatus(endpointManagement, snapshot bool, flags *portainer.CLIFlags) *portainer.Status { return &portainer.Status{ Analytics: !*flags.NoAnalytics, Authentication: !*flags.NoAuth, - EndpointManagement: authorizeEndpointMgmt, + EndpointManagement: endpointManagement, + Snapshot: snapshot, Version: portainer.APIVersion, } } @@ -143,23 +161,21 @@ func initSettings(settingsService portainer.SettingsService, flags *portainer.CL _, err := settingsService.Settings() if err == portainer.ErrObjectNotFound { settings := &portainer.Settings{ - LogoURL: *flags.Logo, - DisplayExternalContributors: false, - AuthenticationMethod: portainer.AuthenticationInternal, + LogoURL: *flags.Logo, + AuthenticationMethod: portainer.AuthenticationInternal, LDAPSettings: portainer.LDAPSettings{ - TLSConfig: portainer.TLSConfiguration{}, + AutoCreateUsers: true, + TLSConfig: portainer.TLSConfiguration{}, SearchSettings: []portainer.LDAPSearchSettings{ portainer.LDAPSearchSettings{}, }, + GroupSearchSettings: []portainer.LDAPGroupSearchSettings{ + portainer.LDAPGroupSearchSettings{}, + }, }, AllowBindMountsForRegularUsers: true, AllowPrivilegedModeForRegularUsers: true, - } - - if *flags.Templates != "" { - settings.TemplatesURL = *flags.Templates - } else { - settings.TemplatesURL = portainer.DefaultTemplatesURL + SnapshotInterval: *flags.SnapshotInterval, } if *flags.Labels != nil { @@ -176,6 +192,58 @@ func initSettings(settingsService portainer.SettingsService, flags *portainer.CL return nil } +func initTemplates(templateService portainer.TemplateService, fileService portainer.FileService, templateURL, templateFile string) error { + + existingTemplates, err := templateService.Templates() + if err != nil { + return err + } + + if len(existingTemplates) != 0 { + log.Printf("Templates already registered inside the database. Skipping template import.") + return nil + } + + var templatesJSON []byte + if templateURL == "" { + return loadTemplatesFromFile(fileService, templateService, templateFile) + } + + templatesJSON, err = client.Get(templateURL) + if err != nil { + log.Println("Unable to retrieve templates via HTTP") + return err + } + + return unmarshalAndPersistTemplates(templateService, templatesJSON) +} + +func loadTemplatesFromFile(fileService portainer.FileService, templateService portainer.TemplateService, templateFile string) error { + templatesJSON, err := fileService.GetFileContent(templateFile) + if err != nil { + log.Println("Unable to retrieve template via filesystem") + return err + } + return unmarshalAndPersistTemplates(templateService, templatesJSON) +} + +func unmarshalAndPersistTemplates(templateService portainer.TemplateService, templateData []byte) error { + var templates []portainer.Template + err := json.Unmarshal(templateData, &templates) + if err != nil { + log.Println("Unable to parse templates file. Please review your template definition file.") + return err + } + + for _, template := range templates { + err := templateService.CreateTemplate(&template) + if err != nil { + return err + } + } + return nil +} + func retrieveFirstEndpointFromDatabase(endpointService portainer.EndpointService) *portainer.Endpoint { endpoints, err := endpointService.Endpoints() if err != nil { @@ -213,7 +281,7 @@ func initKeyPair(fileService portainer.FileService, signatureService portainer.D return generateAndStoreKeyPair(fileService, signatureService) } -func createTLSSecuredEndpoint(flags *portainer.CLIFlags, endpointService portainer.EndpointService) error { +func createTLSSecuredEndpoint(flags *portainer.CLIFlags, endpointService portainer.EndpointService, snapshotter portainer.Snapshotter) error { tlsConfiguration := portainer.TLSConfiguration{ TLS: *flags.TLS, TLSSkipVerify: *flags.TLSSkipVerify, @@ -227,7 +295,9 @@ func createTLSSecuredEndpoint(flags *portainer.CLIFlags, endpointService portain tlsConfiguration.TLS = true } + endpointID := endpointService.GetNextIdentifier() endpoint := &portainer.Endpoint{ + ID: portainer.EndpointID(endpointID), Name: "primary", URL: *flags.EndpointURL, GroupID: portainer.EndpointGroupID(1), @@ -237,6 +307,8 @@ func createTLSSecuredEndpoint(flags *portainer.CLIFlags, endpointService portain AuthorizedTeams: []portainer.TeamID{}, Extensions: []portainer.EndpointExtension{}, Tags: []string{}, + Status: portainer.EndpointStatusUp, + Snapshots: []portainer.Snapshot{}, } if strings.HasPrefix(endpoint.URL, "tcp://") { @@ -255,10 +327,10 @@ func createTLSSecuredEndpoint(flags *portainer.CLIFlags, endpointService portain } } - return endpointService.CreateEndpoint(endpoint) + return snapshotAndPersistEndpoint(endpoint, endpointService, snapshotter) } -func createUnsecuredEndpoint(endpointURL string, endpointService portainer.EndpointService) error { +func createUnsecuredEndpoint(endpointURL string, endpointService portainer.EndpointService, snapshotter portainer.Snapshotter) error { if strings.HasPrefix(endpointURL, "tcp://") { _, err := client.ExecutePingOperation(endpointURL, nil) if err != nil { @@ -266,7 +338,9 @@ func createUnsecuredEndpoint(endpointURL string, endpointService portainer.Endpo } } + endpointID := endpointService.GetNextIdentifier() endpoint := &portainer.Endpoint{ + ID: portainer.EndpointID(endpointID), Name: "primary", URL: endpointURL, GroupID: portainer.EndpointGroupID(1), @@ -276,12 +350,28 @@ func createUnsecuredEndpoint(endpointURL string, endpointService portainer.Endpo AuthorizedTeams: []portainer.TeamID{}, Extensions: []portainer.EndpointExtension{}, Tags: []string{}, + Status: portainer.EndpointStatusUp, + Snapshots: []portainer.Snapshot{}, + } + + return snapshotAndPersistEndpoint(endpoint, endpointService, snapshotter) +} + +func snapshotAndPersistEndpoint(endpoint *portainer.Endpoint, endpointService portainer.EndpointService, snapshotter portainer.Snapshotter) error { + snapshot, err := snapshotter.CreateSnapshot(endpoint) + endpoint.Status = portainer.EndpointStatusUp + if err != nil { + log.Printf("http error: endpoint snapshot error (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + } + + if snapshot != nil { + endpoint.Snapshots = []portainer.Snapshot{*snapshot} } return endpointService.CreateEndpoint(endpoint) } -func initEndpoint(flags *portainer.CLIFlags, endpointService portainer.EndpointService) error { +func initEndpoint(flags *portainer.CLIFlags, endpointService portainer.EndpointService, snapshotter portainer.Snapshotter) error { if *flags.EndpointURL == "" { return nil } @@ -297,9 +387,9 @@ func initEndpoint(flags *portainer.CLIFlags, endpointService portainer.EndpointS } if *flags.TLS || *flags.TLSSkipVerify { - return createTLSSecuredEndpoint(flags, endpointService) + return createTLSSecuredEndpoint(flags, endpointService, snapshotter) } - return createUnsecuredEndpoint(*flags.EndpointURL, endpointService) + return createUnsecuredEndpoint(*flags.EndpointURL, endpointService, snapshotter) } func main() { @@ -312,21 +402,35 @@ func main() { jwtService := initJWTService(!*flags.NoAuth) - cryptoService := initCryptoService() - - digitalSignatureService := initDigitalSignatureService() - ldapService := initLDAPService() gitService := initGitService() - authorizeEndpointMgmt := initEndpointWatcher(store.EndpointService, *flags.ExternalEndpoints, *flags.SyncInterval) + cryptoService := initCryptoService() + + digitalSignatureService := initDigitalSignatureService() err := initKeyPair(fileService, digitalSignatureService) if err != nil { log.Fatal(err) } + clientFactory := initClientFactory(digitalSignatureService) + + snapshotter := initSnapshotter(clientFactory) + + jobScheduler, err := initJobScheduler(store.EndpointService, snapshotter, flags) + if err != nil { + log.Fatal(err) + } + + jobScheduler.Start() + + endpointManagement := true + if *flags.ExternalEndpoints != "" { + endpointManagement = false + } + swarmStackManager, err := initSwarmStackManager(*flags.Assets, *flags.Data, digitalSignatureService, fileService) if err != nil { log.Fatal(err) @@ -334,6 +438,11 @@ func main() { composeStackManager := initComposeStackManager(*flags.Data) + err = initTemplates(store.TemplateService, fileService, *flags.Templates, *flags.TemplateFile) + if err != nil { + log.Fatal(err) + } + err = initSettings(store.SettingsService, flags) if err != nil { log.Fatal(err) @@ -344,9 +453,9 @@ func main() { log.Fatal(err) } - applicationStatus := initStatus(authorizeEndpointMgmt, flags) + applicationStatus := initStatus(endpointManagement, *flags.Snapshot, flags) - err = initEndpoint(flags, store.EndpointService) + err = initEndpoint(flags, store.EndpointService, snapshotter) if err != nil { log.Fatal(err) } @@ -357,7 +466,7 @@ func main() { if err != nil { log.Fatal(err) } - adminPasswordHash, err = cryptoService.Hash(content) + adminPasswordHash, err = cryptoService.Hash(string(content)) if err != nil { log.Fatal(err) } @@ -392,7 +501,7 @@ func main() { BindAddress: *flags.Addr, AssetsPath: *flags.Assets, AuthDisabled: *flags.NoAuth, - EndpointManagement: authorizeEndpointMgmt, + EndpointManagement: endpointManagement, UserService: store.UserService, TeamService: store.TeamService, TeamMembershipService: store.TeamMembershipService, @@ -404,6 +513,7 @@ func main() { DockerHubService: store.DockerHubService, StackService: store.StackService, TagService: store.TagService, + TemplateService: store.TemplateService, SwarmStackManager: swarmStackManager, ComposeStackManager: composeStackManager, CryptoService: cryptoService, @@ -412,6 +522,8 @@ func main() { LDAPService: ldapService, GitService: gitService, SignatureService: digitalSignatureService, + JobScheduler: jobScheduler, + Snapshotter: snapshotter, SSL: *flags.SSL, SSLCert: *flags.SSLCert, SSLKey: *flags.SSLKey, diff --git a/api/cron/job_endpoint_snapshot.go b/api/cron/job_endpoint_snapshot.go new file mode 100644 index 000000000..ff7cc333b --- /dev/null +++ b/api/cron/job_endpoint_snapshot.go @@ -0,0 +1,60 @@ +package cron + +import ( + "log" + + "github.com/portainer/portainer" +) + +type ( + endpointSnapshotJob struct { + endpointService portainer.EndpointService + snapshotter portainer.Snapshotter + } +) + +func newEndpointSnapshotJob(endpointService portainer.EndpointService, snapshotter portainer.Snapshotter) endpointSnapshotJob { + return endpointSnapshotJob{ + endpointService: endpointService, + snapshotter: snapshotter, + } +} + +func (job endpointSnapshotJob) Snapshot() error { + + endpoints, err := job.endpointService.Endpoints() + if err != nil { + return err + } + + for _, endpoint := range endpoints { + if endpoint.Type == portainer.AzureEnvironment { + continue + } + + snapshot, err := job.snapshotter.CreateSnapshot(&endpoint) + endpoint.Status = portainer.EndpointStatusUp + if err != nil { + log.Printf("cron error: endpoint snapshot error (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + endpoint.Status = portainer.EndpointStatusDown + } + + if snapshot != nil { + endpoint.Snapshots = []portainer.Snapshot{*snapshot} + } + + err = job.endpointService.UpdateEndpoint(endpoint.ID, &endpoint) + if err != nil { + return err + } + } + + return nil +} + +func (job endpointSnapshotJob) Run() { + err := job.Snapshot() + if err != nil { + log.Printf("cron error: snapshot job error (err=%s)\n", err) + } +} diff --git a/api/cron/endpoint_sync.go b/api/cron/job_endpoint_sync.go similarity index 81% rename from api/cron/endpoint_sync.go rename to api/cron/job_endpoint_sync.go index 8d55b4a0e..9fbf595f3 100644 --- a/api/cron/endpoint_sync.go +++ b/api/cron/job_endpoint_sync.go @@ -4,7 +4,6 @@ import ( "encoding/json" "io/ioutil" "log" - "os" "strings" "github.com/portainer/portainer" @@ -12,7 +11,6 @@ import ( type ( endpointSyncJob struct { - logger *log.Logger endpointService portainer.EndpointService endpointFilePath string } @@ -41,15 +39,14 @@ const ( func newEndpointSyncJob(endpointFilePath string, endpointService portainer.EndpointService) endpointSyncJob { return endpointSyncJob{ - logger: log.New(os.Stderr, "", log.LstdFlags), endpointService: endpointService, endpointFilePath: endpointFilePath, } } -func endpointSyncError(err error, logger *log.Logger) bool { +func endpointSyncError(err error) bool { if err != nil { - logger.Printf("Endpoint synchronization error: %s", err) + log.Printf("cron error: synchronization job error (err=%s)\n", err) return true } return false @@ -140,23 +137,23 @@ func (job endpointSyncJob) prepareSyncData(storedEndpoints, fileEndpoints []port if fidx != -1 { endpoint := mergeEndpointIfRequired(&storedEndpoints[idx], &fileEndpoints[fidx]) if endpoint != nil { - job.logger.Printf("New definition for a stored endpoint found in file, updating database. [name: %v] [url: %v]\n", endpoint.Name, endpoint.URL) + log.Printf("New definition for a stored endpoint found in file, updating database. [name: %v] [url: %v]\n", endpoint.Name, endpoint.URL) endpointsToUpdate = append(endpointsToUpdate, endpoint) } } else { - job.logger.Printf("Stored endpoint not found in file (definition might be invalid), removing from database. [name: %v] [url: %v]", storedEndpoints[idx].Name, storedEndpoints[idx].URL) + log.Printf("Stored endpoint not found in file (definition might be invalid), removing from database. [name: %v] [url: %v]", storedEndpoints[idx].Name, storedEndpoints[idx].URL) endpointsToDelete = append(endpointsToDelete, &storedEndpoints[idx]) } } for idx, endpoint := range fileEndpoints { if !isValidEndpoint(&endpoint) { - job.logger.Printf("Invalid file endpoint definition, skipping. [name: %v] [url: %v]", endpoint.Name, endpoint.URL) + log.Printf("Invalid file endpoint definition, skipping. [name: %v] [url: %v]", endpoint.Name, endpoint.URL) continue } sidx := endpointExists(&fileEndpoints[idx], storedEndpoints) if sidx == -1 { - job.logger.Printf("File endpoint not found in database, adding to database. [name: %v] [url: %v]", fileEndpoints[idx].Name, fileEndpoints[idx].URL) + log.Printf("File endpoint not found in database, adding to database. [name: %v] [url: %v]", fileEndpoints[idx].Name, fileEndpoints[idx].URL) endpointsToCreate = append(endpointsToCreate, &fileEndpoints[idx]) } } @@ -170,13 +167,13 @@ func (job endpointSyncJob) prepareSyncData(storedEndpoints, fileEndpoints []port func (job endpointSyncJob) Sync() error { data, err := ioutil.ReadFile(job.endpointFilePath) - if endpointSyncError(err, job.logger) { + if endpointSyncError(err) { return err } var fileEndpoints []fileEndpoint err = json.Unmarshal(data, &fileEndpoints) - if endpointSyncError(err, job.logger) { + if endpointSyncError(err) { return err } @@ -185,7 +182,7 @@ func (job endpointSyncJob) Sync() error { } storedEndpoints, err := job.endpointService.Endpoints() - if endpointSyncError(err, job.logger) { + if endpointSyncError(err) { return err } @@ -194,16 +191,16 @@ func (job endpointSyncJob) Sync() error { sync := job.prepareSyncData(storedEndpoints, convertedFileEndpoints) if sync.requireSync() { err = job.endpointService.Synchronize(sync.endpointsToCreate, sync.endpointsToUpdate, sync.endpointsToDelete) - if endpointSyncError(err, job.logger) { + if endpointSyncError(err) { return err } - job.logger.Printf("Endpoint synchronization ended. [created: %v] [updated: %v] [deleted: %v]", len(sync.endpointsToCreate), len(sync.endpointsToUpdate), len(sync.endpointsToDelete)) + log.Printf("Endpoint synchronization ended. [created: %v] [updated: %v] [deleted: %v]", len(sync.endpointsToCreate), len(sync.endpointsToUpdate), len(sync.endpointsToDelete)) } return nil } func (job endpointSyncJob) Run() { - job.logger.Println("Endpoint synchronization job started.") + log.Println("cron: synchronization job started") err := job.Sync() - endpointSyncError(err, job.logger) + endpointSyncError(err) } diff --git a/api/cron/scheduler.go b/api/cron/scheduler.go new file mode 100644 index 000000000..9f65b6d5a --- /dev/null +++ b/api/cron/scheduler.go @@ -0,0 +1,86 @@ +package cron + +import ( + "log" + + "github.com/portainer/portainer" + "github.com/robfig/cron" +) + +// JobScheduler represents a service for managing crons. +type JobScheduler struct { + cron *cron.Cron + endpointService portainer.EndpointService + snapshotter portainer.Snapshotter + + endpointFilePath string + endpointSyncInterval string +} + +// NewJobScheduler initializes a new service. +func NewJobScheduler(endpointService portainer.EndpointService, snapshotter portainer.Snapshotter) *JobScheduler { + return &JobScheduler{ + cron: cron.New(), + endpointService: endpointService, + snapshotter: snapshotter, + } +} + +// ScheduleEndpointSyncJob schedules a cron job to synchronize the endpoints from a file +func (scheduler *JobScheduler) ScheduleEndpointSyncJob(endpointFilePath string, interval string) error { + + scheduler.endpointFilePath = endpointFilePath + scheduler.endpointSyncInterval = interval + + job := newEndpointSyncJob(endpointFilePath, scheduler.endpointService) + + err := job.Sync() + if err != nil { + return err + } + + return scheduler.cron.AddJob("@every "+interval, job) +} + +// ScheduleSnapshotJob schedules a cron job to create endpoint snapshots +func (scheduler *JobScheduler) ScheduleSnapshotJob(interval string) error { + job := newEndpointSnapshotJob(scheduler.endpointService, scheduler.snapshotter) + + err := job.Snapshot() + if err != nil { + return err + } + + return scheduler.cron.AddJob("@every "+interval, job) +} + +// UpdateSnapshotJob will update the schedules to match the new snapshot interval +func (scheduler *JobScheduler) UpdateSnapshotJob(interval string) { + // TODO: the cron library do not support removing/updating schedules. + // As a work-around we need to re-create the cron and reschedule the jobs. + // We should update the library. + jobs := scheduler.cron.Entries() + scheduler.cron.Stop() + + scheduler.cron = cron.New() + + for _, job := range jobs { + switch job.Job.(type) { + case endpointSnapshotJob: + scheduler.ScheduleSnapshotJob(interval) + case endpointSyncJob: + scheduler.ScheduleEndpointSyncJob(scheduler.endpointFilePath, scheduler.endpointSyncInterval) + default: + log.Println("Unsupported job") + } + } + + scheduler.cron.Start() +} + +// Start starts the scheduled jobs +func (scheduler *JobScheduler) Start() { + if len(scheduler.cron.Entries()) > 0 { + scheduler.cron.Start() + } +} diff --git a/api/cron/watcher.go b/api/cron/watcher.go deleted file mode 100644 index 6b44ff5ce..000000000 --- a/api/cron/watcher.go +++ /dev/null @@ -1,40 +0,0 @@ -package cron - -import ( - "github.com/portainer/portainer" - "github.com/robfig/cron" -) - -// Watcher represents a service for managing crons. -type Watcher struct { - Cron *cron.Cron - EndpointService portainer.EndpointService - syncInterval string -} - -// NewWatcher initializes a new service. -func NewWatcher(endpointService portainer.EndpointService, syncInterval string) *Watcher { - return &Watcher{ - Cron: cron.New(), - EndpointService: endpointService, - syncInterval: syncInterval, - } -} - -// WatchEndpointFile starts a cron job to synchronize the endpoints from a file -func (watcher *Watcher) WatchEndpointFile(endpointFilePath string) error { - job := newEndpointSyncJob(endpointFilePath, watcher.EndpointService) - - err := job.Sync() - if err != nil { - return err - } - - err = watcher.Cron.AddJob("@every "+watcher.syncInterval, job) - if err != nil { - return err - } - - watcher.Cron.Start() - return nil -} diff --git a/api/docker/client.go b/api/docker/client.go new file mode 100644 index 000000000..af9f08c46 --- /dev/null +++ b/api/docker/client.go @@ -0,0 +1,103 @@ +package docker + +import ( + "net/http" + "strings" + "time" + + "github.com/docker/docker/client" + "github.com/portainer/portainer" + "github.com/portainer/portainer/crypto" +) + +const ( + unsupportedEnvironmentType = portainer.Error("Environment not supported") +) + +// ClientFactory is used to create Docker clients +type ClientFactory struct { + signatureService portainer.DigitalSignatureService +} + +// NewClientFactory returns a new instance of a ClientFactory +func NewClientFactory(signatureService portainer.DigitalSignatureService) *ClientFactory { + return &ClientFactory{ + signatureService: signatureService, + } +} + +// CreateClient is a generic function to create a Docker client based on +// a specific endpoint configuration +func (factory *ClientFactory) CreateClient(endpoint *portainer.Endpoint) (*client.Client, error) { + if endpoint.Type == portainer.AzureEnvironment { + return nil, unsupportedEnvironmentType + } else if endpoint.Type == portainer.AgentOnDockerEnvironment { + return createAgentClient(endpoint, factory.signatureService) + } + + if strings.HasPrefix(endpoint.URL, "unix://") || strings.HasPrefix(endpoint.URL, "npipe://") { + return createLocalClient(endpoint) + } + return createTCPClient(endpoint) +} + +func createLocalClient(endpoint *portainer.Endpoint) (*client.Client, error) { + return client.NewClientWithOpts( + client.WithHost(endpoint.URL), + client.WithVersion(portainer.SupportedDockerAPIVersion), + ) +} + +func createTCPClient(endpoint *portainer.Endpoint) (*client.Client, error) { + httpCli, err := httpClient(endpoint) + if err != nil { + return nil, err + } + + return client.NewClientWithOpts( + client.WithHost(endpoint.URL), + client.WithVersion(portainer.SupportedDockerAPIVersion), + client.WithHTTPClient(httpCli), + ) +} + +func createAgentClient(endpoint *portainer.Endpoint, signatureService portainer.DigitalSignatureService) (*client.Client, error) { + httpCli, err := httpClient(endpoint) + if err != nil { + return nil, err + } + + signature, err := signatureService.Sign(portainer.PortainerAgentSignatureMessage) + if err != nil { + return nil, err + } + + headers := map[string]string{ + portainer.PortainerAgentPublicKeyHeader: signatureService.EncodedPublicKey(), + portainer.PortainerAgentSignatureHeader: signature, + } + + return client.NewClientWithOpts( + client.WithHost(endpoint.URL), + client.WithVersion(portainer.SupportedDockerAPIVersion), + client.WithHTTPClient(httpCli), + client.WithHTTPHeaders(headers), + ) +} + +func httpClient(endpoint *portainer.Endpoint) (*http.Client, error) { + transport := &http.Transport{} + + if endpoint.TLSConfig.TLS { + tlsConfig, err := crypto.CreateTLSConfigurationFromDisk(endpoint.TLSConfig.TLSCACertPath, endpoint.TLSConfig.TLSCertPath, endpoint.TLSConfig.TLSKeyPath, endpoint.TLSConfig.TLSSkipVerify) + if err != nil { + return nil, err + } + transport.TLSClientConfig = tlsConfig + } + + return &http.Client{ + Timeout: time.Second * 10, + Transport: transport, + }, nil +} diff --git a/api/docker/snapshot.go b/api/docker/snapshot.go new file mode 100644 index 000000000..5f37ad985 --- /dev/null +++ b/api/docker/snapshot.go @@ -0,0 +1,135 @@ +package docker + +import ( + "context" + "time" + + "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/filters" + "github.com/docker/docker/client" + "github.com/portainer/portainer" +) + +func snapshot(cli *client.Client) (*portainer.Snapshot, error) { + _, err := cli.Ping(context.Background()) + if err != nil { + return nil, err + } + + snapshot := &portainer.Snapshot{ + StackCount: 0, + } + + err = snapshotInfo(snapshot, cli) + if err != nil { + return nil, err + } + + if snapshot.Swarm { + err = snapshotSwarmServices(snapshot, cli) + if err != nil { + return nil, err + } + } + + err = snapshotContainers(snapshot, cli) + if err != nil { + return nil, err + } + + err = snapshotImages(snapshot, cli) + if err != nil { + return nil, err + } + + err = snapshotVolumes(snapshot, cli) + if err != nil { + return nil, err + } + + snapshot.Time = time.Now().Unix() + return snapshot, nil +} + +func snapshotInfo(snapshot *portainer.Snapshot, cli *client.Client) error { + info, err := cli.Info(context.Background()) + if err != nil { + return err + } + + snapshot.Swarm = info.Swarm.ControlAvailable + snapshot.DockerVersion = info.ServerVersion + snapshot.TotalCPU = info.NCPU + snapshot.TotalMemory = info.MemTotal + return nil +} + +func snapshotSwarmServices(snapshot *portainer.Snapshot, cli *client.Client) error { + stacks := make(map[string]struct{}) + + services, err := cli.ServiceList(context.Background(), types.ServiceListOptions{}) + if err != nil { + return err + } + + for _, service := range services { + for k, v := range service.Spec.Labels { + if k == "com.docker.stack.namespace" { + stacks[v] = struct{}{} + } + } + } + + snapshot.ServiceCount = len(services) + snapshot.StackCount += len(stacks) + return nil +} + +func snapshotContainers(snapshot *portainer.Snapshot, cli *client.Client) error { + containers, err := cli.ContainerList(context.Background(), types.ContainerListOptions{All: true}) + if err != nil { + return err + } + + runningContainers := 0 + stoppedContainers := 0 + stacks := make(map[string]struct{}) + for _, container := range containers { + if container.State == "exited" { + stoppedContainers++ + } else if container.State == "running" { + runningContainers++ + } + + for k, v := range container.Labels { + if k == "com.docker.compose.project" { + stacks[v] = struct{}{} + } + } + } + + snapshot.RunningContainerCount = runningContainers + snapshot.StoppedContainerCount = stoppedContainers + snapshot.StackCount += len(stacks) + return nil +} + +func snapshotImages(snapshot *portainer.Snapshot, cli *client.Client) error { + images, err := cli.ImageList(context.Background(), types.ImageListOptions{}) + if err != nil { + return err + } + + snapshot.ImageCount = len(images) + return nil +} + +func snapshotVolumes(snapshot *portainer.Snapshot, cli *client.Client) error { + volumes, err := cli.VolumeList(context.Background(), filters.Args{}) + if err != nil { + return err + } + + snapshot.VolumeCount = len(volumes.Volumes) + return nil +} diff --git a/api/docker/snapshotter.go b/api/docker/snapshotter.go new file mode 100644 index 000000000..b8f571d37 --- /dev/null +++ b/api/docker/snapshotter.go @@ -0,0 +1,27 @@ +package docker + +import ( + "github.com/portainer/portainer" +) + +// Snapshotter represents a service used to create endpoint snapshots +type Snapshotter struct { + clientFactory *ClientFactory +} + +// NewSnapshotter returns a new Snapshotter instance +func NewSnapshotter(clientFactory *ClientFactory) *Snapshotter { + return &Snapshotter{ + clientFactory: clientFactory, + } +} + +// CreateSnapshot creates a snapshot of a specific endpoint +func (snapshotter *Snapshotter) CreateSnapshot(endpoint *portainer.Endpoint) (*portainer.Snapshot, error) { + cli, err := snapshotter.clientFactory.CreateClient(endpoint) + if err != nil { + return nil, err + } + + return snapshot(cli) +} diff --git a/api/errors.go b/api/errors.go index 9e4eb70e7..37552f104 100644 --- a/api/errors.go +++ b/api/errors.go @@ -10,10 +10,11 @@ const ( // User errors. const ( - ErrUserAlreadyExists = Error("User already exists") - ErrInvalidUsername = Error("Invalid username. White spaces are not allowed") - ErrAdminAlreadyInitialized = Error("An administrator user already exists") - ErrAdminCannotRemoveSelf = Error("Cannot remove your own user account. Contact another administrator") + ErrUserAlreadyExists = Error("User already exists") + ErrInvalidUsername = Error("Invalid username. White spaces are not allowed") + ErrAdminAlreadyInitialized = Error("An administrator user already exists") + ErrAdminCannotRemoveSelf = Error("Cannot remove your own user account. Contact another administrator") + ErrCannotRemoveLastLocalAdmin = Error("Cannot remove the last local administrator account") ) // Team errors. diff --git a/api/exec/swarm_stack.go b/api/exec/swarm_stack.go index 1e896971e..aa32bfe54 100644 --- a/api/exec/swarm_stack.go +++ b/api/exec/swarm_stack.go @@ -169,7 +169,7 @@ func (manager *SwarmStackManager) retrieveConfigurationFromDisk(path string) (ma return make(map[string]interface{}), nil } - err = json.Unmarshal([]byte(raw), &config) + err = json.Unmarshal(raw, &config) if err != nil { return nil, err } diff --git a/api/filesystem/filesystem.go b/api/filesystem/filesystem.go index 5bff04852..1f5ca322e 100644 --- a/api/filesystem/filesystem.go +++ b/api/filesystem/filesystem.go @@ -176,14 +176,14 @@ func (service *Service) DeleteTLSFile(folder string, fileType portainer.TLSFileT return nil } -// GetFileContent returns a string content from file. -func (service *Service) GetFileContent(filePath string) (string, error) { +// GetFileContent returns the content of a file as bytes. +func (service *Service) GetFileContent(filePath string) ([]byte, error) { content, err := ioutil.ReadFile(filePath) if err != nil { - return "", err + return nil, err } - return string(content), nil + return content, nil } // Rename renames a file or directory diff --git a/api/git/git.go b/api/git/git.go index 5e58363c7..add688b01 100644 --- a/api/git/git.go +++ b/api/git/git.go @@ -5,6 +5,7 @@ import ( "strings" "gopkg.in/src-d/go-git.v4" + "gopkg.in/src-d/go-git.v4/plumbing" ) // Service represents a service for managing Git. @@ -19,21 +20,27 @@ func NewService(dataStorePath string) (*Service, error) { // ClonePublicRepository clones a public git repository using the specified URL in the specified // destination folder. -func (service *Service) ClonePublicRepository(repositoryURL, destination string) error { - return cloneRepository(repositoryURL, destination) +func (service *Service) ClonePublicRepository(repositoryURL, referenceName string, destination string) error { + return cloneRepository(repositoryURL, referenceName, destination) } // ClonePrivateRepositoryWithBasicAuth clones a private git repository using the specified URL in the specified // destination folder. It will use the specified username and password for basic HTTP authentication. -func (service *Service) ClonePrivateRepositoryWithBasicAuth(repositoryURL, destination, username, password string) error { +func (service *Service) ClonePrivateRepositoryWithBasicAuth(repositoryURL, referenceName string, destination, username, password string) error { credentials := username + ":" + url.PathEscape(password) repositoryURL = strings.Replace(repositoryURL, "://", "://"+credentials+"@", 1) - return cloneRepository(repositoryURL, destination) + return cloneRepository(repositoryURL, referenceName, destination) } -func cloneRepository(repositoryURL, destination string) error { - _, err := git.PlainClone(destination, false, &git.CloneOptions{ +func cloneRepository(repositoryURL, referenceName string, destination string) error { + options := &git.CloneOptions{ URL: repositoryURL, - }) + } + + if referenceName != "" { + options.ReferenceName = plumbing.ReferenceName(referenceName) + } + + _, err := git.PlainClone(destination, false, options) return err } diff --git a/api/http/client/client.go b/api/http/client/client.go index 338aed15d..29ebb7d88 100644 --- a/api/http/client/client.go +++ b/api/http/client/client.go @@ -4,6 +4,7 @@ import ( "crypto/tls" "encoding/json" "fmt" + "io/ioutil" "net/http" "net/url" "strings" @@ -61,6 +62,27 @@ func (client *HTTPClient) ExecuteAzureAuthenticationRequest(credentials *portain return &token, nil } +// Get executes a simple HTTP GET to the specified URL and returns +// the content of the response body. +func Get(url string) ([]byte, error) { + client := &http.Client{ + Timeout: time.Second * 3, + } + + response, err := client.Get(url) + if err != nil { + return nil, err + } + defer response.Body.Close() + + body, err := ioutil.ReadAll(response.Body) + if err != nil { + return nil, err + } + + return body, nil +} + // ExecutePingOperation will send a SystemPing operation HTTP request to a Docker environment // using the specified host and optional TLS configuration. // It uses a new Http.Client for each operation. diff --git a/api/http/handler/auth/authenticate.go b/api/http/handler/auth/authenticate.go index b146352a8..cf928357b 100644 --- a/api/http/handler/auth/authenticate.go +++ b/api/http/handler/auth/authenticate.go @@ -1,7 +1,9 @@ package auth import ( + "log" "net/http" + "strings" "github.com/asaskevich/govalidator" "github.com/portainer/portainer" @@ -40,34 +42,84 @@ func (handler *Handler) authenticate(w http.ResponseWriter, r *http.Request) *ht return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } - u, err := handler.UserService.UserByUsername(payload.Username) - if err == portainer.ErrObjectNotFound { - return &httperror.HandlerError{http.StatusBadRequest, "Invalid credentials", ErrInvalidCredentials} - } else if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve a user with the specified username from the database", err} - } - settings, err := handler.SettingsService.Settings() if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve settings from the database", err} } - if settings.AuthenticationMethod == portainer.AuthenticationLDAP && u.ID != 1 { - err = handler.LDAPService.AuthenticateUser(payload.Username, payload.Password, &settings.LDAPSettings) - if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Unable to authenticate user via LDAP/AD", err} - } - } else { - err = handler.CryptoService.CompareHashAndData(u.Password, payload.Password) - if err != nil { - return &httperror.HandlerError{http.StatusUnprocessableEntity, "Invalid credentials", ErrInvalidCredentials} - } + u, err := handler.UserService.UserByUsername(payload.Username) + if err != nil && err != portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve a user with the specified username from the database", err} } + if err == portainer.ErrObjectNotFound && settings.AuthenticationMethod == portainer.AuthenticationInternal { + return &httperror.HandlerError{http.StatusUnprocessableEntity, "Invalid credentials", portainer.ErrUnauthorized} + } + + if settings.AuthenticationMethod == portainer.AuthenticationLDAP { + if u == nil && settings.LDAPSettings.AutoCreateUsers { + return handler.authenticateLDAPAndCreateUser(w, payload.Username, payload.Password, &settings.LDAPSettings) + } else if u == nil && !settings.LDAPSettings.AutoCreateUsers { + return &httperror.HandlerError{http.StatusUnprocessableEntity, "Invalid credentials", portainer.ErrUnauthorized} + } + return handler.authenticateLDAP(w, u, payload.Password, &settings.LDAPSettings) + } + + return handler.authenticateInternal(w, u, payload.Password) +} + +func (handler *Handler) authenticateLDAP(w http.ResponseWriter, user *portainer.User, password string, ldapSettings *portainer.LDAPSettings) *httperror.HandlerError { + err := handler.LDAPService.AuthenticateUser(user.Username, password, ldapSettings) + if err != nil { + return handler.authenticateInternal(w, user, password) + } + + err = handler.addUserIntoTeams(user, ldapSettings) + if err != nil { + log.Printf("Warning: unable to automatically add user into teams: %s\n", err.Error()) + } + + return handler.writeToken(w, user) +} + +func (handler *Handler) authenticateInternal(w http.ResponseWriter, user *portainer.User, password string) *httperror.HandlerError { + err := handler.CryptoService.CompareHashAndData(user.Password, password) + if err != nil { + return &httperror.HandlerError{http.StatusUnprocessableEntity, "Invalid credentials", portainer.ErrUnauthorized} + } + + return handler.writeToken(w, user) +} + +func (handler *Handler) authenticateLDAPAndCreateUser(w http.ResponseWriter, username, password string, ldapSettings *portainer.LDAPSettings) *httperror.HandlerError { + err := handler.LDAPService.AuthenticateUser(username, password, ldapSettings) + if err != nil { + return &httperror.HandlerError{http.StatusUnprocessableEntity, "Invalid credentials", err} + } + + user := &portainer.User{ + Username: username, + Role: portainer.StandardUserRole, + } + + err = handler.UserService.CreateUser(user) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist user inside the database", err} + } + + err = handler.addUserIntoTeams(user, ldapSettings) + if err != nil { + log.Printf("Warning: unable to automatically add user into teams: %s\n", err.Error()) + } + + return handler.writeToken(w, user) +} + +func (handler *Handler) writeToken(w http.ResponseWriter, user *portainer.User) *httperror.HandlerError { tokenData := &portainer.TokenData{ - ID: u.ID, - Username: u.Username, - Role: u.Role, + ID: user.ID, + Username: user.Username, + Role: user.Role, } token, err := handler.JWTService.GenerateToken(tokenData) @@ -77,3 +129,59 @@ func (handler *Handler) authenticate(w http.ResponseWriter, r *http.Request) *ht return response.JSON(w, &authenticateResponse{JWT: token}) } + +func (handler *Handler) addUserIntoTeams(user *portainer.User, settings *portainer.LDAPSettings) error { + teams, err := handler.TeamService.Teams() + if err != nil { + return err + } + + userGroups, err := handler.LDAPService.GetUserGroups(user.Username, settings) + if err != nil { + return err + } + + userMemberships, err := handler.TeamMembershipService.TeamMembershipsByUserID(user.ID) + if err != nil { + return err + } + + for _, team := range teams { + if teamExists(team.Name, userGroups) { + + if teamMembershipExists(team.ID, userMemberships) { + continue + } + + membership := &portainer.TeamMembership{ + UserID: user.ID, + TeamID: team.ID, + Role: portainer.TeamMember, + } + + err := handler.TeamMembershipService.CreateTeamMembership(membership) + if err != nil { + return err + } + } + } + return nil +} + +func teamExists(teamName string, ldapGroups []string) bool { + for _, group := range ldapGroups { + if strings.ToLower(group) == strings.ToLower(teamName) { + return true + } + } + return false +} + +func teamMembershipExists(teamID portainer.TeamID, memberships []portainer.TeamMembership) bool { + for _, membership := range memberships { + if membership.TeamID == teamID { + return true + } + } + return false +} diff --git a/api/http/handler/auth/handler.go b/api/http/handler/auth/handler.go index db47b82e2..87be85429 100644 --- a/api/http/handler/auth/handler.go +++ b/api/http/handler/auth/handler.go @@ -20,12 +20,14 @@ const ( // Handler is the HTTP handler used to handle authentication operations. type Handler struct { *mux.Router - authDisabled bool - UserService portainer.UserService - CryptoService portainer.CryptoService - JWTService portainer.JWTService - LDAPService portainer.LDAPService - SettingsService portainer.SettingsService + authDisabled bool + UserService portainer.UserService + CryptoService portainer.CryptoService + JWTService portainer.JWTService + LDAPService portainer.LDAPService + SettingsService portainer.SettingsService + TeamService portainer.TeamService + TeamMembershipService portainer.TeamMembershipService } // NewHandler creates a handler to manage authentication operations. diff --git a/api/http/handler/endpoints/endpoint_create.go b/api/http/handler/endpoints/endpoint_create.go index 7827068cb..a369194ab 100644 --- a/api/http/handler/endpoints/endpoint_create.go +++ b/api/http/handler/endpoints/endpoint_create.go @@ -1,9 +1,10 @@ package endpoints import ( + "log" "net/http" + "runtime" "strconv" - "strings" "github.com/portainer/portainer" "github.com/portainer/portainer/crypto" @@ -56,6 +57,9 @@ func (payload *endpointCreatePayload) Validate(r *http.Request) error { return portainer.Error("Invalid Tags parameter") } payload.Tags = tags + if payload.Tags == nil { + payload.Tags = make([]string, 0) + } useTLS, _ := request.RetrieveBooleanMultiPartFormValue(r, "TLS", true) payload.TLS = useTLS @@ -109,7 +113,7 @@ func (payload *endpointCreatePayload) Validate(r *http.Request) error { } payload.AzureAuthenticationKey = azureAuthenticationKey default: - url, err := request.RetrieveMultiPartFormValue(r, "URL", false) + url, err := request.RetrieveMultiPartFormValue(r, "URL", true) if err != nil { return portainer.Error("Invalid endpoint URL") } @@ -166,7 +170,9 @@ func (handler *Handler) createAzureEndpoint(payload *endpointCreatePayload) (*po return nil, &httperror.HandlerError{http.StatusInternalServerError, "Unable to authenticate against Azure", err} } + endpointID := handler.EndpointService.GetNextIdentifier() endpoint := &portainer.Endpoint{ + ID: portainer.EndpointID(endpointID), Name: payload.Name, URL: payload.URL, Type: portainer.AzureEnvironment, @@ -177,6 +183,8 @@ func (handler *Handler) createAzureEndpoint(payload *endpointCreatePayload) (*po Extensions: []portainer.EndpointExtension{}, AzureCredentials: credentials, Tags: payload.Tags, + Status: portainer.EndpointStatusUp, + Snapshots: []portainer.Snapshot{}, } err = handler.EndpointService.CreateEndpoint(endpoint) @@ -190,7 +198,12 @@ func (handler *Handler) createAzureEndpoint(payload *endpointCreatePayload) (*po func (handler *Handler) createUnsecuredEndpoint(payload *endpointCreatePayload) (*portainer.Endpoint, *httperror.HandlerError) { endpointType := portainer.DockerEnvironment - if !strings.HasPrefix(payload.URL, "unix://") { + if payload.URL == "" { + payload.URL = "unix:///var/run/docker.sock" + if runtime.GOOS == "windows" { + payload.URL = "npipe:////./pipe/docker_engine" + } + } else { agentOnDockerEnvironment, err := client.ExecutePingOperation(payload.URL, nil) if err != nil { return nil, &httperror.HandlerError{http.StatusInternalServerError, "Unable to ping Docker environment", err} @@ -200,7 +213,9 @@ func (handler *Handler) createUnsecuredEndpoint(payload *endpointCreatePayload) } } + endpointID := handler.EndpointService.GetNextIdentifier() endpoint := &portainer.Endpoint{ + ID: portainer.EndpointID(endpointID), Name: payload.Name, URL: payload.URL, Type: endpointType, @@ -213,11 +228,13 @@ func (handler *Handler) createUnsecuredEndpoint(payload *endpointCreatePayload) AuthorizedTeams: []portainer.TeamID{}, Extensions: []portainer.EndpointExtension{}, Tags: payload.Tags, + Status: portainer.EndpointStatusUp, + Snapshots: []portainer.Snapshot{}, } - err := handler.EndpointService.CreateEndpoint(endpoint) + err := handler.snapshotAndPersistEndpoint(endpoint) if err != nil { - return nil, &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist endpoint inside the database", err} + return nil, err } return endpoint, nil @@ -239,7 +256,9 @@ func (handler *Handler) createTLSSecuredEndpoint(payload *endpointCreatePayload) endpointType = portainer.AgentOnDockerEnvironment } + endpointID := handler.EndpointService.GetNextIdentifier() endpoint := &portainer.Endpoint{ + ID: portainer.EndpointID(endpointID), Name: payload.Name, URL: payload.URL, Type: endpointType, @@ -253,34 +272,49 @@ func (handler *Handler) createTLSSecuredEndpoint(payload *endpointCreatePayload) AuthorizedTeams: []portainer.TeamID{}, Extensions: []portainer.EndpointExtension{}, Tags: payload.Tags, - } - - err = handler.EndpointService.CreateEndpoint(endpoint) - if err != nil { - return nil, &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist endpoint inside the database", err} + Status: portainer.EndpointStatusUp, + Snapshots: []portainer.Snapshot{}, } filesystemError := handler.storeTLSFiles(endpoint, payload) if err != nil { - handler.EndpointService.DeleteEndpoint(endpoint.ID) return nil, filesystemError } - err = handler.EndpointService.UpdateEndpoint(endpoint.ID, endpoint) - if err != nil { - return nil, &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist endpoint changes inside the database", err} + endpointCreationError := handler.snapshotAndPersistEndpoint(endpoint) + if endpointCreationError != nil { + return nil, endpointCreationError } return endpoint, nil } +func (handler *Handler) snapshotAndPersistEndpoint(endpoint *portainer.Endpoint) *httperror.HandlerError { + snapshot, err := handler.Snapshotter.CreateSnapshot(endpoint) + endpoint.Status = portainer.EndpointStatusUp + if err != nil { + log.Printf("http error: endpoint snapshot error (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + endpoint.Status = portainer.EndpointStatusDown + } + + if snapshot != nil { + endpoint.Snapshots = []portainer.Snapshot{*snapshot} + } + + err = handler.EndpointService.CreateEndpoint(endpoint) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist endpoint inside the database", err} + } + + return nil +} + func (handler *Handler) storeTLSFiles(endpoint *portainer.Endpoint, payload *endpointCreatePayload) *httperror.HandlerError { folder := strconv.Itoa(int(endpoint.ID)) if !payload.TLSSkipVerify { caCertPath, err := handler.FileService.StoreTLSFileFromBytes(folder, portainer.TLSFileCA, payload.TLSCACertFile) if err != nil { - handler.EndpointService.DeleteEndpoint(endpoint.ID) return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist TLS CA certificate file on disk", err} } endpoint.TLSConfig.TLSCACertPath = caCertPath @@ -289,14 +323,12 @@ func (handler *Handler) storeTLSFiles(endpoint *portainer.Endpoint, payload *end if !payload.TLSSkipClientVerify { certPath, err := handler.FileService.StoreTLSFileFromBytes(folder, portainer.TLSFileCert, payload.TLSCertFile) if err != nil { - handler.EndpointService.DeleteEndpoint(endpoint.ID) return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist TLS certificate file on disk", err} } endpoint.TLSConfig.TLSCertPath = certPath keyPath, err := handler.FileService.StoreTLSFileFromBytes(folder, portainer.TLSFileKey, payload.TLSKeyFile) if err != nil { - handler.EndpointService.DeleteEndpoint(endpoint.ID) return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist TLS key file on disk", err} } endpoint.TLSConfig.TLSKeyPath = keyPath diff --git a/api/http/handler/endpoints/endpoint_inspect.go b/api/http/handler/endpoints/endpoint_inspect.go index 82d2cb7b9..e382b3f16 100644 --- a/api/http/handler/endpoints/endpoint_inspect.go +++ b/api/http/handler/endpoints/endpoint_inspect.go @@ -23,5 +23,12 @@ func (handler *Handler) endpointInspect(w http.ResponseWriter, r *http.Request) return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find an endpoint with the specified identifier inside the database", err} } + err = handler.requestBouncer.EndpointAccess(r, endpoint) + if err != nil { + return &httperror.HandlerError{http.StatusForbidden, "Permission denied to access endpoint", portainer.ErrEndpointAccessDenied} + } + + hideFields(endpoint) + return response.JSON(w, endpoint) } diff --git a/api/http/handler/endpoints/endpoint_snapshot.go b/api/http/handler/endpoints/endpoint_snapshot.go new file mode 100644 index 000000000..51a18293e --- /dev/null +++ b/api/http/handler/endpoints/endpoint_snapshot.go @@ -0,0 +1,42 @@ +package endpoints + +import ( + "log" + "net/http" + + "github.com/portainer/portainer" + httperror "github.com/portainer/portainer/http/error" + "github.com/portainer/portainer/http/response" +) + +// POST request on /api/endpoints/snapshot +func (handler *Handler) endpointSnapshot(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + endpoints, err := handler.EndpointService.Endpoints() + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve endpoints from the database", err} + } + + for _, endpoint := range endpoints { + if endpoint.Type == portainer.AzureEnvironment { + continue + } + + snapshot, err := handler.Snapshotter.CreateSnapshot(&endpoint) + endpoint.Status = portainer.EndpointStatusUp + if err != nil { + log.Printf("http error: endpoint snapshot error (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + endpoint.Status = portainer.EndpointStatusDown + } + + if snapshot != nil { + endpoint.Snapshots = []portainer.Snapshot{*snapshot} + } + + err = handler.EndpointService.UpdateEndpoint(endpoint.ID, &endpoint) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist endpoint changes inside the database", err} + } + } + + return response.Empty(w) +} diff --git a/api/http/handler/endpoints/handler.go b/api/http/handler/endpoints/handler.go index 6a593479c..fc1bc1e6c 100644 --- a/api/http/handler/endpoints/handler.go +++ b/api/http/handler/endpoints/handler.go @@ -25,10 +25,12 @@ func hideFields(endpoint *portainer.Endpoint) { type Handler struct { *mux.Router authorizeEndpointManagement bool + requestBouncer *security.RequestBouncer EndpointService portainer.EndpointService EndpointGroupService portainer.EndpointGroupService FileService portainer.FileService ProxyManager *proxy.Manager + Snapshotter portainer.Snapshotter } // NewHandler creates a handler to manage endpoint operations. @@ -36,14 +38,17 @@ func NewHandler(bouncer *security.RequestBouncer, authorizeEndpointManagement bo h := &Handler{ Router: mux.NewRouter(), authorizeEndpointManagement: authorizeEndpointManagement, + requestBouncer: bouncer, } h.Handle("/endpoints", bouncer.AdministratorAccess(httperror.LoggerHandler(h.endpointCreate))).Methods(http.MethodPost) + h.Handle("/endpoints/snapshot", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.endpointSnapshot))).Methods(http.MethodPost) h.Handle("/endpoints", bouncer.RestrictedAccess(httperror.LoggerHandler(h.endpointList))).Methods(http.MethodGet) h.Handle("/endpoints/{id}", - bouncer.AdministratorAccess(httperror.LoggerHandler(h.endpointInspect))).Methods(http.MethodGet) + bouncer.RestrictedAccess(httperror.LoggerHandler(h.endpointInspect))).Methods(http.MethodGet) h.Handle("/endpoints/{id}", bouncer.AdministratorAccess(httperror.LoggerHandler(h.endpointUpdate))).Methods(http.MethodPut) h.Handle("/endpoints/{id}/access", diff --git a/api/http/handler/settings/handler.go b/api/http/handler/settings/handler.go index 0850ec83e..58c020877 100644 --- a/api/http/handler/settings/handler.go +++ b/api/http/handler/settings/handler.go @@ -15,6 +15,7 @@ type Handler struct { SettingsService portainer.SettingsService LDAPService portainer.LDAPService FileService portainer.FileService + JobScheduler portainer.JobScheduler } // NewHandler creates a handler to manage settings operations. diff --git a/api/http/handler/settings/settings_public.go b/api/http/handler/settings/settings_public.go index ef76231f0..c2ee2a616 100644 --- a/api/http/handler/settings/settings_public.go +++ b/api/http/handler/settings/settings_public.go @@ -10,7 +10,6 @@ import ( type publicSettingsResponse struct { LogoURL string `json:"LogoURL"` - DisplayExternalContributors bool `json:"DisplayExternalContributors"` AuthenticationMethod portainer.AuthenticationMethod `json:"AuthenticationMethod"` AllowBindMountsForRegularUsers bool `json:"AllowBindMountsForRegularUsers"` AllowPrivilegedModeForRegularUsers bool `json:"AllowPrivilegedModeForRegularUsers"` @@ -25,7 +24,6 @@ func (handler *Handler) settingsPublic(w http.ResponseWriter, r *http.Request) * publicSettings := &publicSettingsResponse{ LogoURL: settings.LogoURL, - DisplayExternalContributors: settings.DisplayExternalContributors, AuthenticationMethod: settings.AuthenticationMethod, AllowBindMountsForRegularUsers: settings.AllowBindMountsForRegularUsers, AllowPrivilegedModeForRegularUsers: settings.AllowPrivilegedModeForRegularUsers, diff --git a/api/http/handler/settings/settings_update.go b/api/http/handler/settings/settings_update.go index 1e854ec7f..827818fa7 100644 --- a/api/http/handler/settings/settings_update.go +++ b/api/http/handler/settings/settings_update.go @@ -12,27 +12,20 @@ import ( ) type settingsUpdatePayload struct { - TemplatesURL string - LogoURL string + LogoURL *string BlackListedLabels []portainer.Pair - DisplayExternalContributors bool - AuthenticationMethod int - LDAPSettings portainer.LDAPSettings - AllowBindMountsForRegularUsers bool - AllowPrivilegedModeForRegularUsers bool + AuthenticationMethod *int + LDAPSettings *portainer.LDAPSettings + AllowBindMountsForRegularUsers *bool + AllowPrivilegedModeForRegularUsers *bool + SnapshotInterval *string } func (payload *settingsUpdatePayload) Validate(r *http.Request) error { - if govalidator.IsNull(payload.TemplatesURL) || !govalidator.IsURL(payload.TemplatesURL) { - return portainer.Error("Invalid templates URL. Must correspond to a valid URL format") - } - if payload.AuthenticationMethod == 0 { - return portainer.Error("Invalid authentication method") - } - if payload.AuthenticationMethod != 1 && payload.AuthenticationMethod != 2 { + if *payload.AuthenticationMethod != 1 && *payload.AuthenticationMethod != 2 { return portainer.Error("Invalid authentication method value. Value must be one of: 1 (internal) or 2 (LDAP/AD)") } - if !govalidator.IsNull(payload.LogoURL) && !govalidator.IsURL(payload.LogoURL) { + if payload.LogoURL != nil && *payload.LogoURL != "" && !govalidator.IsURL(*payload.LogoURL) { return portainer.Error("Invalid logo URL. Must correspond to a valid URL format") } return nil @@ -46,17 +39,40 @@ func (handler *Handler) settingsUpdate(w http.ResponseWriter, r *http.Request) * return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } - settings := &portainer.Settings{ - TemplatesURL: payload.TemplatesURL, - LogoURL: payload.LogoURL, - BlackListedLabels: payload.BlackListedLabels, - DisplayExternalContributors: payload.DisplayExternalContributors, - LDAPSettings: payload.LDAPSettings, - AllowBindMountsForRegularUsers: payload.AllowBindMountsForRegularUsers, - AllowPrivilegedModeForRegularUsers: payload.AllowPrivilegedModeForRegularUsers, + settings, err := handler.SettingsService.Settings() + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve the settings from the database", err} + } + + if payload.AuthenticationMethod != nil { + settings.AuthenticationMethod = portainer.AuthenticationMethod(*payload.AuthenticationMethod) + } + + if payload.LogoURL != nil { + settings.LogoURL = *payload.LogoURL + } + + if payload.BlackListedLabels != nil { + settings.BlackListedLabels = payload.BlackListedLabels + } + + if payload.LDAPSettings != nil { + settings.LDAPSettings = *payload.LDAPSettings + } + + if payload.AllowBindMountsForRegularUsers != nil { + settings.AllowBindMountsForRegularUsers = *payload.AllowBindMountsForRegularUsers + } + + if payload.AllowPrivilegedModeForRegularUsers != nil { + settings.AllowPrivilegedModeForRegularUsers = *payload.AllowPrivilegedModeForRegularUsers + } + + if payload.SnapshotInterval != nil && *payload.SnapshotInterval != settings.SnapshotInterval { + settings.SnapshotInterval = *payload.SnapshotInterval + handler.JobScheduler.UpdateSnapshotJob(settings.SnapshotInterval) } - settings.AuthenticationMethod = portainer.AuthenticationMethod(payload.AuthenticationMethod) tlsError := handler.updateTLS(settings) if tlsError != nil { return tlsError diff --git a/api/http/handler/stacks/create_compose_stack.go b/api/http/handler/stacks/create_compose_stack.go index 748b3c155..a343c96fa 100644 --- a/api/http/handler/stacks/create_compose_stack.go +++ b/api/http/handler/stacks/create_compose_stack.go @@ -17,6 +17,7 @@ import ( type composeStackFromFileContentPayload struct { Name string StackFileContent string + Env []portainer.Pair } func (payload *composeStackFromFileContentPayload) Validate(r *http.Request) error { @@ -54,6 +55,7 @@ func (handler *Handler) createComposeStackFromFileContent(w http.ResponseWriter, Type: portainer.DockerComposeStack, EndpointID: endpoint.ID, EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, } stackFolder := strconv.Itoa(int(stack.ID)) @@ -88,10 +90,12 @@ func (handler *Handler) createComposeStackFromFileContent(w http.ResponseWriter, type composeStackFromGitRepositoryPayload struct { Name string RepositoryURL string + RepositoryReferenceName string RepositoryAuthentication bool RepositoryUsername string RepositoryPassword string ComposeFilePathInRepository string + Env []portainer.Pair } func (payload *composeStackFromGitRepositoryPayload) Validate(r *http.Request) error { @@ -135,6 +139,7 @@ func (handler *Handler) createComposeStackFromGitRepository(w http.ResponseWrite Type: portainer.DockerComposeStack, EndpointID: endpoint.ID, EntryPoint: payload.ComposeFilePathInRepository, + Env: payload.Env, } projectPath := handler.FileService.GetStackProjectPath(strconv.Itoa(int(stack.ID))) @@ -142,19 +147,21 @@ func (handler *Handler) createComposeStackFromGitRepository(w http.ResponseWrite gitCloneParams := &cloneRepositoryParameters{ url: payload.RepositoryURL, + referenceName: payload.RepositoryReferenceName, path: projectPath, authentication: payload.RepositoryAuthentication, username: payload.RepositoryUsername, password: payload.RepositoryPassword, } + + doCleanUp := true + defer handler.cleanUp(stack, &doCleanUp) + err = handler.cloneGitRepository(gitCloneParams) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to clone git repository", err} } - doCleanUp := true - defer handler.cleanUp(stack, &doCleanUp) - config, configErr := handler.createComposeDeployConfig(r, stack, endpoint) if configErr != nil { return configErr @@ -177,6 +184,7 @@ func (handler *Handler) createComposeStackFromGitRepository(w http.ResponseWrite type composeStackFromFileUploadPayload struct { Name string StackFileContent []byte + Env []portainer.Pair } func (payload *composeStackFromFileUploadPayload) Validate(r *http.Request) error { @@ -192,6 +200,12 @@ func (payload *composeStackFromFileUploadPayload) Validate(r *http.Request) erro } payload.StackFileContent = composeFileContent + var env []portainer.Pair + err = request.RetrieveMultiPartFormJSONValue(r, "Env", &env, true) + if err != nil { + return portainer.Error("Invalid Env parameter") + } + payload.Env = env return nil } @@ -220,6 +234,7 @@ func (handler *Handler) createComposeStackFromFileUpload(w http.ResponseWriter, Type: portainer.DockerComposeStack, EndpointID: endpoint.ID, EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, } stackFolder := strconv.Itoa(int(stack.ID)) diff --git a/api/http/handler/stacks/create_swarm_stack.go b/api/http/handler/stacks/create_swarm_stack.go index 05084a99d..87c94e6ef 100644 --- a/api/http/handler/stacks/create_swarm_stack.go +++ b/api/http/handler/stacks/create_swarm_stack.go @@ -97,6 +97,7 @@ type swarmStackFromGitRepositoryPayload struct { SwarmID string Env []portainer.Pair RepositoryURL string + RepositoryReferenceName string RepositoryAuthentication bool RepositoryUsername string RepositoryPassword string @@ -156,19 +157,21 @@ func (handler *Handler) createSwarmStackFromGitRepository(w http.ResponseWriter, gitCloneParams := &cloneRepositoryParameters{ url: payload.RepositoryURL, + referenceName: payload.RepositoryReferenceName, path: projectPath, authentication: payload.RepositoryAuthentication, username: payload.RepositoryUsername, password: payload.RepositoryPassword, } + + doCleanUp := true + defer handler.cleanUp(stack, &doCleanUp) + err = handler.cloneGitRepository(gitCloneParams) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to clone git repository", err} } - doCleanUp := true - defer handler.cleanUp(stack, &doCleanUp) - config, configErr := handler.createSwarmDeployConfig(r, stack, endpoint, false) if configErr != nil { return configErr diff --git a/api/http/handler/stacks/git.go b/api/http/handler/stacks/git.go index 1ac62a443..b3e2448f7 100644 --- a/api/http/handler/stacks/git.go +++ b/api/http/handler/stacks/git.go @@ -2,6 +2,7 @@ package stacks type cloneRepositoryParameters struct { url string + referenceName string path string authentication bool username string @@ -10,7 +11,7 @@ type cloneRepositoryParameters struct { func (handler *Handler) cloneGitRepository(parameters *cloneRepositoryParameters) error { if parameters.authentication { - return handler.GitService.ClonePrivateRepositoryWithBasicAuth(parameters.url, parameters.path, parameters.username, parameters.password) + return handler.GitService.ClonePrivateRepositoryWithBasicAuth(parameters.url, parameters.referenceName, parameters.path, parameters.username, parameters.password) } - return handler.GitService.ClonePublicRepository(parameters.url, parameters.path) + return handler.GitService.ClonePublicRepository(parameters.url, parameters.referenceName, parameters.path) } diff --git a/api/http/handler/stacks/stack_file.go b/api/http/handler/stacks/stack_file.go index a0b644ba0..f8d25af8d 100644 --- a/api/http/handler/stacks/stack_file.go +++ b/api/http/handler/stacks/stack_file.go @@ -54,5 +54,5 @@ func (handler *Handler) stackFile(w http.ResponseWriter, r *http.Request) *httpe return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve Compose file from disk", err} } - return response.JSON(w, &stackFileResponse{StackFileContent: stackFileContent}) + return response.JSON(w, &stackFileResponse{StackFileContent: string(stackFileContent)}) } diff --git a/api/http/handler/stacks/stack_update.go b/api/http/handler/stacks/stack_update.go index 6ffef9112..de1c560ae 100644 --- a/api/http/handler/stacks/stack_update.go +++ b/api/http/handler/stacks/stack_update.go @@ -15,6 +15,7 @@ import ( type updateComposeStackPayload struct { StackFileContent string + Env []portainer.Pair } func (payload *updateComposeStackPayload) Validate(r *http.Request) error { @@ -112,6 +113,8 @@ func (handler *Handler) updateComposeStack(r *http.Request, stack *portainer.Sta return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } + stack.Env = payload.Env + stackFolder := strconv.Itoa(int(stack.ID)) _, err = handler.FileService.StoreStackFileFromBytes(stackFolder, stack.EntryPoint, []byte(payload.StackFileContent)) if err != nil { diff --git a/api/http/handler/tags/tag_delete.go b/api/http/handler/tags/tag_delete.go index b1b4fe867..eed7f6410 100644 --- a/api/http/handler/tags/tag_delete.go +++ b/api/http/handler/tags/tag_delete.go @@ -9,7 +9,7 @@ import ( "github.com/portainer/portainer/http/response" ) -// DELETE request on /api/tags/:name +// DELETE request on /api/tags/:id func (handler *Handler) tagDelete(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { id, err := request.RetrieveNumericRouteVariableValue(r, "id") if err != nil { diff --git a/api/http/handler/templates/handler.go b/api/http/handler/templates/handler.go index f4d0c6fcf..db65830c2 100644 --- a/api/http/handler/templates/handler.go +++ b/api/http/handler/templates/handler.go @@ -9,14 +9,10 @@ import ( "github.com/portainer/portainer/http/security" ) -const ( - containerTemplatesURLLinuxServerIo = "https://tools.linuxserver.io/portainer.json" -) - // Handler represents an HTTP API handler for managing templates. type Handler struct { *mux.Router - SettingsService portainer.SettingsService + TemplateService portainer.TemplateService } // NewHandler returns a new instance of Handler. @@ -25,6 +21,14 @@ func NewHandler(bouncer *security.RequestBouncer) *Handler { Router: mux.NewRouter(), } h.Handle("/templates", - bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.templateList))).Methods(http.MethodGet) + bouncer.RestrictedAccess(httperror.LoggerHandler(h.templateList))).Methods(http.MethodGet) + h.Handle("/templates", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.templateCreate))).Methods(http.MethodPost) + h.Handle("/templates/{id}", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.templateInspect))).Methods(http.MethodGet) + h.Handle("/templates/{id}", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.templateUpdate))).Methods(http.MethodPut) + h.Handle("/templates/{id}", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.templateDelete))).Methods(http.MethodDelete) return h } diff --git a/api/http/handler/templates/template_create.go b/api/http/handler/templates/template_create.go new file mode 100644 index 000000000..f27cd494a --- /dev/null +++ b/api/http/handler/templates/template_create.go @@ -0,0 +1,122 @@ +package templates + +import ( + "net/http" + + "github.com/asaskevich/govalidator" + "github.com/portainer/portainer" + "github.com/portainer/portainer/filesystem" + httperror "github.com/portainer/portainer/http/error" + "github.com/portainer/portainer/http/request" + "github.com/portainer/portainer/http/response" +) + +type templateCreatePayload struct { + // Mandatory + Type int + Title string + Description string + AdministratorOnly bool + + // Opt stack/container + Name string + Logo string + Note string + Platform string + Categories []string + Env []portainer.TemplateEnv + + // Mandatory container + Image string + + // Mandatory stack + Repository portainer.TemplateRepository + + // Opt container + Registry string + Command string + Network string + Volumes []portainer.TemplateVolume + Ports []string + Labels []portainer.Pair + Privileged bool + Interactive bool + RestartPolicy string + Hostname string +} + +func (payload *templateCreatePayload) Validate(r *http.Request) error { + if payload.Type == 0 || (payload.Type != 1 && payload.Type != 2 && payload.Type != 3) { + return portainer.Error("Invalid template type. Valid values are: 1 (container), 2 (Swarm stack template) or 3 (Compose stack template).") + } + if govalidator.IsNull(payload.Title) { + return portainer.Error("Invalid template title") + } + if govalidator.IsNull(payload.Description) { + return portainer.Error("Invalid template description") + } + + if payload.Type == 1 { + if govalidator.IsNull(payload.Image) { + return portainer.Error("Invalid template image") + } + } + + if payload.Type == 2 || payload.Type == 3 { + if govalidator.IsNull(payload.Repository.URL) { + return portainer.Error("Invalid template repository URL") + } + if govalidator.IsNull(payload.Repository.StackFile) { + payload.Repository.StackFile = filesystem.ComposeFileDefaultName + } + } + + return nil +} + +// POST request on /api/templates +func (handler *Handler) templateCreate(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + var payload templateCreatePayload + err := request.DecodeAndValidateJSONPayload(r, &payload) + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} + } + + template := &portainer.Template{ + Type: portainer.TemplateType(payload.Type), + Title: payload.Title, + Description: payload.Description, + AdministratorOnly: payload.AdministratorOnly, + Name: payload.Name, + Logo: payload.Logo, + Note: payload.Note, + Platform: payload.Platform, + Categories: payload.Categories, + Env: payload.Env, + } + + if template.Type == portainer.ContainerTemplate { + template.Image = payload.Image + template.Registry = payload.Registry + template.Command = payload.Command + template.Network = payload.Network + template.Volumes = payload.Volumes + template.Ports = payload.Ports + template.Labels = payload.Labels + template.Privileged = payload.Privileged + template.Interactive = payload.Interactive + template.RestartPolicy = payload.RestartPolicy + template.Hostname = payload.Hostname + } + + if template.Type == portainer.SwarmStackTemplate || template.Type == portainer.ComposeStackTemplate { + template.Repository = payload.Repository + } + + err = handler.TemplateService.CreateTemplate(template) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the template inside the database", err} + } + + return response.JSON(w, template) +} diff --git a/api/http/handler/templates/template_delete.go b/api/http/handler/templates/template_delete.go new file mode 100644 index 000000000..c23c2d237 --- /dev/null +++ b/api/http/handler/templates/template_delete.go @@ -0,0 +1,25 @@ +package templates + +import ( + "net/http" + + "github.com/portainer/portainer" + httperror "github.com/portainer/portainer/http/error" + "github.com/portainer/portainer/http/request" + "github.com/portainer/portainer/http/response" +) + +// DELETE request on /api/templates/:id +func (handler *Handler) templateDelete(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + id, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid template identifier route variable", err} + } + + err = handler.TemplateService.DeleteTemplate(portainer.TemplateID(id)) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove the template from the database", err} + } + + return response.Empty(w) +} diff --git a/api/http/handler/templates/template_inspect.go b/api/http/handler/templates/template_inspect.go new file mode 100644 index 000000000..6b1b4c6a1 --- /dev/null +++ b/api/http/handler/templates/template_inspect.go @@ -0,0 +1,27 @@ +package templates + +import ( + "net/http" + + "github.com/portainer/portainer" + httperror "github.com/portainer/portainer/http/error" + "github.com/portainer/portainer/http/request" + "github.com/portainer/portainer/http/response" +) + +// GET request on /api/templates/:id +func (handler *Handler) templateInspect(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + templateID, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid template identifier route variable", err} + } + + template, err := handler.TemplateService.Template(portainer.TemplateID(templateID)) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find a template with the specified identifier inside the database", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a template with the specified identifier inside the database", err} + } + + return response.JSON(w, template) +} diff --git a/api/http/handler/templates/template_list.go b/api/http/handler/templates/template_list.go index 188951201..7c31e1c10 100644 --- a/api/http/handler/templates/template_list.go +++ b/api/http/handler/templates/template_list.go @@ -1,50 +1,26 @@ package templates import ( - "io/ioutil" "net/http" httperror "github.com/portainer/portainer/http/error" - "github.com/portainer/portainer/http/request" "github.com/portainer/portainer/http/response" + "github.com/portainer/portainer/http/security" ) -// GET request on /api/templates?key= +// GET request on /api/templates func (handler *Handler) templateList(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { - key, err := request.RetrieveQueryParameter(r, "key", false) + templates, err := handler.TemplateService.Templates() if err != nil { - return &httperror.HandlerError{http.StatusBadRequest, "Invalid query parameter: key", err} + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve templates from the database", err} } - templatesURL, templateErr := handler.retrieveTemplateURLFromKey(key) - if templateErr != nil { - return templateErr - } - - resp, err := http.Get(templatesURL) + securityContext, err := security.RetrieveRestrictedRequestContext(r) if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve templates via the network", err} - } - defer resp.Body.Close() - - body, err := ioutil.ReadAll(resp.Body) - if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Unable to read template response", err} + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve info from request context", err} } - return response.Bytes(w, body, "application/json") -} - -func (handler *Handler) retrieveTemplateURLFromKey(key string) (string, *httperror.HandlerError) { - switch key { - case "containers": - settings, err := handler.SettingsService.Settings() - if err != nil { - return "", &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve settings from the database", err} - } - return settings.TemplatesURL, nil - case "linuxserver.io": - return containerTemplatesURLLinuxServerIo, nil - } - return "", &httperror.HandlerError{http.StatusBadRequest, "Invalid value for query parameter: key. Value must be one of: containers or linuxserver.io", request.ErrInvalidQueryParameter} + filteredTemplates := security.FilterTemplates(templates, securityContext) + + return response.JSON(w, filteredTemplates) } diff --git a/api/http/handler/templates/template_update.go b/api/http/handler/templates/template_update.go new file mode 100644 index 000000000..2eff9701f --- /dev/null +++ b/api/http/handler/templates/template_update.go @@ -0,0 +1,164 @@ +package templates + +import ( + "net/http" + + "github.com/portainer/portainer" + httperror "github.com/portainer/portainer/http/error" + "github.com/portainer/portainer/http/request" + "github.com/portainer/portainer/http/response" +) + +type templateUpdatePayload struct { + Title *string + Description *string + AdministratorOnly *bool + Name *string + Logo *string + Note *string + Platform *string + Categories []string + Env []portainer.TemplateEnv + Image *string + Registry *string + Repository portainer.TemplateRepository + Command *string + Network *string + Volumes []portainer.TemplateVolume + Ports []string + Labels []portainer.Pair + Privileged *bool + Interactive *bool + RestartPolicy *string + Hostname *string +} + +func (payload *templateUpdatePayload) Validate(r *http.Request) error { + return nil +} + +// PUT request on /api/templates/:id +func (handler *Handler) templateUpdate(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + templateID, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid template identifier route variable", err} + } + + template, err := handler.TemplateService.Template(portainer.TemplateID(templateID)) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find a template with the specified identifier inside the database", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a template with the specified identifier inside the database", err} + } + + var payload templateUpdatePayload + err = request.DecodeAndValidateJSONPayload(r, &payload) + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} + } + + updateTemplate(template, &payload) + + err = handler.TemplateService.UpdateTemplate(template.ID, template) + if err != nil { + return &httperror.HandlerError{http.StatusNotFound, "Unable to persist template changes inside the database", err} + } + + return response.JSON(w, template) +} + +func updateContainerProperties(template *portainer.Template, payload *templateUpdatePayload) { + if payload.Image != nil { + template.Image = *payload.Image + } + + if payload.Registry != nil { + template.Registry = *payload.Registry + } + + if payload.Command != nil { + template.Command = *payload.Command + } + + if payload.Network != nil { + template.Network = *payload.Network + } + + if payload.Volumes != nil { + template.Volumes = payload.Volumes + } + + if payload.Ports != nil { + template.Ports = payload.Ports + } + + if payload.Labels != nil { + template.Labels = payload.Labels + } + + if payload.Privileged != nil { + template.Privileged = *payload.Privileged + } + + if payload.Interactive != nil { + template.Interactive = *payload.Interactive + } + + if payload.RestartPolicy != nil { + template.RestartPolicy = *payload.RestartPolicy + } + + if payload.Hostname != nil { + template.Hostname = *payload.Hostname + } +} + +func updateStackProperties(template *portainer.Template, payload *templateUpdatePayload) { + if payload.Repository.URL != "" && payload.Repository.StackFile != "" { + template.Repository = payload.Repository + } +} + +func updateTemplate(template *portainer.Template, payload *templateUpdatePayload) { + if payload.Title != nil { + template.Title = *payload.Title + } + + if payload.Description != nil { + template.Description = *payload.Description + } + + if payload.Name != nil { + template.Name = *payload.Name + } + + if payload.Logo != nil { + template.Logo = *payload.Logo + } + + if payload.Note != nil { + template.Note = *payload.Note + } + + if payload.Platform != nil { + template.Platform = *payload.Platform + } + + if payload.Categories != nil { + template.Categories = payload.Categories + } + + if payload.Env != nil { + template.Env = payload.Env + } + + if payload.AdministratorOnly != nil { + template.AdministratorOnly = *payload.AdministratorOnly + } + + if template.Type == portainer.ContainerTemplate { + updateContainerProperties(template, payload) + } else if template.Type == portainer.SwarmStackTemplate || template.Type == portainer.ComposeStackTemplate { + updateStackProperties(template, payload) + } +} diff --git a/api/http/handler/users/user_delete.go b/api/http/handler/users/user_delete.go index c183df7a7..90a5b52cc 100644 --- a/api/http/handler/users/user_delete.go +++ b/api/http/handler/users/user_delete.go @@ -26,19 +26,47 @@ func (handler *Handler) userDelete(w http.ResponseWriter, r *http.Request) *http return &httperror.HandlerError{http.StatusForbidden, "Cannot remove your own user account. Contact another administrator", portainer.ErrAdminCannotRemoveSelf} } - _, err = handler.UserService.User(portainer.UserID(userID)) + user, err := handler.UserService.User(portainer.UserID(userID)) if err == portainer.ErrObjectNotFound { return &httperror.HandlerError{http.StatusNotFound, "Unable to find a user with the specified identifier inside the database", err} } else if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a user with the specified identifier inside the database", err} } - err = handler.UserService.DeleteUser(portainer.UserID(userID)) + if user.Role == portainer.AdministratorRole { + return handler.deleteAdminUser(w, user) + } + + return handler.deleteUser(w, user) +} + +func (handler *Handler) deleteAdminUser(w http.ResponseWriter, user *portainer.User) *httperror.HandlerError { + users, err := handler.UserService.Users() + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve users from the database", err} + } + + localAdminCount := 0 + for _, u := range users { + if u.Role == portainer.AdministratorRole && u.Password != "" { + localAdminCount++ + } + } + + if localAdminCount < 2 { + return &httperror.HandlerError{http.StatusInternalServerError, "Cannot remove local administrator user", portainer.ErrCannotRemoveLastLocalAdmin} + } + + return handler.deleteUser(w, user) +} + +func (handler *Handler) deleteUser(w http.ResponseWriter, user *portainer.User) *httperror.HandlerError { + err := handler.UserService.DeleteUser(portainer.UserID(user.ID)) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove user from the database", err} } - err = handler.TeamMembershipService.DeleteTeamMembershipByUserID(portainer.UserID(userID)) + err = handler.TeamMembershipService.DeleteTeamMembershipByUserID(portainer.UserID(user.ID)) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove user memberships from the database", err} } diff --git a/api/http/handler/websocket/websocket_dial.go b/api/http/handler/websocket/websocket_dial.go new file mode 100644 index 000000000..d5c085787 --- /dev/null +++ b/api/http/handler/websocket/websocket_dial.go @@ -0,0 +1,11 @@ +// +build !windows + +package websocket + +import ( + "net" +) + +func createDial(scheme, host string) (net.Conn, error) { + return net.Dial(scheme, host) +} diff --git a/api/http/handler/websocket/websocket_dial_windows.go b/api/http/handler/websocket/websocket_dial_windows.go new file mode 100644 index 000000000..49a9afd28 --- /dev/null +++ b/api/http/handler/websocket/websocket_dial_windows.go @@ -0,0 +1,16 @@ +// +build windows + +package websocket + +import ( + "net" + + "github.com/Microsoft/go-winio" +) + +func createDial(scheme, host string) (net.Conn, error) { + if scheme == "npipe" { + return winio.DialPipe(host, nil) + } + return net.Dial(scheme, host) +} diff --git a/api/http/handler/websocket/websocket_exec.go b/api/http/handler/websocket/websocket_exec.go index 6e46084a6..80c62b9d9 100644 --- a/api/http/handler/websocket/websocket_exec.go +++ b/api/http/handler/websocket/websocket_exec.go @@ -80,7 +80,7 @@ func (handler *Handler) websocketExec(w http.ResponseWriter, r *http.Request) *h func (handler *Handler) handleRequest(w http.ResponseWriter, r *http.Request, params *webSocketExecRequestParams) error { r.Header.Del("Origin") - if params.nodeName != "" { + if params.nodeName != "" || params.endpoint.Type == portainer.AgentOnDockerEnvironment { return handler.proxyWebsocketRequest(w, r, params) } @@ -127,7 +127,7 @@ func (handler *Handler) proxyWebsocketRequest(w http.ResponseWriter, r *http.Req } func hijackExecStartOperation(websocketConn *websocket.Conn, endpoint *portainer.Endpoint, execID string) error { - dial, err := createDial(endpoint) + dial, err := initDial(endpoint) if err != nil { return err } @@ -158,16 +158,15 @@ func hijackExecStartOperation(websocketConn *websocket.Conn, endpoint *portainer return nil } -func createDial(endpoint *portainer.Endpoint) (net.Conn, error) { +func initDial(endpoint *portainer.Endpoint) (net.Conn, error) { url, err := url.Parse(endpoint.URL) if err != nil { return nil, err } - var host string - if url.Scheme == "tcp" { - host = url.Host - } else if url.Scheme == "unix" { + host := url.Host + + if url.Scheme == "unix" || url.Scheme == "npipe" { host = url.Path } @@ -176,10 +175,11 @@ func createDial(endpoint *portainer.Endpoint) (net.Conn, error) { if err != nil { return nil, err } + return tls.Dial(url.Scheme, host, tlsConfig) } - return net.Dial(url.Scheme, host) + return createDial(url.Scheme, host) } func createExecStartRequest(execID string) (*http.Request, error) { diff --git a/api/http/proxy/docker_transport.go b/api/http/proxy/docker_transport.go index 9effb54d8..37e46c2dd 100644 --- a/api/http/proxy/docker_transport.go +++ b/api/http/proxy/docker_transport.go @@ -248,7 +248,7 @@ func (p *proxyTransport) proxyNodeRequest(request *http.Request) (*http.Response func (p *proxyTransport) proxySwarmRequest(request *http.Request) (*http.Response, error) { switch requestPath := request.URL.Path; requestPath { case "/swarm": - return p.executeDockerRequest(request) + return p.rewriteOperation(request, swarmInspectOperation) default: // assume /swarm/{action} return p.administratorOperation(request) diff --git a/api/http/proxy/factory.go b/api/http/proxy/factory.go index f3c43510f..73593f836 100644 --- a/api/http/proxy/factory.go +++ b/api/http/proxy/factory.go @@ -58,21 +58,6 @@ func (factory *proxyFactory) newDockerHTTPProxy(u *url.URL, enableSignature bool return factory.createDockerReverseProxy(u, enableSignature) } -func (factory *proxyFactory) newDockerSocketProxy(path string) http.Handler { - proxy := &socketProxy{} - transport := &proxyTransport{ - enableSignature: false, - ResourceControlService: factory.ResourceControlService, - TeamMembershipService: factory.TeamMembershipService, - SettingsService: factory.SettingsService, - RegistryService: factory.RegistryService, - DockerHubService: factory.DockerHubService, - dockerTransport: newSocketTransport(path), - } - proxy.Transport = transport - return proxy -} - func (factory *proxyFactory) createDockerReverseProxy(u *url.URL, enableSignature bool) *httputil.ReverseProxy { proxy := newSingleHostReverseProxyWithHostHeader(u) transport := &proxyTransport{ diff --git a/api/http/proxy/factory_local.go b/api/http/proxy/factory_local.go new file mode 100644 index 000000000..da154e03c --- /dev/null +++ b/api/http/proxy/factory_local.go @@ -0,0 +1,22 @@ +// +build !windows + +package proxy + +import ( + "net/http" +) + +func (factory *proxyFactory) newLocalProxy(path string) http.Handler { + proxy := &localProxy{} + transport := &proxyTransport{ + enableSignature: false, + ResourceControlService: factory.ResourceControlService, + TeamMembershipService: factory.TeamMembershipService, + SettingsService: factory.SettingsService, + RegistryService: factory.RegistryService, + DockerHubService: factory.DockerHubService, + dockerTransport: newSocketTransport(path), + } + proxy.Transport = transport + return proxy +} diff --git a/api/http/proxy/factory_local_windows.go b/api/http/proxy/factory_local_windows.go new file mode 100644 index 000000000..5e98e47ac --- /dev/null +++ b/api/http/proxy/factory_local_windows.go @@ -0,0 +1,33 @@ +// +build windows + +package proxy + +import ( + "net" + "net/http" + + "github.com/Microsoft/go-winio" +) + +func (factory *proxyFactory) newLocalProxy(path string) http.Handler { + proxy := &localProxy{} + transport := &proxyTransport{ + enableSignature: false, + ResourceControlService: factory.ResourceControlService, + TeamMembershipService: factory.TeamMembershipService, + SettingsService: factory.SettingsService, + RegistryService: factory.RegistryService, + DockerHubService: factory.DockerHubService, + dockerTransport: newNamedPipeTransport(path), + } + proxy.Transport = transport + return proxy +} + +func newNamedPipeTransport(namedPipePath string) *http.Transport { + return &http.Transport{ + Dial: func(proto, addr string) (conn net.Conn, err error) { + return winio.DialPipe(namedPipePath, nil) + }, + } +} diff --git a/api/http/proxy/socket.go b/api/http/proxy/local.go similarity index 81% rename from api/http/proxy/socket.go rename to api/http/proxy/local.go index 58ccdec27..8a7f5842d 100644 --- a/api/http/proxy/socket.go +++ b/api/http/proxy/local.go @@ -1,6 +1,5 @@ package proxy -// unixSocketHandler represents a handler to proxy HTTP requests via a unix:// socket import ( "io" "log" @@ -9,11 +8,11 @@ import ( httperror "github.com/portainer/portainer/http/error" ) -type socketProxy struct { +type localProxy struct { Transport *proxyTransport } -func (proxy *socketProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { +func (proxy *localProxy) ServeHTTP(w http.ResponseWriter, r *http.Request) { // Force URL/domain to http/unixsocket to be able to // use http.Transport RoundTrip to do the requests via the socket r.URL.Scheme = "http" diff --git a/api/http/proxy/manager.go b/api/http/proxy/manager.go index 88acdf515..eb60a5dc0 100644 --- a/api/http/proxy/manager.go +++ b/api/http/proxy/manager.go @@ -51,8 +51,7 @@ func (manager *Manager) createDockerProxy(endpointURL *url.URL, tlsConfig *porta } return manager.proxyFactory.newDockerHTTPProxy(endpointURL, false), nil } - // Assume unix:// scheme - return manager.proxyFactory.newDockerSocketProxy(endpointURL.Path), nil + return manager.proxyFactory.newLocalProxy(endpointURL.Path), nil } func (manager *Manager) createProxy(endpoint *portainer.Endpoint) (http.Handler, error) { diff --git a/api/http/proxy/swarm.go b/api/http/proxy/swarm.go new file mode 100644 index 000000000..0048b3a38 --- /dev/null +++ b/api/http/proxy/swarm.go @@ -0,0 +1,23 @@ +package proxy + +import ( + "net/http" +) + +// swarmInspectOperation extracts the response as a JSON object and rewrites the response based +// on the current user role. Sensitive fields are deleted from the response for non-administrator users. +func swarmInspectOperation(response *http.Response, executor *operationExecutor) error { + // SwarmInspect response is a JSON object + // https://docs.docker.com/engine/api/v1.30/#operation/SwarmInspect + responseObject, err := getResponseAsJSONOBject(response) + if err != nil { + return err + } + + if !executor.operationContext.isAdmin { + delete(responseObject, "JoinTokens") + delete(responseObject, "TLSInfo") + } + + return rewriteResponse(response, responseObject, http.StatusOK) +} diff --git a/api/http/request/request.go b/api/http/request/request.go index 16ba4590b..ee56b0d05 100644 --- a/api/http/request/request.go +++ b/api/http/request/request.go @@ -133,6 +133,9 @@ func RetrieveNumericQueryParameter(request *http.Request, name string, optional if err != nil { return 0, err } + if queryParameter == "" && optional { + return 0, nil + } return strconv.Atoi(queryParameter) } diff --git a/api/http/response/response.go b/api/http/response/response.go index 1334d4d7e..2451abd24 100644 --- a/api/http/response/response.go +++ b/api/http/response/response.go @@ -23,10 +23,3 @@ func Empty(rw http.ResponseWriter) *httperror.HandlerError { rw.WriteHeader(http.StatusNoContent) return nil } - -// Bytes write data into rw. It also allows to set the Content-Type header. -func Bytes(rw http.ResponseWriter, data []byte, contentType string) *httperror.HandlerError { - rw.Header().Set("Content-Type", contentType) - rw.Write(data) - return nil -} diff --git a/api/http/security/filter.go b/api/http/security/filter.go index 0e00ab568..878a66689 100644 --- a/api/http/security/filter.go +++ b/api/http/security/filter.go @@ -77,6 +77,24 @@ func FilterRegistries(registries []portainer.Registry, context *RestrictedReques return filteredRegistries } +// FilterTemplates filters templates based on the user role. +// Non-administrato template do not have access to templates where the AdministratorOnly flag is set to true. +func FilterTemplates(templates []portainer.Template, context *RestrictedRequestContext) []portainer.Template { + filteredTemplates := templates + + if !context.IsAdmin { + filteredTemplates = make([]portainer.Template, 0) + + for _, template := range templates { + if !template.AdministratorOnly { + filteredTemplates = append(filteredTemplates, template) + } + } + } + + return filteredTemplates +} + // FilterEndpoints filters endpoints based on user role and team memberships. // Non administrator users only have access to authorized endpoints (can be inherited via endoint groups). func FilterEndpoints(endpoints []portainer.Endpoint, groups []portainer.EndpointGroup, context *RestrictedRequestContext) []portainer.Endpoint { diff --git a/api/http/server.go b/api/http/server.go index 7569760dd..4babc109b 100644 --- a/api/http/server.go +++ b/api/http/server.go @@ -40,6 +40,8 @@ type Server struct { ComposeStackManager portainer.ComposeStackManager CryptoService portainer.CryptoService SignatureService portainer.DigitalSignatureService + JobScheduler portainer.JobScheduler + Snapshotter portainer.Snapshotter DockerHubService portainer.DockerHubService EndpointService portainer.EndpointService EndpointGroupService portainer.EndpointGroupService @@ -55,6 +57,7 @@ type Server struct { TagService portainer.TagService TeamService portainer.TeamService TeamMembershipService portainer.TeamMembershipService + TemplateService portainer.TemplateService UserService portainer.UserService Handler *handler.Handler SSL bool @@ -89,6 +92,8 @@ func (server *Server) Start() error { authHandler.JWTService = server.JWTService authHandler.LDAPService = server.LDAPService authHandler.SettingsService = server.SettingsService + authHandler.TeamService = server.TeamService + authHandler.TeamMembershipService = server.TeamMembershipService var dockerHubHandler = dockerhub.NewHandler(requestBouncer) dockerHubHandler.DockerHubService = server.DockerHubService @@ -98,6 +103,7 @@ func (server *Server) Start() error { endpointHandler.EndpointGroupService = server.EndpointGroupService endpointHandler.FileService = server.FileService endpointHandler.ProxyManager = proxyManager + endpointHandler.Snapshotter = server.Snapshotter var endpointGroupHandler = endpointgroups.NewHandler(requestBouncer) endpointGroupHandler.EndpointGroupService = server.EndpointGroupService @@ -119,6 +125,7 @@ func (server *Server) Start() error { settingsHandler.SettingsService = server.SettingsService settingsHandler.LDAPService = server.LDAPService settingsHandler.FileService = server.FileService + settingsHandler.JobScheduler = server.JobScheduler var stackHandler = stacks.NewHandler(requestBouncer) stackHandler.FileService = server.FileService @@ -143,7 +150,7 @@ func (server *Server) Start() error { var statusHandler = status.NewHandler(requestBouncer, server.Status) var templatesHandler = templates.NewHandler(requestBouncer) - templatesHandler.SettingsService = server.SettingsService + templatesHandler.TemplateService = server.TemplateService var uploadHandler = upload.NewHandler(requestBouncer) uploadHandler.FileService = server.FileService diff --git a/api/ldap/ldap.go b/api/ldap/ldap.go index 7b72b8930..528a92e7f 100644 --- a/api/ldap/ldap.go +++ b/api/ldap/ldap.go @@ -102,12 +102,65 @@ func (*Service) AuthenticateUser(username, password string, settings *portainer. err = connection.Bind(userDN, password) if err != nil { - return err + return portainer.ErrUnauthorized } return nil } +// GetUserGroups is used to retrieve user groups from LDAP/AD. +func (*Service) GetUserGroups(username string, settings *portainer.LDAPSettings) ([]string, error) { + connection, err := createConnection(settings) + if err != nil { + return nil, err + } + defer connection.Close() + + err = connection.Bind(settings.ReaderDN, settings.Password) + if err != nil { + return nil, err + } + + userDN, err := searchUser(username, connection, settings.SearchSettings) + if err != nil { + return nil, err + } + + userGroups := getGroups(userDN, connection, settings.GroupSearchSettings) + + return userGroups, nil +} + +// Get a list of group names for specified user from LDAP/AD +func getGroups(userDN string, conn *ldap.Conn, settings []portainer.LDAPGroupSearchSettings) []string { + groups := make([]string, 0) + + for _, searchSettings := range settings { + searchRequest := ldap.NewSearchRequest( + searchSettings.GroupBaseDN, + ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false, + fmt.Sprintf("(&%s(%s=%s))", searchSettings.GroupFilter, searchSettings.GroupAttribute, userDN), + []string{"cn"}, + nil, + ) + + // Deliberately skip errors on the search request so that we can jump to other search settings + // if any issue arise with the current one. + sr, err := conn.Search(searchRequest) + if err != nil { + continue + } + + for _, entry := range sr.Entries { + for _, attr := range entry.Attributes { + groups = append(groups, attr.Values[0]) + } + } + } + + return groups +} + // TestConnectivity is used to test a connection against the LDAP server using the credentials // specified in the LDAPSettings. func (*Service) TestConnectivity(settings *portainer.LDAPSettings) error { diff --git a/api/libcompose/compose_stack.go b/api/libcompose/compose_stack.go index 5cf1264b6..2759f01cf 100644 --- a/api/libcompose/compose_stack.go +++ b/api/libcompose/compose_stack.go @@ -5,6 +5,7 @@ import ( "path" "path/filepath" + "github.com/portainer/libcompose/config" "github.com/portainer/libcompose/docker" "github.com/portainer/libcompose/docker/client" "github.com/portainer/libcompose/docker/ctx" @@ -26,28 +27,50 @@ func NewComposeStackManager(dataPath string) *ComposeStackManager { } } +func createClient(endpoint *portainer.Endpoint) (client.Factory, error) { + clientOpts := client.Options{ + Host: endpoint.URL, + APIVersion: portainer.SupportedDockerAPIVersion, + } + + if endpoint.TLSConfig.TLS { + clientOpts.TLS = endpoint.TLSConfig.TLS + clientOpts.TLSVerify = !endpoint.TLSConfig.TLSSkipVerify + clientOpts.TLSCAFile = endpoint.TLSConfig.TLSCACertPath + clientOpts.TLSCertFile = endpoint.TLSConfig.TLSCertPath + clientOpts.TLSKeyFile = endpoint.TLSConfig.TLSKeyPath + } + + return client.NewDefaultFactory(clientOpts) +} + // Up will deploy a compose stack (equivalent of docker-compose up) func (manager *ComposeStackManager) Up(stack *portainer.Stack, endpoint *portainer.Endpoint) error { - clientFactory, err := client.NewDefaultFactory(client.Options{ - TLS: endpoint.TLSConfig.TLS, - TLSVerify: endpoint.TLSConfig.TLSSkipVerify, - Host: endpoint.URL, - TLSCAFile: endpoint.TLSCACertPath, - TLSCertFile: endpoint.TLSCertPath, - TLSKeyFile: endpoint.TLSKeyPath, - APIVersion: "1.24", - }) + + clientFactory, err := createClient(endpoint) if err != nil { return err } + env := make(map[string]string) + for _, envvar := range stack.Env { + env[envvar.Name] = envvar.Value + } + composeFilePath := path.Join(stack.ProjectPath, stack.EntryPoint) proj, err := docker.NewProject(&ctx.Context{ ConfigDir: manager.dataPath, Context: project.Context{ ComposeFiles: []string{composeFilePath}, - EnvironmentLookup: &lookup.EnvfileLookup{ - Path: filepath.Join(stack.ProjectPath, ".env"), + EnvironmentLookup: &lookup.ComposableEnvLookup{ + Lookups: []config.EnvironmentLookup{ + &lookup.EnvfileLookup{ + Path: filepath.Join(stack.ProjectPath, ".env"), + }, + &lookup.MapLookup{ + Vars: env, + }, + }, }, ProjectName: stack.Name, }, @@ -62,15 +85,7 @@ func (manager *ComposeStackManager) Up(stack *portainer.Stack, endpoint *portain // Down will shutdown a compose stack (equivalent of docker-compose down) func (manager *ComposeStackManager) Down(stack *portainer.Stack, endpoint *portainer.Endpoint) error { - clientFactory, err := client.NewDefaultFactory(client.Options{ - TLS: endpoint.TLSConfig.TLS, - TLSVerify: endpoint.TLSConfig.TLSSkipVerify, - Host: endpoint.URL, - TLSCAFile: endpoint.TLSCACertPath, - TLSCertFile: endpoint.TLSCertPath, - TLSKeyFile: endpoint.TLSKeyPath, - APIVersion: "1.24", - }) + clientFactory, err := createClient(endpoint) if err != nil { return err } diff --git a/api/portainer.go b/api/portainer.go index abb60df79..4e27cf940 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -21,6 +21,7 @@ type ( NoAuth *bool NoAnalytics *bool Templates *string + TemplateFile *string TLS *bool TLSSkipVerify *bool TLSCacert *string @@ -30,24 +31,29 @@ type ( SSLCert *string SSLKey *string SyncInterval *string + Snapshot *bool + SnapshotInterval *string } // Status represents the application status. Status struct { Authentication bool `json:"Authentication"` EndpointManagement bool `json:"EndpointManagement"` + Snapshot bool `json:"Snapshot"` Analytics bool `json:"Analytics"` Version string `json:"Version"` } // LDAPSettings represents the settings used to connect to a LDAP server. LDAPSettings struct { - ReaderDN string `json:"ReaderDN"` - Password string `json:"Password"` - URL string `json:"URL"` - TLSConfig TLSConfiguration `json:"TLSConfig"` - StartTLS bool `json:"StartTLS"` - SearchSettings []LDAPSearchSettings `json:"SearchSettings"` + ReaderDN string `json:"ReaderDN"` + Password string `json:"Password"` + URL string `json:"URL"` + TLSConfig TLSConfiguration `json:"TLSConfig"` + StartTLS bool `json:"StartTLS"` + SearchSettings []LDAPSearchSettings `json:"SearchSettings"` + GroupSearchSettings []LDAPGroupSearchSettings `json:"GroupSearchSettings"` + AutoCreateUsers bool `json:"AutoCreateUsers"` } // TLSConfiguration represents a TLS configuration. @@ -66,18 +72,27 @@ type ( UserNameAttribute string `json:"UserNameAttribute"` } + // LDAPGroupSearchSettings represents settings used to search for groups in a LDAP server. + LDAPGroupSearchSettings struct { + GroupBaseDN string `json:"GroupBaseDN"` + GroupFilter string `json:"GroupFilter"` + GroupAttribute string `json:"GroupAttribute"` + } + // Settings represents the application settings. Settings struct { - TemplatesURL string `json:"TemplatesURL"` LogoURL string `json:"LogoURL"` BlackListedLabels []Pair `json:"BlackListedLabels"` - DisplayExternalContributors bool `json:"DisplayExternalContributors"` AuthenticationMethod AuthenticationMethod `json:"AuthenticationMethod"` LDAPSettings LDAPSettings `json:"LDAPSettings"` AllowBindMountsForRegularUsers bool `json:"AllowBindMountsForRegularUsers"` AllowPrivilegedModeForRegularUsers bool `json:"AllowPrivilegedModeForRegularUsers"` + SnapshotInterval string `json:"SnapshotInterval"` + // Deprecated fields - DisplayDonationHeader bool + DisplayDonationHeader bool + DisplayExternalContributors bool + TemplatesURL string } // User represents a user account. @@ -176,6 +191,9 @@ type ( // EndpointType represents the type of an endpoint. EndpointType int + // EndpointStatus represents the status of an endpoint + EndpointStatus int + // Endpoint represents a Docker endpoint with all the info required // to connect to it. Endpoint struct { @@ -191,6 +209,8 @@ type ( Extensions []EndpointExtension `json:"Extensions"` AzureCredentials AzureCredentials `json:"AzureCredentials,omitempty"` Tags []string `json:"Tags"` + Status EndpointStatus `json:"Status"` + Snapshots []Snapshot `json:"Snapshots"` // Deprecated fields // Deprecated in DBVersion == 4 @@ -208,6 +228,21 @@ type ( AuthenticationKey string `json:"AuthenticationKey"` } + // Snapshot represents a snapshot of a specific endpoint at a specific time + Snapshot struct { + Time int64 `json:"Time"` + DockerVersion string `json:"DockerVersion"` + Swarm bool `json:"Swarm"` + TotalCPU int `json:"TotalCPU"` + TotalMemory int64 `json:"TotalMemory"` + RunningContainerCount int `json:"RunningContainerCount"` + StoppedContainerCount int `json:"StoppedContainerCount"` + VolumeCount int `json:"VolumeCount"` + ImageCount int `json:"ImageCount"` + ServiceCount int `json:"ServiceCount"` + StackCount int `json:"StackCount"` + } + // EndpointGroupID represents an endpoint group identifier. EndpointGroupID int @@ -277,6 +312,79 @@ type ( Name string `json:"Name"` } + // TemplateID represents a template identifier. + TemplateID int + + // TemplateType represents the type of a template. + TemplateType int + + // Template represents an application template. + Template struct { + // Mandatory container/stack fields + ID TemplateID `json:"Id"` + Type TemplateType `json:"type"` + Title string `json:"title"` + Description string `json:"description"` + AdministratorOnly bool `json:"administrator_only"` + + // Mandatory container fields + Image string `json:"image"` + + // Mandatory stack fields + Repository TemplateRepository `json:"repository"` + + // Optional stack/container fields + Name string `json:"name,omitempty"` + Logo string `json:"logo,omitempty"` + Env []TemplateEnv `json:"env,omitempty"` + Note string `json:"note,omitempty"` + Platform string `json:"platform,omitempty"` + Categories []string `json:"categories,omitempty"` + + // Optional container fields + Registry string `json:"registry,omitempty"` + Command string `json:"command,omitempty"` + Network string `json:"network,omitempty"` + Volumes []TemplateVolume `json:"volumes,omitempty"` + Ports []string `json:"ports,omitempty"` + Labels []Pair `json:"labels,omitempty"` + Privileged bool `json:"privileged,omitempty"` + Interactive bool `json:"interactive,omitempty"` + RestartPolicy string `json:"restart_policy,omitempty"` + Hostname string `json:"hostname,omitempty"` + } + + // TemplateEnv represents a template environment variable configuration. + TemplateEnv struct { + Name string `json:"name"` + Label string `json:"label,omitempty"` + Description string `json:"description,omitempty"` + Default string `json:"default,omitempty"` + Preset bool `json:"preset,omitempty"` + Select []TemplateEnvSelect `json:"select,omitempty"` + } + + // TemplateVolume represents a template volume configuration. + TemplateVolume struct { + Container string `json:"container"` + Bind string `json:"bind,omitempty"` + ReadOnly bool `json:"readonly,omitempty"` + } + + // TemplateRepository represents the git repository configuration for a template. + TemplateRepository struct { + URL string `json:"url"` + StackFile string `json:"stackfile"` + } + + // TemplateEnvSelect represents text/value pair that will be displayed as a choice for the + // template user. + TemplateEnvSelect struct { + Text string `json:"text"` + Value string `json:"value"` + Default bool `json:"default"` + } + // ResourceAccessLevel represents the level of control associated to a resource. ResourceAccessLevel int @@ -345,6 +453,7 @@ type ( UpdateEndpoint(ID EndpointID, endpoint *Endpoint) error DeleteEndpoint(ID EndpointID) error Synchronize(toCreate, toUpdate, toDelete []*Endpoint) error + GetNextIdentifier() int } // EndpointGroupService represents a service for managing endpoint group data. @@ -411,6 +520,15 @@ type ( DeleteTag(ID TagID) error } + // TemplateService represents a service for managing template data. + TemplateService interface { + Templates() ([]Template, error) + Template(ID TemplateID) (*Template, error) + CreateTemplate(template *Template) error + UpdateTemplate(ID TemplateID, template *Template) error + DeleteTemplate(ID TemplateID) error + } + // CryptoService represents a service for encrypting/hashing data. CryptoService interface { Hash(data string) (string, error) @@ -434,7 +552,7 @@ type ( // FileService represents a service for managing files. FileService interface { - GetFileContent(filePath string) (string, error) + GetFileContent(filePath string) ([]byte, error) Rename(oldPath, newPath string) error RemoveDirectory(directoryPath string) error StoreTLSFileFromBytes(folder string, fileType TLSFileType, data []byte) (string, error) @@ -452,19 +570,28 @@ type ( // GitService represents a service for managing Git. GitService interface { - ClonePublicRepository(repositoryURL, destination string) error - ClonePrivateRepositoryWithBasicAuth(repositoryURL, destination, username, password string) error + ClonePublicRepository(repositoryURL, referenceName string, destination string) error + ClonePrivateRepositoryWithBasicAuth(repositoryURL, referenceName string, destination, username, password string) error } - // EndpointWatcher represents a service to synchronize the endpoints via an external source. - EndpointWatcher interface { - WatchEndpointFile(endpointFilePath string) error + // JobScheduler represents a service to run jobs on a periodic basis. + JobScheduler interface { + ScheduleEndpointSyncJob(endpointFilePath, interval string) error + ScheduleSnapshotJob(interval string) error + UpdateSnapshotJob(interval string) + Start() + } + + // Snapshotter represents a service used to create endpoint snapshots. + Snapshotter interface { + CreateSnapshot(endpoint *Endpoint) (*Snapshot, error) } // LDAPService represents a service used to authenticate users against a LDAP/AD. LDAPService interface { AuthenticateUser(username, password string, settings *LDAPSettings) error TestConnectivity(settings *LDAPSettings) error + GetUserGroups(username string, settings *LDAPSettings) ([]string, error) } // SwarmStackManager represents a service to manage Swarm stacks. @@ -484,11 +611,9 @@ type ( const ( // APIVersion is the version number of the Portainer API. - APIVersion = "1.18.1" + APIVersion = "1.19.0" // DBVersion is the version number of the Portainer database. - DBVersion = 12 - // DefaultTemplatesURL represents the default URL for the templates definitions. - DefaultTemplatesURL = "https://raw.githubusercontent.com/portainer/templates/master/templates.json" + DBVersion = 13 // PortainerAgentHeader represents the name of the header available in any agent response PortainerAgentHeader = "Portainer-Agent" // PortainerAgentTargetHeader represent the name of the header containing the target node name. @@ -500,6 +625,8 @@ const ( // PortainerAgentSignatureMessage represents the message used to create a digital signature // to be used when communicating with an agent PortainerAgentSignatureMessage = "Portainer-App" + // SupportedDockerAPIVersion is the minimum Docker API version supported by Portainer. + SupportedDockerAPIVersion = "1.24" ) const ( @@ -582,3 +709,21 @@ const ( // DockerComposeStack represents a stack managed via docker-compose DockerComposeStack ) + +const ( + _ TemplateType = iota + // ContainerTemplate represents a container template + ContainerTemplate + // SwarmStackTemplate represents a template used to deploy a Swarm stack + SwarmStackTemplate + // ComposeStackTemplate represents a template used to deploy a Compose stack + ComposeStackTemplate +) + +const ( + _ EndpointStatus = iota + // EndpointStatusUp is used to represent an available endpoint + EndpointStatusUp + // EndpointStatusDown is used to represent an unavailable endpoint + EndpointStatusDown +) diff --git a/api/swagger.yaml b/api/swagger.yaml index 1172d1706..e8a562ff6 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -54,7 +54,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.18.1" + version: "1.19.0" title: "Portainer API" contact: email: "info@portainer.io" @@ -247,7 +247,8 @@ paths: - name: "URL" in: "formData" type: "string" - description: "URL or IP address of a Docker host (example: docker.mydomain.tld:2375). Required if endpoint type is set to 1 or 2." + description: "URL or IP address of a Docker host (example: docker.mydomain.tld:2375).\ + \ Defaults to local if not specified (Linux: /var/run/docker.sock, Windows: //./pipe/docker_engine)" - name: "PublicURL" in: "formData" type: "string" @@ -319,7 +320,7 @@ paths: summary: "Inspect an endpoint" description: | Retrieve details abount an endpoint. - **Access policy**: administrator + **Access policy**: restricted operationId: "EndpointInspect" produces: - "application/json" @@ -2530,32 +2531,189 @@ paths: get: tags: - "templates" - summary: "Retrieve App templates" + summary: "List available templates" description: | - Retrieve App templates. - You can find more information about the format at http://portainer.readthedocs.io/en/stable/templates.html - **Access policy**: authenticated + List available templates. + Administrator templates will not be listed for non-administrator users. + **Access policy**: restricted operationId: "TemplateList" produces: - "application/json" parameters: - - name: "key" - in: "query" - required: true - description: "Templates key. Valid values are 'container' or 'linuxserver.io'." - type: "string" responses: 200: description: "Success" schema: $ref: "#/definitions/TemplateListResponse" + 500: + description: "Server error" + schema: + $ref: "#/definitions/GenericError" + post: + tags: + - "templates" + summary: "Create a new template" + description: | + Create a new template. + **Access policy**: administrator + operationId: "TemplateCreate" + consumes: + - "application/json" + produces: + - "application/json" + parameters: + - in: "body" + name: "body" + description: "Template details" + required: true + schema: + $ref: "#/definitions/TemplateCreateRequest" + responses: + 200: + description: "Success" + schema: + $ref: "#/definitions/Template" 400: description: "Invalid request" schema: $ref: "#/definitions/GenericError" examples: application/json: - err: "Invalid query format" + err: "Invalid request data format" + 403: + description: "Unauthorized" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Access denied to resource" + 500: + description: "Server error" + schema: + $ref: "#/definitions/GenericError" + /templates/{id}: + get: + tags: + - "templates" + summary: "Inspect a template" + description: | + Retrieve details about a template. + **Access policy**: administrator + operationId: "TemplateInspect" + produces: + - "application/json" + parameters: + - name: "id" + in: "path" + description: "Template identifier" + required: true + type: "integer" + responses: + 200: + description: "Success" + schema: + $ref: "#/definitions/Template" + 400: + description: "Invalid request" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Invalid request" + 403: + description: "Unauthorized" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Access denied to resource" + 404: + description: "Template not found" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Template not found" + 500: + description: "Server error" + schema: + $ref: "#/definitions/GenericError" + put: + tags: + - "templates" + summary: "Update a template" + description: | + Update a template. + **Access policy**: administrator + operationId: "TemplateUpdate" + consumes: + - "application/json" + produces: + - "application/json" + parameters: + - name: "id" + in: "path" + description: "Template identifier" + required: true + type: "integer" + - in: "body" + name: "body" + description: "Template details" + required: true + schema: + $ref: "#/definitions/TemplateUpdateRequest" + responses: + 200: + description: "Success" + 400: + description: "Invalid request" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Invalid request data format" + 403: + description: "Unauthorized" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Access denied to resource" + 404: + description: "Template not found" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Template not found" + 500: + description: "Server error" + schema: + $ref: "#/definitions/GenericError" + delete: + tags: + - "templates" + summary: "Remove a template" + description: | + Remove a template. + **Access policy**: administrator + operationId: "TemplateDelete" + parameters: + - name: "id" + in: "path" + description: "Template identifier" + required: true + type: "integer" + responses: + 204: + description: "Success" + 400: + description: "Invalid request" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Invalid request" 500: description: "Server error" schema: @@ -2658,7 +2816,7 @@ definitions: description: "Is analytics enabled" Version: type: "string" - example: "1.18.1" + example: "1.19.0" description: "Portainer API version" PublicSettingsInspectResponse: type: "object" @@ -2739,6 +2897,21 @@ definitions: type: "string" example: "uid" description: "LDAP attribute which denotes the username" + LDAPGroupSearchSettings: + type: "object" + properties: + GroupBaseDN: + type: "string" + example: "dc=ldap,dc=domain,dc=tld" + description: "The distinguished name of the element from which the LDAP server will search for groups." + GroupFilter: + type: "string" + example: "(objectClass=account)" + description: "The LDAP search filter used to select group elements, optional." + GroupAttribute: + type: "string" + example: "member" + description: "LDAP attribute which denotes the group membership." LDAPSettings: type: "object" @@ -2765,6 +2938,14 @@ definitions: type: "array" items: $ref: "#/definitions/LDAPSearchSettings" + GroupSearchSettings: + type: "array" + items: + $ref: "#/definitions/LDAPGroupSearchSettings" + AutoCreateUsers: + type: "boolean" + example: "true" + description: "Automatically provision users and assign them to matching LDAP group names" Settings: type: "object" @@ -3602,9 +3783,17 @@ definitions: type: "array" items: $ref: "#/definitions/Template" - Template: + TemplateCreateRequest: type: "object" + required: + - "type" + - "title" + - "description" properties: + type: + type: "integer" + example: 1 + description: "Template type. Valid values are: 1 (container), 2 (Swarm stack) or 3 (Compose stack)" title: type: "string" example: "Nginx" @@ -3613,14 +3802,354 @@ definitions: type: "string" example: "High performance web server" description: "Description of the template" + administrator_only: + type: "boolean" + example: true + description: "Whether the template should be available to administrators only" + image: + type: "string" + example: "nginx:latest" + description: "Image associated to a container template. Mandatory for a container template" + repository: + $ref: "#/definitions/TemplateRepository" + name: + type: "string" + example: "mystackname" + description: "Default name for the stack/container to be used on deployment" logo: type: "string" example: "https://cloudinovasi.id/assets/img/logos/nginx.png" description: "URL of the template's logo" + env: + type: "array" + description: "A list of environment variables used during the template deployment" + items: + $ref: "#/definitions/TemplateEnv" + note: + type: "string" + example: "This is my custom template" + description: "A note that will be displayed in the UI. Supports HTML content" + platform: + type: "string" + example: "linux" + description: "Platform associated to the template. Valid values are: 'linux', 'windows' or leave empty for multi-platform" + categories: + type: "array" + description: "A list of categories associated to the template" + items: + type: "string" + exampe: "database" + registry: + type: "string" + example: "quay.io" + description: "The URL of a registry associated to the image for a container template" + command: + type: "string" + example: "ls -lah" + description: "The command that will be executed in a container template" + network: + type: "string" + example: "mynet" + description: "Name of a network that will be used on container deployment if it exists inside the environment" + volumes: + type: "array" + description: "A list of volumes used during the container template deployment" + items: + $ref: "#/definitions/TemplateVolume" + ports: + type: "array" + description: "A list of ports exposed by the container" + items: + type: "string" + example: "8080:80/tcp" + labels: + type: "array" + description: "Container labels" + items: + $ref: '#/definitions/Pair' + privileged: + type: "boolean" + example: true + description: "Whether the container should be started in privileged mode" + interactive: + type: "boolean" + example: true + description: "Whether the container should be started in interactive mode (-i -t equivalent on the CLI)" + restart_policy: + type: "string" + example: "on-failure" + description: "Container restart policy" + hostname: + type: "string" + example: "mycontainer" + description: "Container hostname" + TemplateUpdateRequest: + type: "object" + properties: + type: + type: "integer" + example: 1 + description: "Template type. Valid values are: 1 (container), 2 (Swarm stack) or 3 (Compose stack)" + title: + type: "string" + example: "Nginx" + description: "Title of the template" + description: + type: "string" + example: "High performance web server" + description: "Description of the template" + administrator_only: + type: "boolean" + example: true + description: "Whether the template should be available to administrators only" image: type: "string" example: "nginx:latest" - description: "The Docker image associated to the template" + description: "Image associated to a container template. Mandatory for a container template" + repository: + $ref: "#/definitions/TemplateRepository" + name: + type: "string" + example: "mystackname" + description: "Default name for the stack/container to be used on deployment" + logo: + type: "string" + example: "https://cloudinovasi.id/assets/img/logos/nginx.png" + description: "URL of the template's logo" + env: + type: "array" + description: "A list of environment variables used during the template deployment" + items: + $ref: "#/definitions/TemplateEnv" + note: + type: "string" + example: "This is my custom template" + description: "A note that will be displayed in the UI. Supports HTML content" + platform: + type: "string" + example: "linux" + description: "Platform associated to the template. Valid values are: 'linux', 'windows' or leave empty for multi-platform" + categories: + type: "array" + description: "A list of categories associated to the template" + items: + type: "string" + exampe: "database" + registry: + type: "string" + example: "quay.io" + description: "The URL of a registry associated to the image for a container template" + command: + type: "string" + example: "ls -lah" + description: "The command that will be executed in a container template" + network: + type: "string" + example: "mynet" + description: "Name of a network that will be used on container deployment if it exists inside the environment" + volumes: + type: "array" + description: "A list of volumes used during the container template deployment" + items: + $ref: "#/definitions/TemplateVolume" + ports: + type: "array" + description: "A list of ports exposed by the container" + items: + type: "string" + example: "8080:80/tcp" + labels: + type: "array" + description: "Container labels" + items: + $ref: '#/definitions/Pair' + privileged: + type: "boolean" + example: true + description: "Whether the container should be started in privileged mode" + interactive: + type: "boolean" + example: true + description: "Whether the container should be started in interactive mode (-i -t equivalent on the CLI)" + restart_policy: + type: "string" + example: "on-failure" + description: "Container restart policy" + hostname: + type: "string" + example: "mycontainer" + description: "Container hostname" + Template: + type: "object" + properties: + id: + type: "integer" + example: 1 + description: "Template identifier" + type: + type: "integer" + example: 1 + description: "Template type. Valid values are: 1 (container), 2 (Swarm stack) or 3 (Compose stack)" + title: + type: "string" + example: "Nginx" + description: "Title of the template" + description: + type: "string" + example: "High performance web server" + description: "Description of the template" + administrator_only: + type: "boolean" + example: true + description: "Whether the template should be available to administrators only" + image: + type: "string" + example: "nginx:latest" + description: "Image associated to a container template. Mandatory for a container template" + repository: + $ref: "#/definitions/TemplateRepository" + name: + type: "string" + example: "mystackname" + description: "Default name for the stack/container to be used on deployment" + logo: + type: "string" + example: "https://cloudinovasi.id/assets/img/logos/nginx.png" + description: "URL of the template's logo" + env: + type: "array" + description: "A list of environment variables used during the template deployment" + items: + $ref: "#/definitions/TemplateEnv" + note: + type: "string" + example: "This is my custom template" + description: "A note that will be displayed in the UI. Supports HTML content" + platform: + type: "string" + example: "linux" + description: "Platform associated to the template. Valid values are: 'linux', 'windows' or leave empty for multi-platform" + categories: + type: "array" + description: "A list of categories associated to the template" + items: + type: "string" + exampe: "database" + registry: + type: "string" + example: "quay.io" + description: "The URL of a registry associated to the image for a container template" + command: + type: "string" + example: "ls -lah" + description: "The command that will be executed in a container template" + network: + type: "string" + example: "mynet" + description: "Name of a network that will be used on container deployment if it exists inside the environment" + volumes: + type: "array" + description: "A list of volumes used during the container template deployment" + items: + $ref: "#/definitions/TemplateVolume" + ports: + type: "array" + description: "A list of ports exposed by the container" + items: + type: "string" + example: "8080:80/tcp" + labels: + type: "array" + description: "Container labels" + items: + $ref: '#/definitions/Pair' + privileged: + type: "boolean" + example: true + description: "Whether the container should be started in privileged mode" + interactive: + type: "boolean" + example: true + description: "Whether the container should be started in interactive mode (-i -t equivalent on the CLI)" + restart_policy: + type: "string" + example: "on-failure" + description: "Container restart policy" + hostname: + type: "string" + example: "mycontainer" + description: "Container hostname" + TemplateVolume: + type: "object" + properties: + container: + type: "string" + example: "/data" + description: "Path inside the container" + bind: + type: "string" + example: "/tmp" + description: "Path on the host" + readonly: + type: "boolean" + example: true + description: "Whether the volume used should be readonly" + TemplateEnv: + type: "object" + properties: + name: + type: "string" + example: "MYSQL_ROOT_PASSWORD" + description: "name of the environment variable" + label: + type: "string" + example: "Root password" + description: "Text for the label that will be generated in the UI" + description: + type: "string" + example: "MySQL root account password" + description: "Content of the tooltip that will be generated in the UI" + default: + type: "string" + example: "default_value" + description: "Default value that will be set for the variable" + preset: + type: "boolean" + example: true + description: "If set to true, will not generate any input for this variable in the UI" + select: + type: "array" + description: "A list of name/value that will be used to generate a dropdown in the UI" + items: + $ref: '#/definitions/TemplateEnvSelect' + TemplateEnvSelect: + type: "object" + properties: + text: + type: "string" + example: "text value" + description: "Some text that will displayed as a choice" + value: + type: "string" + example: "value" + description: "A value that will be associated to the choice" + default: + type: "boolean" + example: true + description: "Will set this choice as the default choice" + TemplateRepository: + type: "object" + required: + - "URL" + properties: + URL: + type: "string" + example: "https://github.com/portainer/portainer-compose" + description: "URL of a git repository used to deploy a stack template. Mandatory for a Swarm/Compose stack template" + stackfile: + type: "string" + example: "./subfolder/docker-compose.yml" + description: "Path to the stack file inside the git repository" StackMigrateRequest: type: "object" required: @@ -3655,6 +4184,10 @@ definitions: type: "string" example: "https://github.com/openfaas/faas" description: "URL of a Git repository hosting the Stack file. Required when using the 'repository' deployment method." + RepositoryReferenceName: + type: "string" + example: "refs/heads/master" + description: "Reference name of a Git repository hosting the Stack file. Used in 'repository' deployment method." ComposeFilePathInRepository: type: "string" example: "docker-compose.yml" diff --git a/app/__module.js b/app/__module.js index e1cf659fa..00be9300d 100644 --- a/app/__module.js +++ b/app/__module.js @@ -15,6 +15,7 @@ angular.module('portainer', [ 'angular-json-tree', 'angular-loading-bar', 'angular-clipboard', + 'ngFileSaver', 'luegg.directives', 'portainer.templates', 'portainer.app', diff --git a/app/agent/components/volume-browser/volume-browser-datatable/volume-browser-datatable.js b/app/agent/components/volume-browser/volume-browser-datatable/volume-browser-datatable.js new file mode 100644 index 000000000..e3139974d --- /dev/null +++ b/app/agent/components/volume-browser/volume-browser-datatable/volume-browser-datatable.js @@ -0,0 +1,15 @@ +angular.module('portainer.agent').component('volumeBrowserDatatable', { + templateUrl: 'app/agent/components/volume-browser/volume-browser-datatable/volumeBrowserDatatable.html', + controller: 'GenericDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<' + }, + require: { + volumeBrowser: '^^volumeBrowser' + } +}); diff --git a/app/agent/components/volume-browser/volume-browser-datatable/volumeBrowserDatatable.html b/app/agent/components/volume-browser/volume-browser-datatable/volumeBrowserDatatable.html new file mode 100644 index 000000000..7599d7caf --- /dev/null +++ b/app/agent/components/volume-browser/volume-browser-datatable/volumeBrowserDatatable.html @@ -0,0 +1,90 @@ +
+ + +
+
+ {{ $ctrl.titleText }} +
+
+
+ + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + Name + + + + + + Size + + + + + + Last modification + + + + + Actions +
+ Go to parent +
+ + + + + + + {{ item.Name }} + + + {{ item.Name }} + + {{ item.Size | humansize }} + {{ item.ModTime | getisodatefromtimestamp }} + + + Download + + + Rename + + + Delete + +
Loading...
No files found.
+
+ + +
diff --git a/app/agent/components/volume-browser/volume-browser.js b/app/agent/components/volume-browser/volume-browser.js new file mode 100644 index 000000000..964803da0 --- /dev/null +++ b/app/agent/components/volume-browser/volume-browser.js @@ -0,0 +1,8 @@ +angular.module('portainer.agent').component('volumeBrowser', { + templateUrl: 'app/agent/components/volume-browser/volumeBrowser.html', + controller: 'VolumeBrowserController', + bindings: { + volumeId: '<', + nodeName: '<' + } +}); diff --git a/app/agent/components/volume-browser/volumeBrowser.html b/app/agent/components/volume-browser/volumeBrowser.html new file mode 100644 index 000000000..643d8c88b --- /dev/null +++ b/app/agent/components/volume-browser/volumeBrowser.html @@ -0,0 +1,5 @@ + diff --git a/app/agent/components/volume-browser/volumeBrowserController.js b/app/agent/components/volume-browser/volumeBrowserController.js new file mode 100644 index 000000000..2fa4426b9 --- /dev/null +++ b/app/agent/components/volume-browser/volumeBrowserController.js @@ -0,0 +1,115 @@ +angular.module('portainer.agent') +.controller('VolumeBrowserController', ['HttpRequestHelper', 'VolumeBrowserService', 'FileSaver', 'Blob', 'ModalService', 'Notifications', +function (HttpRequestHelper, VolumeBrowserService, FileSaver, Blob, ModalService, Notifications) { + var ctrl = this; + + this.state = { + path: '/' + }; + + this.rename = function(file, newName) { + var filePath = this.state.path === '/' ? file : this.state.path + '/' + file; + var newFilePath = this.state.path === '/' ? newName : this.state.path + '/' + newName; + + VolumeBrowserService.rename(this.volumeId, filePath, newFilePath) + .then(function success() { + Notifications.success('File successfully renamed', newFilePath); + return VolumeBrowserService.ls(ctrl.volumeId, ctrl.state.path); + }) + .then(function success(data) { + ctrl.files = data; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to rename file'); + }); + }; + + this.delete = function(file) { + var filePath = this.state.path === '/' ? file : this.state.path + '/' + file; + + ModalService.confirmDeletion( + 'Are you sure that you want to delete ' + filePath + ' ?', + function onConfirm(confirmed) { + if(!confirmed) { return; } + deleteFile(filePath); + } + ); + }; + + this.download = function(file) { + var filePath = this.state.path === '/' ? file : this.state.path + '/' + file; + VolumeBrowserService.get(this.volumeId, filePath) + .then(function success(data) { + var downloadData = new Blob([data.file], { type: 'text/plain;charset=utf-8' }); + FileSaver.saveAs(downloadData, file); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to download file'); + }); + }; + + this.up = function() { + var parentFolder = parentPath(this.state.path); + browse(parentFolder); + }; + + this.browse = function(folder) { + var path = buildPath(this.state.path, folder); + browse(path); + }; + + function deleteFile(file) { + VolumeBrowserService.delete(ctrl.volumeId, file) + .then(function success() { + Notifications.success('File successfully deleted', file); + return VolumeBrowserService.ls(ctrl.volumeId, ctrl.state.path); + }) + .then(function success(data) { + ctrl.files = data; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to delete file'); + }); + } + + + function browse(path) { + VolumeBrowserService.ls(ctrl.volumeId, path) + .then(function success(data) { + ctrl.state.path = path; + ctrl.files = data; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to browse volume'); + }); + } + + function parentPath(path) { + if (path.lastIndexOf('/') === 0) { + return '/'; + } + + var split = _.split(path, '/'); + return _.join(_.slice(split, 0, split.length - 1), '/'); + } + + function buildPath(parent, file) { + if (parent === '/') { + return parent + file; + } + return parent + '/' + file; + } + + + this.$onInit = function() { + HttpRequestHelper.setPortainerAgentTargetHeader(this.nodeName); + VolumeBrowserService.ls(this.volumeId, this.state.path) + .then(function success(data) { + ctrl.files = data; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to browse volume'); + }); + }; + +}]); diff --git a/app/agent/rest/agent.js b/app/agent/rest/agent.js index 04d974780..a7800717c 100644 --- a/app/agent/rest/agent.js +++ b/app/agent/rest/agent.js @@ -5,6 +5,6 @@ angular.module('portainer.agent') endpointId: EndpointProvider.endpointID }, { - query: {method: 'GET', isArray: true} + query: { method: 'GET', isArray: true } }); }]); diff --git a/app/agent/rest/browse.js b/app/agent/rest/browse.js new file mode 100644 index 000000000..b4e8d53e0 --- /dev/null +++ b/app/agent/rest/browse.js @@ -0,0 +1,22 @@ +angular.module('portainer.agent') +.factory('Browse', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function BrowseFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { + 'use strict'; + return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/browse/:id/:action', { + endpointId: EndpointProvider.endpointID + }, + { + ls: { + method: 'GET', isArray: true, params: { id: '@id', action: 'ls' } + }, + get: { + method: 'GET', params: { id: '@id', action: 'get' }, + transformResponse: browseGetResponse + }, + delete: { + method: 'DELETE', params: { id: '@id', action: 'delete' } + }, + rename: { + method: 'PUT', params: { id: '@id', action: 'rename' } + } + }); +}]); diff --git a/app/agent/rest/response/browse.js b/app/agent/rest/response/browse.js new file mode 100644 index 000000000..7047777a6 --- /dev/null +++ b/app/agent/rest/response/browse.js @@ -0,0 +1,9 @@ +// The get action of the Browse service returns a file. +// ngResource will transform it as an array of chars. +// This functions simply creates a response object and assign +// the data to a field. +function browseGetResponse(data) { + var response = {}; + response.file = data; + return response; +} diff --git a/app/agent/services/volumeBrowserService.js b/app/agent/services/volumeBrowserService.js new file mode 100644 index 000000000..22b020494 --- /dev/null +++ b/app/agent/services/volumeBrowserService.js @@ -0,0 +1,27 @@ +angular.module('portainer.agent') +.factory('VolumeBrowserService', ['$q', 'Browse', function VolumeBrowserServiceFactory($q, Browse) { + 'use strict'; + var service = {}; + + service.ls = function(volumeId, path) { + return Browse.ls({ 'id': volumeId, 'path': path }).$promise; + }; + + service.get = function(volumeId, path) { + return Browse.get({ 'id': volumeId, 'path': path }).$promise; + }; + + service.delete = function(volumeId, path) { + return Browse.delete({ 'id': volumeId, 'path': path }).$promise; + }; + + service.rename = function(volumeId, path, newPath) { + var payload = { + CurrentFilePath: path, + NewFilePath: newPath + }; + return Browse.rename({ 'id': volumeId }, payload).$promise; + }; + + return service; +}]); diff --git a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html index f1113aadb..8ba81dece 100644 --- a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html +++ b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html @@ -5,11 +5,6 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
- +
diff --git a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.js b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.js index c83550ca5..b30626be5 100644 --- a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.js +++ b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.azure').component('containergroupsDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', removeAction: '<' } }); diff --git a/app/azure/views/containerinstances/containerinstances.html b/app/azure/views/containerinstances/containerinstances.html index af3990f8e..d83583a5e 100644 --- a/app/azure/views/containerinstances/containerinstances.html +++ b/app/azure/views/containerinstances/containerinstances.html @@ -12,7 +12,7 @@ diff --git a/app/docker/__module.js b/app/docker/__module.js index 82041efeb..32253b43a 100644 --- a/app/docker/__module.js +++ b/app/docker/__module.js @@ -184,6 +184,17 @@ angular.module('portainer.docker', ['portainer.app']) } }; + var imageImport = { + name: 'docker.images.import', + url: '/import', + views: { + 'content@': { + templateUrl: 'app/docker/views/images/import/importimage.html', + controller: 'ImportImageController' + } + } + }; + var networks = { name: 'docker.networks', url: '/networks', @@ -361,36 +372,6 @@ angular.module('portainer.docker', ['portainer.app']) } }; - var templates = { - name: 'docker.templates', - url: '/templates', - views: { - 'content@': { - templateUrl: 'app/docker/views/templates/templates.html', - controller: 'TemplatesController' - } - }, - params: { - key: 'containers', - hide_descriptions: false - } - }; - - var templatesLinuxServer = { - name: 'docker.templates.linuxserver', - url: '/linuxserver', - views: { - 'content@': { - templateUrl: 'app/docker/views/templates/templates.html', - controller: 'TemplatesController' - } - }, - params: { - key: 'linuxserver.io', - hide_descriptions: true - } - }; - var volumes = { name: 'docker.volumes', url: '/volumes', @@ -413,6 +394,17 @@ angular.module('portainer.docker', ['portainer.app']) } }; + var volumeBrowse = { + name: 'docker.volumes.volume.browse', + url: '/browse', + views: { + 'content@': { + templateUrl: 'app/docker/views/volumes/browse/browsevolume.html', + controller: 'BrowseVolumeController' + } + } + }; + var volumeCreation = { name: 'docker.volumes.new', url: '/new', @@ -441,6 +433,7 @@ angular.module('portainer.docker', ['portainer.app']) $stateRegistryProvider.register(images); $stateRegistryProvider.register(image); $stateRegistryProvider.register(imageBuild); + $stateRegistryProvider.register(imageImport); $stateRegistryProvider.register(networks); $stateRegistryProvider.register(network); $stateRegistryProvider.register(networkCreation); @@ -458,9 +451,8 @@ angular.module('portainer.docker', ['portainer.app']) $stateRegistryProvider.register(tasks); $stateRegistryProvider.register(task); $stateRegistryProvider.register(taskLogs); - $stateRegistryProvider.register(templates); - $stateRegistryProvider.register(templatesLinuxServer); $stateRegistryProvider.register(volumes); $stateRegistryProvider.register(volume); + $stateRegistryProvider.register(volumeBrowse); $stateRegistryProvider.register(volumeCreation); }]); diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.html b/app/docker/components/datatables/configs-datatable/configsDatatable.html index 76b5ec683..7c9e5078f 100644 --- a/app/docker/components/datatables/configs-datatable/configsDatatable.html +++ b/app/docker/components/datatables/configs-datatable/configsDatatable.html @@ -5,11 +5,6 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
- +
diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.js b/app/docker/components/datatables/configs-datatable/configsDatatable.js index 5b31c965e..b6735f28b 100644 --- a/app/docker/components/datatables/configs-datatable/configsDatatable.js +++ b/app/docker/components/datatables/configs-datatable/configsDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.docker').component('configsDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', showOwnershipColumn: '<', removeAction: '<' } diff --git a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html index 0b4ba9454..9da49860c 100644 --- a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html +++ b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html @@ -26,7 +26,7 @@
- +
diff --git a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html index 3284f3e22..5449c012d 100644 --- a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html +++ b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.html @@ -5,18 +5,13 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
-
Network
+
diff --git a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js index 621ff7bf3..8c0dfbffe 100644 --- a/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js +++ b/app/docker/components/datatables/container-processes-datatable/containerProcessesDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.docker').component('containerProcessesDatatable', { headerset: '<', tableKey: '@', orderBy: '@', - reverseOrder: '<', - showTextFilter: '<' + reverseOrder: '<' } }); diff --git a/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js b/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js index 94ce439b3..88980f8f3 100644 --- a/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js +++ b/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js @@ -86,6 +86,7 @@ function ($state, ContainerService, ModalService, Notifications, HttpRequestHelp function removeSelectedContainers(containers, cleanVolumes) { var actionCount = containers.length; angular.forEach(containers, function (container) { + HttpRequestHelper.setPortainerAgentTargetHeader(container.NodeName); ContainerService.remove(container, cleanVolumes) .then(function success() { Notifications.success('Container successfully removed', container.Names[0]); diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.html b/app/docker/components/datatables/containers-datatable/containersDatatable.html index cfaae7d8c..2119d8f35 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatable.html +++ b/app/docker/components/datatables/containers-datatable/containersDatatable.html @@ -6,8 +6,56 @@ {{ $ctrl.titleText }}
- - Search + + Columns +
+
+
+ Show / Hide Columns +
+
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+ + +
+
+
+ Close +
+
+
Settings @@ -59,12 +107,12 @@ no-paused-items-selected="$ctrl.state.noPausedItemsSelected" show-add-action="$ctrl.showAddAction" > -
+
- +
- - - - - + - - - - - - - - - + + + + + -
@@ -78,7 +126,7 @@ + State @@ -105,45 +153,52 @@ + Quick actions + Stack + Image + + + + + Created + + IP Address + Host + Published Ports + Ownership @@ -161,11 +216,11 @@ {{ item | containername | truncate: $ctrl.settings.containerNameTruncateSize }} - + {{ item.Status }} {{ item.Status }} +
@@ -173,17 +228,20 @@
{{ item.StackName ? item.StackName : '-' }}{{ item.Image | trimshasum }}{{ item.IP ? item.IP : '-' }}{{ item.NodeName ? item.NodeName : '-' }} + {{ item.StackName ? item.StackName : '-' }}{{ item.Image | trimshasum }} + {{item.Created | getisodatefromtimestamp}} + {{ item.IP ? item.IP : '-' }}{{ item.NodeName ? item.NodeName : '-' }} {{ p.public }}:{{ p.private }} - + {{ item.ResourceControl.Ownership ? item.ResourceControl.Ownership : item.ResourceControl.Ownership = 'public' }} diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.js b/app/docker/components/datatables/containers-datatable/containersDatatable.js index 5fc7584ce..18a693511 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatable.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.docker').component('containersDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', showOwnershipColumn: '<', showHostColumn: '<', showAddAction: '<' diff --git a/app/docker/components/datatables/containers-datatable/containersDatatableController.js b/app/docker/components/datatables/containers-datatable/containersDatatableController.js index fe97f901a..f7125d7b8 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatableController.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatableController.js @@ -34,6 +34,54 @@ function (PaginationService, DatatableService, EndpointProvider) { } }; + this.columnVisibility = { + state: { + open: false + }, + columns: { + state: { + label: 'State', + display: true + }, + actions: { + label: 'Quick Actions', + display: true + }, + stack: { + label: 'Stack', + display: true + }, + image: { + label: 'Image', + display: true + }, + created: { + label: 'Created', + display: true + }, + ip: { + label: 'IP Address', + display: true + }, + host: { + label: 'Host', + display: true + }, + ports: { + label: 'Published Ports', + display: true + }, + ownership: { + label: 'Ownership', + display: true + } + } + }; + + this.onColumnVisibilityChange = function() { + DatatableService.setColumnVisibilitySettings(this.tableKey, this.columnVisibility); + }; + this.changeOrderBy = function(orderField) { this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; this.state.orderBy = orderField; @@ -93,13 +141,6 @@ function (PaginationService, DatatableService, EndpointProvider) { PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); }; - this.updateDisplayTextFilter = function() { - this.state.displayTextFilter = !this.state.displayTextFilter; - if (!this.state.displayTextFilter) { - delete this.state.textFilter; - } - }; - this.applyFilters = function(value, index, array) { var container = value; var filters = ctrl.filters; @@ -181,6 +222,12 @@ function (PaginationService, DatatableService, EndpointProvider) { this.settings = storedSettings; } this.settings.open = false; + + var storedColumnVisibility = DatatableService.getColumnVisibilitySettings(this.tableKey); + if (storedColumnVisibility !== null) { + this.columnVisibility = storedColumnVisibility; + } + this.columnVisibility.state.open = false; }; function setDefaults(ctrl) { diff --git a/app/docker/components/datatables/events-datatable/eventsDatatable.html b/app/docker/components/datatables/events-datatable/eventsDatatable.html index 90625950b..77bb95c71 100644 --- a/app/docker/components/datatables/events-datatable/eventsDatatable.html +++ b/app/docker/components/datatables/events-datatable/eventsDatatable.html @@ -5,18 +5,13 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
- +
diff --git a/app/docker/components/datatables/events-datatable/eventsDatatable.js b/app/docker/components/datatables/events-datatable/eventsDatatable.js index d81d10314..10ef2976b 100644 --- a/app/docker/components/datatables/events-datatable/eventsDatatable.js +++ b/app/docker/components/datatables/events-datatable/eventsDatatable.js @@ -7,7 +7,6 @@ angular.module('portainer.docker').component('eventsDatatable', { dataset: '<', tableKey: '@', orderBy: '@', - reverseOrder: '<', - showTextFilter: '<' + reverseOrder: '<' } }); diff --git a/app/docker/components/datatables/images-datatable/imagesDatatable.html b/app/docker/components/datatables/images-datatable/imagesDatatable.html index 6816f375b..87cba5507 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatable.html +++ b/app/docker/components/datatables/images-datatable/imagesDatatable.html @@ -5,11 +5,6 @@
{{ $ctrl.titleText }}
-
- - Search - -
@@ -28,13 +23,24 @@ +
+ + +
-
+
- +
diff --git a/app/docker/components/datatables/images-datatable/imagesDatatable.js b/app/docker/components/datatables/images-datatable/imagesDatatable.js index e3d0477a5..615f4375e 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatable.js +++ b/app/docker/components/datatables/images-datatable/imagesDatatable.js @@ -8,9 +8,10 @@ angular.module('portainer.docker').component('imagesDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', showHostColumn: '<', removeAction: '<', - forceRemoveAction: '<' + downloadAction: '<', + forceRemoveAction: '<', + exportInProgress: '<' } }); diff --git a/app/docker/components/datatables/images-datatable/imagesDatatableController.js b/app/docker/components/datatables/images-datatable/imagesDatatableController.js index 34ae18324..c7850a63b 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatableController.js +++ b/app/docker/components/datatables/images-datatable/imagesDatatableController.js @@ -12,7 +12,7 @@ function (PaginationService, DatatableService) { selectedItemCount: 0, selectedItems: [] }; - + this.filters = { usage: { open: false, @@ -52,23 +52,16 @@ function (PaginationService, DatatableService) { PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); }; - this.updateDisplayTextFilter = function() { - this.state.displayTextFilter = !this.state.displayTextFilter; - if (!this.state.displayTextFilter) { - delete this.state.textFilter; - } - }; - this.applyFilters = function(value, index, array) { var image = value; var filters = ctrl.filters; - if ((image.ContainerCount === 0 && filters.usage.showUnusedImages) + if ((image.ContainerCount === 0 && filters.usage.showUnusedImages) || (image.ContainerCount !== 0 && filters.usage.showUsedImages)) { return true; } return false; }; - + this.onUsageFilterChange = function() { var filters = this.filters.usage; var filtered = false; @@ -87,7 +80,7 @@ function (PaginationService, DatatableService) { this.state.reverseOrder = storedOrder.reverse; this.state.orderBy = storedOrder.orderBy; } - + var storedFilters = DatatableService.getDataTableFilters(this.tableKey); if (storedFilters !== null) { this.filters = storedFilters; diff --git a/app/docker/components/datatables/networks-datatable/networksDatatable.html b/app/docker/components/datatables/networks-datatable/networksDatatable.html index eee23d6d4..98fb15791 100644 --- a/app/docker/components/datatables/networks-datatable/networksDatatable.html +++ b/app/docker/components/datatables/networks-datatable/networksDatatable.html @@ -5,11 +5,6 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
-
@@ -109,11 +115,11 @@ - {{ item.Id | truncate:20 }} + {{ item.Id | truncate:40 }} Unused - {{ tag }} + {{ tag }} {{ item.VirtualSize | humansize }} {{ item.Created | getisodatefromtimestamp }}
+
diff --git a/app/docker/components/datatables/networks-datatable/networksDatatable.js b/app/docker/components/datatables/networks-datatable/networksDatatable.js index 5bd04f1aa..2cec0f70c 100644 --- a/app/docker/components/datatables/networks-datatable/networksDatatable.js +++ b/app/docker/components/datatables/networks-datatable/networksDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.docker').component('networksDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', showOwnershipColumn: '<', showHostColumn: '<', removeAction: '<' diff --git a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html index f5d6aa285..81c40551e 100644 --- a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html +++ b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html @@ -5,18 +5,13 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
- +
diff --git a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js index 6df455b9c..f638f4625 100644 --- a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js +++ b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.js @@ -7,7 +7,6 @@ angular.module('portainer.docker').component('nodeTasksDatatable', { dataset: '<', tableKey: '@', orderBy: '@', - reverseOrder: '<', - showTextFilter: '<' + reverseOrder: '<' } }); diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html index 1dc48abd1..20f575f41 100644 --- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html +++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html @@ -5,18 +5,13 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
- +
diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.js b/app/docker/components/datatables/nodes-datatable/nodesDatatable.js index d3e42449b..7a461e5a6 100644 --- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.js +++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.docker').component('nodesDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', showIpAddressColumn: '<', accessToNodeDetails: '<' } diff --git a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html index 6aecaf077..4e6a6c148 100644 --- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html +++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html @@ -5,11 +5,6 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
- +
diff --git a/app/docker/components/datatables/secrets-datatable/secretsDatatable.js b/app/docker/components/datatables/secrets-datatable/secretsDatatable.js index e572901f4..181473aa6 100644 --- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.js +++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.docker').component('secretsDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', showOwnershipColumn: '<', removeAction: '<' } diff --git a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html index 71ee75b3f..433be02d8 100644 --- a/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html +++ b/app/docker/components/datatables/service-tasks-datatable/serviceTasksDatatable.html @@ -1,5 +1,5 @@
- +
diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.html b/app/docker/components/datatables/services-datatable/servicesDatatable.html index 4a63def5c..8d25b3bf1 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatable.html +++ b/app/docker/components/datatables/services-datatable/servicesDatatable.html @@ -5,11 +5,6 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
- +
diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.js b/app/docker/components/datatables/services-datatable/servicesDatatable.js index d8e92200a..ebd81487e 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatable.js +++ b/app/docker/components/datatables/services-datatable/servicesDatatable.js @@ -10,7 +10,6 @@ angular.module('portainer.docker').component('servicesDatatable', { reverseOrder: '<', nodes: '<', agentProxy: '<', - showTextFilter: '<', showOwnershipColumn: '<', showUpdateAction: '<', showAddAction: '<', diff --git a/app/docker/components/datatables/services-datatable/servicesDatatableController.js b/app/docker/components/datatables/services-datatable/servicesDatatableController.js index f34fe2b86..38c39947b 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatableController.js +++ b/app/docker/components/datatables/services-datatable/servicesDatatableController.js @@ -54,13 +54,6 @@ function (PaginationService, DatatableService, EndpointProvider) { PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); }; - this.updateDisplayTextFilter = function() { - this.state.displayTextFilter = !this.state.displayTextFilter; - if (!this.state.displayTextFilter) { - delete this.state.textFilter; - } - }; - this.expandItem = function(item, expanded) { item.Expanded = expanded; if (item.Expanded) { diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html index 8eda2bca2..bbb0e7d18 100644 --- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html +++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html @@ -5,18 +5,13 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
- +
diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.js b/app/docker/components/datatables/tasks-datatable/tasksDatatable.js index 58e54f134..43e8237ac 100644 --- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.js +++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.js @@ -9,7 +9,6 @@ angular.module('portainer.docker').component('tasksDatatable', { orderBy: '@', reverseOrder: '<', nodes: '<', - showTextFilter: '<', showSlotColumn: '<', showLogsButton: '<', agentProxy: '<' diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html index 1a271dfaa..c93f506f4 100644 --- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html +++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html @@ -5,11 +5,6 @@
{{ $ctrl.titleText }}
-
- - Search - -
-
+
- +
diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatable.js b/app/docker/components/datatables/volumes-datatable/volumesDatatable.js index da8119da9..6b946438f 100644 --- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.js +++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.js @@ -8,9 +8,9 @@ angular.module('portainer.docker').component('volumesDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', showOwnershipColumn: '<', showHostColumn: '<', - removeAction: '<' + removeAction: '<', + showBrowseAction: '<' } }); diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js b/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js index ca199faf3..f146f107e 100644 --- a/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js +++ b/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js @@ -12,7 +12,7 @@ function (PaginationService, DatatableService) { selectedItemCount: 0, selectedItems: [] }; - + this.filters = { usage: { open: false, @@ -52,23 +52,16 @@ function (PaginationService, DatatableService) { PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); }; - this.updateDisplayTextFilter = function() { - this.state.displayTextFilter = !this.state.displayTextFilter; - if (!this.state.displayTextFilter) { - delete this.state.textFilter; - } - }; - this.applyFilters = function(value, index, array) { var volume = value; var filters = ctrl.filters; - if ((volume.dangling && filters.usage.showUnusedVolumes) + if ((volume.dangling && filters.usage.showUnusedVolumes) || (!volume.dangling && filters.usage.showUsedVolumes)) { return true; } return false; }; - + this.onUsageFilterChange = function() { var filters = this.filters.usage; var filtered = false; @@ -87,7 +80,7 @@ function (PaginationService, DatatableService) { this.state.reverseOrder = storedOrder.reverse; this.state.orderBy = storedOrder.orderBy; } - + var storedFilters = DatatableService.getDataTableFilters(this.tableKey); if (storedFilters !== null) { this.filters = storedFilters; diff --git a/app/docker/components/dockerSidebarContent/docker-sidebar-content.js b/app/docker/components/dockerSidebarContent/docker-sidebar-content.js index 6530a4bfc..325a3497d 100644 --- a/app/docker/components/dockerSidebarContent/docker-sidebar-content.js +++ b/app/docker/components/dockerSidebarContent/docker-sidebar-content.js @@ -4,9 +4,6 @@ angular.module('portainer.docker').component('dockerSidebarContent', { 'endpointApiVersion': '<', 'swarmManagement': '<', 'standaloneManagement': '<', - 'adminAccess': '<', - 'externalContributions': '<', - 'sidebarToggledOn': '<', - 'currentState': '<' + 'adminAccess': '<' } }); diff --git a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html index 59da699dc..870c959ed 100644 --- a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html +++ b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html @@ -2,10 +2,7 @@ Dashboard
  • - App Templates -
    - LinuxServer.io -
    + App Templates
  • Stacks diff --git a/app/docker/components/imageRegistry/por-image-registry.js b/app/docker/components/imageRegistry/por-image-registry.js index 211499e5b..b41813d94 100644 --- a/app/docker/components/imageRegistry/por-image-registry.js +++ b/app/docker/components/imageRegistry/por-image-registry.js @@ -4,6 +4,11 @@ angular.module('portainer.docker').component('porImageRegistry', { bindings: { 'image': '=', 'registry': '=', - 'autoComplete': '<' + 'autoComplete': '<', + 'labelClass': '@', + 'inputClass': '@' + }, + require: { + form: '^form' } }); diff --git a/app/docker/components/imageRegistry/porImageRegistry.html b/app/docker/components/imageRegistry/porImageRegistry.html index 7153ad1ae..aae64be66 100644 --- a/app/docker/components/imageRegistry/porImageRegistry.html +++ b/app/docker/components/imageRegistry/porImageRegistry.html @@ -1,14 +1,21 @@ -
    - -
    +
    + +
    + ng-model="$ctrl.image" name="image_name" placeholder="e.g. myImage:myTag" required>
    -
    +
    +
    +
    +

    Image name is required.

    +
    +
    +
    diff --git a/app/docker/components/imageRegistry/porImageRegistryController.js b/app/docker/components/imageRegistry/porImageRegistryController.js index 968196938..fbf0df70b 100644 --- a/app/docker/components/imageRegistry/porImageRegistryController.js +++ b/app/docker/components/imageRegistry/porImageRegistryController.js @@ -1,29 +1,29 @@ angular.module('portainer.docker') - .controller('porImageRegistryController', ['$q', 'RegistryService', 'DockerHubService', 'ImageService', 'Notifications', - function ($q, RegistryService, DockerHubService, ImageService, Notifications) { - var ctrl = this; +.controller('porImageRegistryController', ['$q', 'RegistryService', 'DockerHubService', 'ImageService', 'Notifications', +function ($q, RegistryService, DockerHubService, ImageService, Notifications) { + var ctrl = this; - function initComponent() { - $q.all({ - registries: RegistryService.registries(), - dockerhub: DockerHubService.dockerhub(), - availableImages: ctrl.autoComplete ? ImageService.images() : [] - }) - .then(function success(data) { - var dockerhub = data.dockerhub; - var registries = data.registries; - ctrl.availableImages = ImageService.getUniqueTagListFromImages(data.availableImages); - ctrl.availableRegistries = [dockerhub].concat(registries); - if (!ctrl.registry.Id) { - ctrl.registry = dockerhub; - } else { - ctrl.registry = _.find(ctrl.availableRegistries, { 'Id': ctrl.registry.Id }); - } - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to retrieve registries'); - }); + function initComponent() { + $q.all({ + registries: RegistryService.registries(), + dockerhub: DockerHubService.dockerhub(), + availableImages: ctrl.autoComplete ? ImageService.images() : [] + }) + .then(function success(data) { + var dockerhub = data.dockerhub; + var registries = data.registries; + ctrl.availableImages = ImageService.getUniqueTagListFromImages(data.availableImages); + ctrl.availableRegistries = [dockerhub].concat(registries); + if (!ctrl.registry.Id) { + ctrl.registry = dockerhub; + } else { + ctrl.registry = _.find(ctrl.availableRegistries, { 'Id': ctrl.registry.Id }); } + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve registries'); + }); + } - initComponent(); - }]); + initComponent(); +}]); diff --git a/app/docker/components/log-viewer/logViewer.html b/app/docker/components/log-viewer/logViewer.html index 8abda6ee5..9e1f95c02 100644 --- a/app/docker/components/log-viewer/logViewer.html +++ b/app/docker/components/log-viewer/logViewer.html @@ -15,6 +15,16 @@
    +
    +
    + + +
    +
    • @@ -107,8 +102,11 @@ - {{ item.Id | truncate:25 }} - Unused + {{ item.Id | truncate:40 }} + + browse + + Unused {{ item.StackName ? item.StackName : '-' }} {{ item.Driver }}
    - - + + - - + + - - - - - - - - - - + + diff --git a/app/docker/views/images/edit/imageController.js b/app/docker/views/images/edit/imageController.js index 236f1633f..d89cd4dc3 100644 --- a/app/docker/views/images/edit/imageController.js +++ b/app/docker/views/images/edit/imageController.js @@ -1,11 +1,15 @@ angular.module('portainer.docker') -.controller('ImageController', ['$q', '$scope', '$transition$', '$state', '$timeout', 'ImageService', 'RegistryService', 'Notifications', 'HttpRequestHelper', -function ($q, $scope, $transition$, $state, $timeout, ImageService, RegistryService, Notifications, HttpRequestHelper) { +.controller('ImageController', ['$q', '$scope', '$transition$', '$state', '$timeout', 'ImageService', 'RegistryService', 'Notifications', 'HttpRequestHelper', 'ModalService', 'FileSaver', 'Blob', +function ($q, $scope, $transition$, $state, $timeout, ImageService, RegistryService, Notifications, HttpRequestHelper, ModalService, FileSaver, Blob) { $scope.formValues = { Image: '', Registry: '' }; + $scope.state = { + exportInProgress: false + }; + $scope.sortType = 'Order'; $scope.sortReverse = false; @@ -97,6 +101,35 @@ function ($q, $scope, $transition$, $state, $timeout, ImageService, RegistryServ }); }; + function exportImage(image) { + HttpRequestHelper.setPortainerAgentTargetHeader(image.NodeName); + $scope.state.exportInProgress = true; + ImageService.downloadImages([image]) + .then(function success(data) { + var downloadData = new Blob([data.file], { type: 'application/x-tar' }); + FileSaver.saveAs(downloadData, 'images.tar'); + Notifications.success('Image successfully downloaded'); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to download image'); + }) + .finally(function final() { + $scope.state.exportInProgress = false; + }); + } + + $scope.exportImage = function (image) { + if (image.RepoTags.length === 0 || _.includes(image.RepoTags, '')) { + Notifications.warning('', 'Cannot download a untagged image'); + return; + } + + ModalService.confirmImageExport(function (confirmed) { + if(!confirmed) { return; } + exportImage(image); + }); + }; + function initView() { HttpRequestHelper.setPortainerAgentTargetHeader($transition$.params().nodeName); var endpointProvider = $scope.applicationState.endpoint.mode.provider; diff --git a/app/docker/views/images/images.html b/app/docker/views/images/images.html index 9150a3a05..3c8df020a 100644 --- a/app/docker/views/images/images.html +++ b/app/docker/views/images/images.html @@ -15,9 +15,11 @@ -
    - -
    +
    @@ -26,7 +28,7 @@
    -
    +
    Deployment
    @@ -55,10 +57,12 @@
    diff --git a/app/docker/views/images/imagesController.js b/app/docker/views/images/imagesController.js index 8968e5fe7..cb364edad 100644 --- a/app/docker/views/images/imagesController.js +++ b/app/docker/views/images/imagesController.js @@ -1,8 +1,9 @@ angular.module('portainer.docker') -.controller('ImagesController', ['$scope', '$state', 'ImageService', 'Notifications', 'ModalService', 'HttpRequestHelper', -function ($scope, $state, ImageService, Notifications, ModalService, HttpRequestHelper) { +.controller('ImagesController', ['$scope', '$state', 'ImageService', 'Notifications', 'ModalService', 'HttpRequestHelper', 'FileSaver', 'Blob', +function ($scope, $state, ImageService, Notifications, ModalService, HttpRequestHelper, FileSaver, Blob) { $scope.state = { - actionInProgress: false + actionInProgress: false, + exportInProgress: false }; $scope.formValues = { @@ -39,6 +40,57 @@ function ($scope, $state, ImageService, Notifications, ModalService, HttpRequest }); }; + function isAuthorizedToDownload(selectedItems) { + + for (var i = 0; i < selectedItems.length; i++) { + var image = selectedItems[i]; + + var untagged = _.find(image.RepoTags, function (item) { + return item.indexOf('') > -1; + }); + + if (untagged) { + Notifications.warning('', 'Cannot download a untagged image'); + return false; + } + } + + if (_.uniqBy(selectedItems, 'NodeName').length > 1) { + Notifications.warning('', 'Cannot download images from different nodes at the same time'); + return false; + } + + return true; + } + + function exportImages(images) { + HttpRequestHelper.setPortainerAgentTargetHeader(images[0].NodeName); + $scope.state.exportInProgress = true; + ImageService.downloadImages(images) + .then(function success(data) { + var downloadData = new Blob([data.file], { type: 'application/x-tar' }); + FileSaver.saveAs(downloadData, 'images.tar'); + Notifications.success('Image(s) successfully downloaded'); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to download image(s)'); + }) + .finally(function final() { + $scope.state.exportInProgress = false; + }); + } + + $scope.downloadAction = function (selectedItems) { + if (!isAuthorizedToDownload(selectedItems)) { + return; + } + + ModalService.confirmImageExport(function (confirmed) { + if(!confirmed) { return; } + exportImages(selectedItems); + }); + }; + $scope.removeAction = function (selectedItems, force) { var actionCount = selectedItems.length; angular.forEach(selectedItems, function (image) { diff --git a/app/docker/views/images/import/importImageController.js b/app/docker/views/images/import/importImageController.js new file mode 100644 index 000000000..b993a614f --- /dev/null +++ b/app/docker/views/images/import/importImageController.js @@ -0,0 +1,31 @@ +angular.module('portainer.docker') +.controller('ImportImageController', ['$scope', '$state', 'ImageService', 'Notifications', 'HttpRequestHelper', +function ($scope, $state, ImageService, Notifications, HttpRequestHelper) { + + $scope.state = { + actionInProgress: false + }; + + $scope.formValues = { + UploadFile: null, + NodeName: null + }; + + $scope.uploadImage = function() { + $scope.state.actionInProgress = true; + + var nodeName = $scope.formValues.NodeName; + HttpRequestHelper.setPortainerAgentTargetHeader(nodeName); + var file = $scope.formValues.UploadFile; + ImageService.uploadImage(file) + .then(function success() { + Notifications.success('Images successfully uploaded'); + }) + .catch(function error(err) { + Notifications.error('Failure', err.message, 'Unable to upload image'); + }) + .finally(function final() { + $scope.state.actionInProgress = false; + }); + }; +}]); diff --git a/app/docker/views/images/import/importimage.html b/app/docker/views/images/import/importimage.html new file mode 100644 index 000000000..7615080f6 --- /dev/null +++ b/app/docker/views/images/import/importimage.html @@ -0,0 +1,60 @@ + + + + Images > Import image + + + +
    +
    + + + + +
    + Upload +
    +
    + + You can upload a tar archive containing your images. + +
    +
    +
    + + + {{ formValues.UploadFile.name }} + + +
    +
    + +
    +
    + Deployment +
    + + + + +
    + +
    + Actions +
    +
    +
    + + {{ state.formValidationError }} +
    +
    + + +     +     +
    +
    \ No newline at end of file diff --git a/app/docker/views/networks/create/createnetwork.html b/app/docker/views/networks/create/createnetwork.html index 08838fc3a..827f725d3 100644 --- a/app/docker/views/networks/create/createnetwork.html +++ b/app/docker/views/networks/create/createnetwork.html @@ -119,7 +119,7 @@ -
    +
    Deployment
    diff --git a/app/docker/views/networks/networks.html b/app/docker/views/networks/networks.html index 9137d518d..ff0f6edd6 100644 --- a/app/docker/views/networks/networks.html +++ b/app/docker/views/networks/networks.html @@ -12,10 +12,10 @@
    diff --git a/app/docker/views/nodes/edit/node.html b/app/docker/views/nodes/edit/node.html index 6a62bbe4e..b7d733206 100644 --- a/app/docker/views/nodes/edit/node.html +++ b/app/docker/views/nodes/edit/node.html @@ -237,7 +237,7 @@ title-text="Tasks" title-icon="fa-tasks" dataset="tasks" table-key="node-tasks" order-by="Updated" reverse-order="true" - show-text-filter="true" + > diff --git a/app/docker/views/secrets/secrets.html b/app/docker/views/secrets/secrets.html index 19f5bfb3c..850e44fd1 100644 --- a/app/docker/views/secrets/secrets.html +++ b/app/docker/views/secrets/secrets.html @@ -12,7 +12,7 @@ diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html index 11128ea49..d9481adb1 100644 --- a/app/docker/views/services/create/createservice.html +++ b/app/docker/views/services/create/createservice.html @@ -22,9 +22,12 @@ Image configuration -
    - -
    +
    Scheduling @@ -142,7 +145,7 @@
    Command -
    +
    @@ -202,12 +205,12 @@
    Logging
    - +
    @@ -247,10 +250,10 @@
    -
    + - - + + diff --git a/app/docker/views/services/edit/includes/tasks.html b/app/docker/views/services/edit/includes/tasks.html index bda4694c3..e2f8d860a 100644 --- a/app/docker/views/services/edit/includes/tasks.html +++ b/app/docker/views/services/edit/includes/tasks.html @@ -4,7 +4,7 @@ dataset="tasks" table-key="service-tasks" order-by="Updated" reverse-order="true" nodes="nodes" - show-text-filter="true" + show-slot-column="service.Mode !== 'global'" show-logs-button="applicationState.endpoint.apiVersion >= 1.30" agent-proxy="applicationState.endpoint.mode.agentProxy" diff --git a/app/docker/views/services/services.html b/app/docker/views/services/services.html index 3eeea2214..4e666ae73 100644 --- a/app/docker/views/services/services.html +++ b/app/docker/views/services/services.html @@ -12,7 +12,7 @@ diff --git a/app/docker/views/volumes/browse/browseVolumeController.js b/app/docker/views/volumes/browse/browseVolumeController.js new file mode 100644 index 000000000..c8c503bba --- /dev/null +++ b/app/docker/views/volumes/browse/browseVolumeController.js @@ -0,0 +1,11 @@ +angular.module('portainer.docker') +.controller('BrowseVolumeController', ['$scope', '$transition$', +function ($scope, $transition$) { + + function initView() { + $scope.volumeId = $transition$.params().id; + $scope.nodeName = $transition$.params().nodeName; + } + + initView(); +}]); diff --git a/app/docker/views/volumes/browse/browsevolume.html b/app/docker/views/volumes/browse/browsevolume.html new file mode 100644 index 000000000..b77beb87a --- /dev/null +++ b/app/docker/views/volumes/browse/browsevolume.html @@ -0,0 +1,15 @@ + + + + Volumes > {{ volumeId }} > browse + + + +
    +
    + +
    +
    diff --git a/app/docker/views/volumes/create/createvolume.html b/app/docker/views/volumes/create/createvolume.html index 7a4c0401d..0547eef8a 100644 --- a/app/docker/views/volumes/create/createvolume.html +++ b/app/docker/views/volumes/create/createvolume.html @@ -70,7 +70,7 @@ -
    +
    Deployment
    diff --git a/app/docker/views/volumes/volumes.html b/app/docker/views/volumes/volumes.html index 309dd6686..072394f45 100644 --- a/app/docker/views/volumes/volumes.html +++ b/app/docker/views/volumes/volumes.html @@ -10,12 +10,13 @@
    diff --git a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html index 7c0e27679..e69cf040c 100644 --- a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html +++ b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html @@ -5,13 +5,8 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    diff --git a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.js b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.js index 9cc269f33..c97cc3ddc 100644 --- a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.js +++ b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.js @@ -7,7 +7,6 @@ angular.module('extension.storidge').component('storidgeClusterEventsDatatable', dataset: '<', tableKey: '@', orderBy: '@', - reverseOrder: '<', - showTextFilter: '<' + reverseOrder: '<' } }); diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html index ca9fd327b..95e8433ba 100644 --- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html +++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html @@ -5,13 +5,8 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js index 15c88c5e5..3731350dd 100644 --- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js +++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.js @@ -7,7 +7,6 @@ angular.module('extension.storidge').component('storidgeNodesDatatable', { dataset: '<', tableKey: '@', orderBy: '@', - reverseOrder: '<', - showTextFilter: '<' + reverseOrder: '<' } }); diff --git a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html index 24497f375..f41789d26 100644 --- a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html +++ b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html @@ -5,11 +5,6 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    diff --git a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.js b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.js index a593e497f..0d0c60a83 100644 --- a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.js +++ b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.js @@ -8,7 +8,6 @@ angular.module('extension.storidge').component('storidgeProfilesDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', removeAction: '<' } }); diff --git a/app/extensions/storidge/views/cluster/cluster.html b/app/extensions/storidge/views/cluster/cluster.html index 86bfb95af..0adb52fa4 100644 --- a/app/extensions/storidge/views/cluster/cluster.html +++ b/app/extensions/storidge/views/cluster/cluster.html @@ -57,7 +57,7 @@
    diff --git a/app/extensions/storidge/views/monitor/monitor.html b/app/extensions/storidge/views/monitor/monitor.html index dea587435..6521ced89 100644 --- a/app/extensions/storidge/views/monitor/monitor.html +++ b/app/extensions/storidge/views/monitor/monitor.html @@ -116,7 +116,7 @@ diff --git a/app/extensions/storidge/views/profiles/create/createprofile.html b/app/extensions/storidge/views/profiles/create/createprofile.html index 33c1f0bb5..7680d515e 100644 --- a/app/extensions/storidge/views/profiles/create/createprofile.html +++ b/app/extensions/storidge/views/profiles/create/createprofile.html @@ -18,7 +18,7 @@
    -
    +

    This field is required.

    @@ -36,7 +36,7 @@
    -
    +

    This field is required.

    @@ -51,7 +51,7 @@
    -
    +

    This field is required.

    Minimum value for capacity: 1.

    @@ -117,7 +117,7 @@
    -
    +

    A value is required for Min IOPS.

    Minimum value for Min IOPS: 30.

    @@ -126,7 +126,7 @@
    -
    +

    A value is required for Max IOPS.

    Minimum value for Max IOPS: 30.

    @@ -162,7 +162,7 @@
    -
    +

    A value is required for Min bandwidth.

    Minimum value for Min bandwidth: 1.

    @@ -171,7 +171,7 @@
    -
    +

    A value is required for Max bandwidth.

    Minimum value for Max bandwidth: 1.

    diff --git a/app/extensions/storidge/views/profiles/edit/profile.html b/app/extensions/storidge/views/profiles/edit/profile.html index 73d7d4a2f..12994ad5f 100644 --- a/app/extensions/storidge/views/profiles/edit/profile.html +++ b/app/extensions/storidge/views/profiles/edit/profile.html @@ -29,7 +29,7 @@
    -
    +

    This field is required.

    @@ -44,7 +44,7 @@
    -
    +

    This field is required.

    Minimum value for capacity: 1.

    @@ -110,7 +110,7 @@
    -
    +

    A value is required for Min IOPS.

    Minimum value for Min IOPS: 30.

    @@ -119,7 +119,7 @@
    -
    +

    A value is required for Max IOPS.

    Minimum value for Max IOPS: 30.

    @@ -155,7 +155,7 @@
    -
    +

    A value is required for Min bandwidth.

    Minimum value for Min bandwidth: 1.

    @@ -164,7 +164,7 @@
    -
    +

    A value is required for Max bandwidth.

    Minimum value for Max bandwidth: 1.

    diff --git a/app/extensions/storidge/views/profiles/profiles.html b/app/extensions/storidge/views/profiles/profiles.html index cec3a8ddc..092ce37ba 100644 --- a/app/extensions/storidge/views/profiles/profiles.html +++ b/app/extensions/storidge/views/profiles/profiles.html @@ -51,7 +51,7 @@
    diff --git a/app/portainer/__module.js b/app/portainer/__module.js index 6109cc422..a2ad9053d 100644 --- a/app/portainer/__module.js +++ b/app/portainer/__module.js @@ -187,6 +187,17 @@ angular.module('portainer.app', []) } }; + var home = { + name: 'portainer.home', + url: '/home', + views: { + 'content@': { + templateUrl: 'app/portainer/views/home/home.html', + controller: 'HomeController' + } + } + }; + var registries = { name: 'portainer.registries', url: '/registries', @@ -351,6 +362,43 @@ angular.module('portainer.app', []) } }; + var templates = { + name: 'portainer.templates', + url: '/templates', + views: { + 'content@': { + templateUrl: 'app/portainer/views/templates/templates.html', + controller: 'TemplatesController' + } + }, + params: { + key: 'containers', + hide_descriptions: false + } + }; + + var template = { + name: 'portainer.templates.template', + url: '/:id', + views: { + 'content@': { + templateUrl: 'app/portainer/views/templates/edit/template.html', + controller: 'TemplateController' + } + } + }; + + var templateCreation = { + name: 'portainer.templates.new', + url: '/new', + views: { + 'content@': { + templateUrl: 'app/portainer/views/templates/create/createtemplate.html', + controller: 'CreateTemplateController' + } + } + }; + $stateRegistryProvider.register(root); $stateRegistryProvider.register(portainer); $stateRegistryProvider.register(about); @@ -367,6 +415,7 @@ angular.module('portainer.app', []) $stateRegistryProvider.register(group); $stateRegistryProvider.register(groupAccess); $stateRegistryProvider.register(groupCreation); + $stateRegistryProvider.register(home); $stateRegistryProvider.register(registries); $stateRegistryProvider.register(registry); $stateRegistryProvider.register(registryAccess); @@ -382,4 +431,7 @@ angular.module('portainer.app', []) $stateRegistryProvider.register(user); $stateRegistryProvider.register(teams); $stateRegistryProvider.register(team); + $stateRegistryProvider.register(templates); + $stateRegistryProvider.register(template); + $stateRegistryProvider.register(templateCreation); }]); diff --git a/app/portainer/components/datatables/datatable.css b/app/portainer/components/datatables/datatable.css index d30d10ba5..8f95085d5 100644 --- a/app/portainer/components/datatables/datatable.css +++ b/app/portainer/components/datatables/datatable.css @@ -30,8 +30,9 @@ } .datatable .searchBar { - border-top: 1px solid #f6f6f6; - padding: 10px; + border-top: 1px solid #d2d1d1; + border-bottom: 1px solid #d2d1d1; + padding: 8px; } .datatable .searchInput { diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html index d9bd809b8..ce6122f08 100644 --- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html +++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html @@ -5,11 +5,6 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    -
    Name{{ infoData.Name }}Endpoint + {{ endpoint.Name }} + {{ info.NCPU }} {{ info.MemTotal | humansize }} + - {{ info.Swarm && info.Swarm.NodeID !== '' ? 'Swarm' : 'Standalone' }} {{ info.ServerVersion }} + Agent +
    Docker version{{ infoData.ServerVersion }}URL{{ endpoint.URL | stripprotocol }}
    CPU{{ infoData.NCPU }}
    Memory{{ infoData.MemTotal|humansize }}
    Node role{{ infoData.Swarm.ControlAvailable ? 'Manager' : 'Worker' }}Tags + + - + + + + {{ tag }}{{ $last? '' : ', ' }} + + +
    @@ -100,7 +107,7 @@ -
    +
    @@ -108,16 +115,16 @@
    -
    {{ containerData.running }} running
    -
    {{ containerData.stopped }} stopped
    +
    {{ containers | containerswithstatus:'running' }} running
    +
    {{ containers | containerswithstatus:'stopped' }} stopped
    -
    {{ containerData.total }}
    +
    {{ containers.length }}
    Containers
    -
    +
    @@ -125,9 +132,9 @@
    -
    {{ imageData.size|humansize }}
    +
    {{ images | imagestotalsize | humansize }}
    -
    {{ imageData.total }}
    +
    {{ images.length }}
    Images
    @@ -140,7 +147,7 @@
    -
    {{ volumeData.total }}
    +
    {{ volumeCount }}
    Volumes
    @@ -153,7 +160,7 @@
    -
    {{ networkData.total }}
    +
    {{ networkCount }}
    Networks
    diff --git a/app/docker/views/dashboard/dashboardController.js b/app/docker/views/dashboard/dashboardController.js index 4f478bc60..d9bf1b2c4 100644 --- a/app/docker/views/dashboard/dashboardController.js +++ b/app/docker/views/dashboard/dashboardController.js @@ -1,95 +1,33 @@ angular.module('portainer.docker') -.controller('DashboardController', ['$scope', '$q', 'Container', 'ContainerHelper', 'Image', 'Network', 'Volume', 'SystemService', 'ServiceService', 'StackService', 'Notifications', 'EndpointProvider', -function ($scope, $q, Container, ContainerHelper, Image, Network, Volume, SystemService, ServiceService, StackService, Notifications, EndpointProvider) { - - $scope.containerData = { - total: 0 - }; - $scope.imageData = { - total: 0 - }; - $scope.networkData = { - total: 0 - }; - $scope.volumeData = { - total: 0 - }; - - $scope.serviceCount = 0; - $scope.stackCount = 0; - - function prepareContainerData(d) { - var running = 0; - var stopped = 0; - var containers = d; - - for (var i = 0; i < containers.length; i++) { - var item = containers[i]; - if (item.Status.indexOf('Up') !== -1) { - running += 1; - } else if (item.Status.indexOf('Exit') !== -1) { - stopped += 1; - } - } - $scope.containerData.running = running; - $scope.containerData.stopped = stopped; - $scope.containerData.total = containers.length; - } - - function prepareImageData(d) { - var images = d; - var totalImageSize = 0; - for (var i = 0; i < images.length; i++) { - var item = images[i]; - totalImageSize += item.VirtualSize; - } - $scope.imageData.total = images.length; - $scope.imageData.size = totalImageSize; - } - - function prepareVolumeData(d) { - var volumes = d.Volumes; - if (volumes) { - $scope.volumeData.total = volumes.length; - } - } - - function prepareNetworkData(d) { - var networks = d; - $scope.networkData.total = networks.length; - } - - function prepareInfoData(d) { - var info = d; - $scope.infoData = info; - } +.controller('DashboardController', ['$scope', '$q', 'ContainerService', 'ImageService', 'NetworkService', 'VolumeService', 'SystemService', 'ServiceService', 'StackService', 'EndpointService', 'Notifications', 'EndpointProvider', +function ($scope, $q, ContainerService, ImageService, NetworkService, VolumeService, SystemService, ServiceService, StackService, EndpointService, Notifications, EndpointProvider) { function initView() { var endpointMode = $scope.applicationState.endpoint.mode; var endpointId = EndpointProvider.endpointID(); - $q.all([ - Container.query({all: 1}).$promise, - Image.query({}).$promise, - Volume.query({}).$promise, - Network.query({}).$promise, - SystemService.info(), - endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER' ? ServiceService.services() : [], - StackService.stacks( - true, - endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER', - endpointId - ) - ]).then(function (d) { - prepareContainerData(d[0]); - prepareImageData(d[1]); - prepareVolumeData(d[2]); - prepareNetworkData(d[3]); - prepareInfoData(d[4]); - $scope.serviceCount = d[5].length; - $scope.stackCount = d[6].length; - }, function(e) { - Notifications.error('Failure', e, 'Unable to load dashboard data'); + $q.all({ + containers: ContainerService.containers(1), + images: ImageService.images(false), + volumes: VolumeService.volumes(), + networks: NetworkService.networks(true, true, true), + services: endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER' ? ServiceService.services() : [], + stacks: StackService.stacks(true, endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER', endpointId), + info: SystemService.info(), + endpoint: EndpointService.endpoint(endpointId) + }) + .then(function success(data) { + $scope.containers = data.containers; + $scope.images = data.images; + $scope.volumeCount = data.volumes.length; + $scope.networkCount = data.networks.length; + $scope.serviceCount = data.services.length; + $scope.stackCount = data.stacks.length; + $scope.info = data.info; + $scope.endpoint = data.endpoint; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to load dashboard data'); }); } diff --git a/app/docker/views/events/events.html b/app/docker/views/events/events.html index 87ebb9af8..d67e3fc44 100644 --- a/app/docker/views/events/events.html +++ b/app/docker/views/events/events.html @@ -13,7 +13,7 @@ title-text="Events" title-icon="fa-history" dataset="events" table-key="events" order-by="Time" reverse-order="true" - show-text-filter="true" + >
    diff --git a/app/docker/views/images/build/buildimage.html b/app/docker/views/images/build/buildimage.html index f5451cc28..7820c4b9b 100644 --- a/app/docker/views/images/build/buildimage.html +++ b/app/docker/views/images/build/buildimage.html @@ -143,7 +143,7 @@
    - + {{ formValues.UploadFile.name }} @@ -194,7 +194,7 @@
    -
    +
    Deployment
    diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html index 352784788..ac0a13239 100644 --- a/app/docker/views/images/edit/image.html +++ b/app/docker/views/images/edit/image.html @@ -63,9 +63,11 @@
    -
    - -
    +
    @@ -97,6 +99,11 @@
    		{{ image.Id }} +
    +
    diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js index 55ef50a3f..f9994646b 100644 --- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js +++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.app').component('endpointsDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', endpointManagement: '<', accessManagement: '<', removeAction: '<' diff --git a/app/portainer/components/datatables/genericDatatableController.js b/app/portainer/components/datatables/genericDatatableController.js index 676a43880..7fa0143aa 100644 --- a/app/portainer/components/datatables/genericDatatableController.js +++ b/app/portainer/components/datatables/genericDatatableController.js @@ -41,13 +41,6 @@ function (PaginationService, DatatableService) { PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); }; - this.updateDisplayTextFilter = function() { - this.state.displayTextFilter = !this.state.displayTextFilter; - if (!this.state.displayTextFilter) { - delete this.state.textFilter; - } - }; - this.$onInit = function() { setDefaults(this); diff --git a/app/portainer/components/datatables/groups-datatable/groupsDatatable.html b/app/portainer/components/datatables/groups-datatable/groupsDatatable.html index ea9812b01..70d55de3d 100644 --- a/app/portainer/components/datatables/groups-datatable/groupsDatatable.html +++ b/app/portainer/components/datatables/groups-datatable/groupsDatatable.html @@ -5,11 +5,6 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    - +
    diff --git a/app/portainer/components/datatables/groups-datatable/groupsDatatable.js b/app/portainer/components/datatables/groups-datatable/groupsDatatable.js index 58808ba04..101cb7468 100644 --- a/app/portainer/components/datatables/groups-datatable/groupsDatatable.js +++ b/app/portainer/components/datatables/groups-datatable/groupsDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.app').component('groupsDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', accessManagement: '<', removeAction: '<' } diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html index 5c3cae905..3dc8f221d 100644 --- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html +++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html @@ -5,11 +5,6 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    - +
    diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.js b/app/portainer/components/datatables/registries-datatable/registriesDatatable.js index 1ddd0730f..a24a717c8 100644 --- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.js +++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.app').component('registriesDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', accessManagement: '<', removeAction: '<' } diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html index bf6e27818..694eb8014 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html @@ -5,11 +5,6 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    - +
    diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.js b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.js index 6dfa9b7aa..5526d9112 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.js +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.app').component('stacksDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', showOwnershipColumn: '<', removeAction: '<' } diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js index 779d3bbd4..1b223e286 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js @@ -41,13 +41,6 @@ function (PaginationService, DatatableService) { PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); }; - this.updateDisplayTextFilter = function() { - this.state.displayTextFilter = !this.state.displayTextFilter; - if (!this.state.displayTextFilter) { - delete this.state.textFilter; - } - }; - this.$onInit = function() { setDefaults(this); diff --git a/app/portainer/components/datatables/tags-datatable/tagsDatatable.html b/app/portainer/components/datatables/tags-datatable/tagsDatatable.html index 29613f496..c96b0fa17 100644 --- a/app/portainer/components/datatables/tags-datatable/tagsDatatable.html +++ b/app/portainer/components/datatables/tags-datatable/tagsDatatable.html @@ -5,11 +5,6 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    - +
    - +
    diff --git a/app/portainer/components/datatables/tags-datatable/tagsDatatable.js b/app/portainer/components/datatables/tags-datatable/tagsDatatable.js index cc33e7b7a..db4fff3f2 100644 --- a/app/portainer/components/datatables/tags-datatable/tagsDatatable.js +++ b/app/portainer/components/datatables/tags-datatable/tagsDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.app').component('tagsDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', removeAction: '<' } }); diff --git a/app/portainer/components/datatables/teams-datatable/teamsDatatable.html b/app/portainer/components/datatables/teams-datatable/teamsDatatable.html index fe11302e3..9141226ef 100644 --- a/app/portainer/components/datatables/teams-datatable/teamsDatatable.html +++ b/app/portainer/components/datatables/teams-datatable/teamsDatatable.html @@ -5,11 +5,6 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    - +
    - +
    diff --git a/app/portainer/components/datatables/teams-datatable/teamsDatatable.js b/app/portainer/components/datatables/teams-datatable/teamsDatatable.js index e08f52917..e9cd74a3b 100644 --- a/app/portainer/components/datatables/teams-datatable/teamsDatatable.js +++ b/app/portainer/components/datatables/teams-datatable/teamsDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.app').component('teamsDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', removeAction: '<' } }); diff --git a/app/portainer/components/datatables/users-datatable/usersDatatable.html b/app/portainer/components/datatables/users-datatable/usersDatatable.html index f4eb00bbc..df2051f07 100644 --- a/app/portainer/components/datatables/users-datatable/usersDatatable.html +++ b/app/portainer/components/datatables/users-datatable/usersDatatable.html @@ -5,11 +5,6 @@
    {{ $ctrl.titleText }}
    -
    - - Search - -
    -
    +
    - +
    - +
    diff --git a/app/portainer/components/datatables/users-datatable/usersDatatable.js b/app/portainer/components/datatables/users-datatable/usersDatatable.js index d4129c187..ebf2d441c 100644 --- a/app/portainer/components/datatables/users-datatable/usersDatatable.js +++ b/app/portainer/components/datatables/users-datatable/usersDatatable.js @@ -8,7 +8,6 @@ angular.module('portainer.app').component('usersDatatable', { tableKey: '@', orderBy: '@', reverseOrder: '<', - showTextFilter: '<', removeAction: '<', authenticationMethod: '<' } diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html new file mode 100644 index 000000000..dd7dc8be2 --- /dev/null +++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html @@ -0,0 +1,77 @@ +
    +
    + + + + + + +
    + + + {{ $ctrl.model.Name }} + + + + {{ $ctrl.model.Status === 1 ? 'up' : 'down' }} + + + {{ $ctrl.model.Snapshots[0].Time | getisodatefromtimestamp }} + + + + + + Group: {{ $ctrl.model.GroupName }} + +
    + +
    + + + + {{ $ctrl.model.Snapshots[0].StackCount }} stacks + + + {{ $ctrl.model.Snapshots[0].ServiceCount }} services + + + {{ $ctrl.model.Snapshots[0].RunningContainerCount + $ctrl.model.Snapshots[0].StoppedContainerCount }} containers + + - + {{ $ctrl.model.Snapshots[0].RunningContainerCount }} + {{ $ctrl.model.Snapshots[0].StoppedContainerCount }} + + + + {{ $ctrl.model.Snapshots[0].VolumeCount }} volumes + + + {{ $ctrl.model.Snapshots[0].ImageCount }} images + + + + + {{ $ctrl.model.Snapshots[0].Swarm ? 'Swarm' : 'Standalone' }} {{ $ctrl.model.Snapshots[0].DockerVersion }} + Agent + +
    + +
    + + {{ $ctrl.model.Snapshots[0].TotalCPU }} {{ $ctrl.model.Snapshots[0].TotalMemory | humansize }} + - + + No tags + + + + + {{ tag }}{{ $last? '' : ', ' }} + + + +
    + +     +
    +
    diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js new file mode 100644 index 000000000..d04fb25cf --- /dev/null +++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js @@ -0,0 +1,7 @@ +angular.module('portainer.app').component('endpointItem', { + templateUrl: 'app/portainer/components/endpoint-list/endpoint-item/endpointItem.html', + bindings: { + model: '<', + onSelect: '<' + } +}); diff --git a/app/portainer/components/endpoint-list/endpoint-list.js b/app/portainer/components/endpoint-list/endpoint-list.js new file mode 100644 index 000000000..319d6ef08 --- /dev/null +++ b/app/portainer/components/endpoint-list/endpoint-list.js @@ -0,0 +1,18 @@ +angular.module('portainer.app').component('endpointList', { + templateUrl: 'app/portainer/components/endpoint-list/endpointList.html', + controller: function() { + var ctrl = this; + + this.state = { + textFilter: '' + }; + }, + bindings: { + titleText: '@', + titleIcon: '@', + endpoints: '<', + dashboardAction: '<', + snapshotAction: '<', + showSnapshotAction: '<' + } +}); diff --git a/app/portainer/components/endpoint-list/endpointList.html b/app/portainer/components/endpoint-list/endpointList.html new file mode 100644 index 000000000..9110703f9 --- /dev/null +++ b/app/portainer/components/endpoint-list/endpointList.html @@ -0,0 +1,38 @@ +
    + + + +
    +
    + {{ $ctrl.titleText }} +
    +
    + +
    + +
    + +
    + + +
    + +
    + +
    + Loading... +
    +
    + No endpoint available. +
    +
    + +     +     +
    diff --git a/app/portainer/components/forms/group-form/groupForm.html b/app/portainer/components/forms/group-form/groupForm.html index 4a2d64331..9d3b9a8a3 100644 --- a/app/portainer/components/forms/group-form/groupForm.html +++ b/app/portainer/components/forms/group-form/groupForm.html @@ -7,7 +7,7 @@
    -
    +

    This field is required.

    diff --git a/app/portainer/components/forms/template-form/template-form.js b/app/portainer/components/forms/template-form/template-form.js new file mode 100644 index 000000000..2d6e54ee9 --- /dev/null +++ b/app/portainer/components/forms/template-form/template-form.js @@ -0,0 +1,68 @@ +angular.module('portainer.app').component('templateForm', { + templateUrl: 'app/portainer/components/forms/template-form/templateForm.html', + controller: function() { + this.state = { + collapseTemplate: false, + collapseContainer: false, + collapseStack: false, + collapseEnv: false + }; + + this.addPortBinding = function() { + this.model.Ports.push({ containerPort: '', protocol: 'tcp' }); + }; + + this.removePortBinding = function(index) { + this.model.Ports.splice(index, 1); + }; + + this.addVolume = function () { + this.model.Volumes.push({ container: '', bind: '', readonly: false, type: 'auto' }); + }; + + this.removeVolume = function(index) { + this.model.Volumes.splice(index, 1); + }; + + this.addLabel = function () { + this.model.Labels.push({ name: '', value: ''}); + }; + + this.removeLabel = function(index) { + this.model.Labels.splice(index, 1); + }; + + this.addEnvVar = function() { + this.model.Env.push({ type: 1, name: '', label: '', description: '', default: '', preset: true, select: [] }); + }; + + this.removeEnvVar = function(index) { + this.model.Env.splice(index, 1); + }; + + this.addEnvVarValue = function(env) { + env.select.push({ name: '', value: '' }); + }; + + this.removeEnvVarValue = function(env, index) { + env.select.splice(index, 1); + }; + + this.changeEnvVarType = function(env) { + if (env.type === 1) { + env.preset = true; + } else if (env.type === 2) { + env.preset = false; + } + }; + }, + bindings: { + model: '=', + categories: '<', + networks: '<', + formAction: '<', + formActionLabel: '@', + actionInProgress: '<', + showTypeSelector: '<' + } +}); diff --git a/app/portainer/components/forms/template-form/templateForm.html b/app/portainer/components/forms/template-form/templateForm.html new file mode 100644 index 000000000..67832e2ed --- /dev/null +++ b/app/portainer/components/forms/template-form/templateForm.html @@ -0,0 +1,569 @@ +
    + +
    + +
    + +
    +
    +
    +
    +
    +

    This field is required.

    +
    +
    +
    + + +
    + +
    + +
    +
    +
    +
    +
    +

    This field is required.

    +
    +
    +
    + +
    + Template + + expand + collapse + +
    + +
    + +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    + + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + + +
    + +
    + + {{ $item }} + + {{ category }} + + +
    +
    + + +
    +
    + + +
    +
    + +
    + +
    +
    + Stack + + expand + collapse + +
    + +
    + +
    + +
    + +
    +
    +
    +
    +
    +

    This field is required.

    +
    +
    +
    + + +
    + +
    + +
    +
    + +
    + +
    +
    +
    + Container + + expand + collapse + +
    + +
    + + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + + +
    +
    + + + map additional port + +
    +
    + Portainer will automatically assign a port if you leave the host port empty. +
    + +
    +
    +
    + +
    + host + +
    + + + + + +
    + container + +
    + + +
    +
    + + +
    + +
    + +
    +
    +
    + +
    + + +
    +
    + + + map additional volume + +
    +
    + Portainer will automatically create and map a local volume when using the auto option. +
    +
    +
    + +
    + +
    + container + +
    + + +
    +
    + + +
    + +
    + +
    + + +
    + + +
    + host + +
    + + +
    +
    + + +
    +
    + +
    + +
    +
    +
    + + +
    +
    + + + add label + +
    + +
    +
    +
    +
    + name + +
    +
    + value + +
    + +
    +
    +
    + +
    + + +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    + +
    +
    + Environment + + expand + collapse + +
    + +
    + +
    +
    + + + add variable + +
    + +
    +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    + +
    + +
    +
    + +
    +
    +
    +
    + +
    + +
    +
    +
    + +
    + +
    +
    +
    +
    + +
    + +
    +
    +
    +
    + + + add allowed value + +
    + +
    +
    +
    +
    + name + +
    +
    + value + +
    +
    + + +
    +
    +
    +
    + +
    +
    +
    +
    +
    +
    + +
    + +
    + + +
    + Actions +
    +
    +
    + +
    +
    + +
    diff --git a/app/portainer/components/information-panel/information-panel.js b/app/portainer/components/information-panel/information-panel.js new file mode 100644 index 000000000..ea014f619 --- /dev/null +++ b/app/portainer/components/information-panel/information-panel.js @@ -0,0 +1,7 @@ +angular.module('portainer.app').component('informationPanel', { + templateUrl: 'app/portainer/components/information-panel/informationPanel.html', + bindings: { + titleText: '@' + }, + transclude: true +}); diff --git a/app/portainer/components/information-panel/informationPanel.html b/app/portainer/components/information-panel/informationPanel.html new file mode 100644 index 000000000..7407ec823 --- /dev/null +++ b/app/portainer/components/information-panel/informationPanel.html @@ -0,0 +1,14 @@ +
    +
    + + +
    + {{ $ctrl.titleText }} +
    +
    + +
    +     +     +
    +
    diff --git a/app/portainer/components/sidebar-endpoint-selector/sidebar-endpoint-selector.js b/app/portainer/components/sidebar-endpoint-selector/sidebar-endpoint-selector.js deleted file mode 100644 index 32f5ec116..000000000 --- a/app/portainer/components/sidebar-endpoint-selector/sidebar-endpoint-selector.js +++ /dev/null @@ -1,9 +0,0 @@ -angular.module('portainer.app').component('sidebarEndpointSelector', { - templateUrl: 'app/portainer/components/sidebar-endpoint-selector/sidebarEndpointSelector.html', - controller: 'SidebarEndpointSelectorController', - bindings: { - 'endpoints': '<', - 'groups': '<', - 'selectEndpoint': '<' - } -}); diff --git a/app/portainer/components/sidebar-endpoint-selector/sidebarEndpointSelector.html b/app/portainer/components/sidebar-endpoint-selector/sidebarEndpointSelector.html deleted file mode 100644 index 79332e2b0..000000000 --- a/app/portainer/components/sidebar-endpoint-selector/sidebarEndpointSelector.html +++ /dev/null @@ -1,27 +0,0 @@ -
    -
    -
  • - - Change environment - -
    • -
    -
    -
    -
  • Group
    • -
  • - -
    • -
    -
    -
  • Endpoint
    • -
  • - -
    • -
    -
    -
    diff --git a/app/portainer/components/sidebar-endpoint-selector/sidebarEndpointSelectorController.js b/app/portainer/components/sidebar-endpoint-selector/sidebarEndpointSelectorController.js deleted file mode 100644 index ff8d54a57..000000000 --- a/app/portainer/components/sidebar-endpoint-selector/sidebarEndpointSelectorController.js +++ /dev/null @@ -1,34 +0,0 @@ -angular.module('portainer.app') -.controller('SidebarEndpointSelectorController', function () { - var ctrl = this; - - this.state = { - show: false, - selectedGroup: null, - selectedEndpoint: null - }; - - this.selectGroup = function() { - this.availableEndpoints = this.endpoints.filter(function f(endpoint) { - return endpoint.GroupId === ctrl.state.selectedGroup.Id; - }); - }; - - this.$onInit = function() { - this.availableGroups = filterEmptyGroups(this.groups, this.endpoints); - this.availableEndpoints = this.endpoints; - }; - - function filterEmptyGroups(groups, endpoints) { - return groups.filter(function f(group) { - for (var i = 0; i < endpoints.length; i++) { - - var endpoint = endpoints[i]; - if (endpoint.GroupId === group.Id) { - return true; - } - } - return false; - }); - } -}); diff --git a/app/portainer/components/template-list/template-item/template-item.js b/app/portainer/components/template-list/template-item/template-item.js new file mode 100644 index 000000000..aed07d639 --- /dev/null +++ b/app/portainer/components/template-list/template-item/template-item.js @@ -0,0 +1,10 @@ +angular.module('portainer.app').component('templateItem', { + templateUrl: 'app/portainer/components/template-list/template-item/templateItem.html', + bindings: { + model: '=', + onSelect: '<', + onDelete: '<', + showUpdateAction: '<', + showDeleteAction: '<' + } +}); diff --git a/app/portainer/components/template-list/template-item/templateItem.html b/app/portainer/components/template-list/template-item/templateItem.html new file mode 100644 index 000000000..e287c36c9 --- /dev/null +++ b/app/portainer/components/template-list/template-item/templateItem.html @@ -0,0 +1,56 @@ + +
    +
    + + + + + + + + + +
    + + + {{ $ctrl.model.Title }} + + + + + & + + + + {{ $ctrl.model.Type === 1 ? 'container' : 'stack' }} + + + + + + + Update + + + Delete + + +
    + + +
    + + {{ $ctrl.model.Description }} + + + {{ $ctrl.model.Categories.join(', ') }} + +
    + +     + +
    + +
    diff --git a/app/portainer/components/template-list/template-list.js b/app/portainer/components/template-list/template-list.js new file mode 100644 index 000000000..e58a9deda --- /dev/null +++ b/app/portainer/components/template-list/template-list.js @@ -0,0 +1,59 @@ +angular.module('portainer.app').component('templateList', { + templateUrl: 'app/portainer/components/template-list/templateList.html', + controller: function() { + var ctrl = this; + + this.state = { + textFilter: '', + selectedCategory: '', + categories: [], + showContainerTemplates: true + }; + + this.updateCategories = function() { + var availableCategories = []; + + for (var i = 0; i < ctrl.templates.length; i++) { + var template = ctrl.templates[i]; + if ((template.Type === 1 && ctrl.state.showContainerTemplates) || (template.Type === 2 && ctrl.showSwarmStacks) || (template.Type === 3 && !ctrl.showSwarmStacks)) { + availableCategories = availableCategories.concat(template.Categories); + } + } + + this.state.categories = _.sortBy(_.uniq(availableCategories)); + }; + + this.filterByCategory = function(item) { + if (!ctrl.state.selectedCategory) { + return true; + } + + return _.includes(item.Categories, ctrl.state.selectedCategory); + }; + + this.filterByType = function(item) { + if ((item.Type === 1 && ctrl.state.showContainerTemplates) || (item.Type === 2 && ctrl.showSwarmStacks) || (item.Type === 3 && !ctrl.showSwarmStacks)) { + return true; + } + return false; + }; + + this.$onInit = function() { + if (this.showSwarmStacks) { + this.state.showContainerTemplates = false; + } + this.updateCategories(); + }; + }, + bindings: { + titleText: '@', + titleIcon: '@', + templates: '<', + selectAction: '<', + deleteAction: '<', + showSwarmStacks: '<', + showAddAction: '<', + showUpdateAction: '<', + showDeleteAction: '<' + } +}); diff --git a/app/portainer/components/template-list/templateList.html b/app/portainer/components/template-list/templateList.html new file mode 100644 index 000000000..76aa514fb --- /dev/null +++ b/app/portainer/components/template-list/templateList.html @@ -0,0 +1,62 @@ +
    + + + +
    +
    + {{ $ctrl.titleText }} +
    +
    + +
    +
    + + + + + {{ $select.selected }} + + + {{ category }} + + + +
    + +
    + + +
    +
    + +
    + + +
    + +
    + +
    + Loading... +
    +
    + No templates available. +
    +
    + +     +     +
    diff --git a/app/portainer/components/widget-custom-header.js b/app/portainer/components/widget-custom-header.js index 8b309a26e..78d926268 100644 --- a/app/portainer/components/widget-custom-header.js +++ b/app/portainer/components/widget-custom-header.js @@ -7,7 +7,7 @@ angular.module('portainer.app') icon: '=' }, transclude: true, - template: '
    {{titleText}}
    ', + template: '
    {{titleText}}
    ', restrict: 'E' }; return directive; diff --git a/app/portainer/filters/filters.js b/app/portainer/filters/filters.js index bda52fe63..b7d0eef52 100644 --- a/app/portainer/filters/filters.js +++ b/app/portainer/filters/filters.js @@ -138,4 +138,13 @@ angular.module('portainer.app') return 'fa fa-eye'; } }; +}) +.filter('endpointstatusbadge', function () { + 'use strict'; + return function (status) { + if (status === 2) { + return 'danger'; + } + return 'success'; + }; }); diff --git a/app/portainer/helpers/templateHelper.js b/app/portainer/helpers/templateHelper.js index a82c9d10a..9f2dbde97 100644 --- a/app/portainer/helpers/templateHelper.js +++ b/app/portainer/helpers/templateHelper.js @@ -62,14 +62,6 @@ angular.module('portainer.app') templateEnvironment.forEach(function(envvar) { if (envvar.value || envvar.set) { var value = envvar.set ? envvar.set : envvar.value; - if (envvar.type && envvar.type === 'container') { - if (containerMapping === 'BY_CONTAINER_IP') { - var container = envvar.value; - value = container.NetworkSettings.Networks[Object.keys(container.NetworkSettings.Networks)[0]].IPAddress; - } else if (containerMapping === 'BY_CONTAINER_NAME') { - value = $filter('containername')(envvar.value); - } - } env.push(envvar.name + '=' + value); } }); @@ -90,14 +82,14 @@ angular.module('portainer.app') helper.createVolumeBindings = function(volumes, generatedVolumesPile) { volumes.forEach(function (volume) { - if (volume.containerPath) { + if (volume.container) { var binding; if (volume.type === 'auto') { - binding = generatedVolumesPile.pop().Id + ':' + volume.containerPath; - } else if (volume.type !== 'auto' && volume.name) { - binding = volume.name + ':' + volume.containerPath; + binding = generatedVolumesPile.pop().Id + ':' + volume.container; + } else if (volume.type !== 'auto' && volume.bind) { + binding = volume.bind + ':' + volume.container; } - if (volume.readOnly) { + if (volume.readonly) { binding += ':ro'; } volume.binding = binding; @@ -115,21 +107,13 @@ angular.module('portainer.app') return count; }; - helper.filterLinuxServerIOTemplates = function(templates) { - return templates.filter(function f(template) { - var valid = false; - if (template.Categories) { - angular.forEach(template.Categories, function(category) { - if (_.startsWith(category, 'Network')) { - valid = true; - } - }); - } - return valid; - }).map(function(template, idx) { - template.index = idx; - return template; - }); + helper.getUniqueCategories = function(templates) { + var categories = []; + for (var i = 0; i < templates.length; i++) { + var template = templates[i]; + categories = categories.concat(template.Categories); + } + return _.uniq(categories); }; return helper; diff --git a/app/portainer/models/settings.js b/app/portainer/models/settings.js new file mode 100644 index 000000000..16ec568c2 --- /dev/null +++ b/app/portainer/models/settings.js @@ -0,0 +1,30 @@ +function SettingsViewModel(data) { + this.LogoURL = data.LogoURL; + this.BlackListedLabels = data.BlackListedLabels; + this.AuthenticationMethod = data.AuthenticationMethod; + this.LDAPSettings = data.LDAPSettings; + this.AllowBindMountsForRegularUsers = data.AllowBindMountsForRegularUsers; + this.AllowPrivilegedModeForRegularUsers = data.AllowPrivilegedModeForRegularUsers; + this.SnapshotInterval = data.SnapshotInterval; +} + +function LDAPSettingsViewModel(data) { + this.ReaderDN = data.ReaderDN; + this.Password = data.Password; + this.URL = data.URL; + this.SearchSettings = data.SearchSettings; + this.GroupSearchSettings = data.GroupSearchSettings; + this.AutoCreateUsers = data.AutoCreateUsers; +} + +function LDAPSearchSettings(BaseDN, UsernameAttribute, Filter) { + this.BaseDN = BaseDN; + this.UsernameAttribute = UsernameAttribute; + this.Filter = Filter; +} + +function LDAPGroupSearchSettings(GroupBaseDN, GroupAttribute, GroupFilter) { + this.GroupBaseDN = GroupBaseDN; + this.GroupAttribute = GroupAttribute; + this.GroupFilter = GroupFilter; +} diff --git a/app/portainer/models/settings/ldapSettings.js b/app/portainer/models/settings/ldapSettings.js deleted file mode 100644 index 2da574598..000000000 --- a/app/portainer/models/settings/ldapSettings.js +++ /dev/null @@ -1,12 +0,0 @@ -function LDAPSettingsViewModel(data) { - this.ReaderDN = data.ReaderDN; - this.Password = data.Password; - this.URL = data.URL; - this.SearchSettings = data.SearchSettings; -} - -function LDAPSearchSettings(BaseDN, UsernameAttribute, Filter) { - this.BaseDN = BaseDN; - this.UsernameAttribute = UsernameAttribute; - this.Filter = Filter; -} diff --git a/app/portainer/models/settings/settings.js b/app/portainer/models/settings/settings.js deleted file mode 100644 index 4c130b052..000000000 --- a/app/portainer/models/settings/settings.js +++ /dev/null @@ -1,10 +0,0 @@ -function SettingsViewModel(data) { - this.TemplatesURL = data.TemplatesURL; - this.LogoURL = data.LogoURL; - this.BlackListedLabels = data.BlackListedLabels; - this.DisplayExternalContributors = data.DisplayExternalContributors; - this.AuthenticationMethod = data.AuthenticationMethod; - this.LDAPSettings = data.LDAPSettings; - this.AllowBindMountsForRegularUsers = data.AllowBindMountsForRegularUsers; - this.AllowPrivilegedModeForRegularUsers = data.AllowPrivilegedModeForRegularUsers; -} diff --git a/app/portainer/models/status.js b/app/portainer/models/status.js index 292971f26..f1302d391 100644 --- a/app/portainer/models/status.js +++ b/app/portainer/models/status.js @@ -1,5 +1,6 @@ function StatusViewModel(data) { this.Authentication = data.Authentication; + this.Snapshot = data.Snapshot; this.EndpointManagement = data.EndpointManagement; this.Analytics = data.Analytics; this.Version = data.Version; diff --git a/app/portainer/models/template.js b/app/portainer/models/template.js new file mode 100644 index 000000000..0218ce8a2 --- /dev/null +++ b/app/portainer/models/template.js @@ -0,0 +1,145 @@ +function TemplateDefaultModel() { + this.Type = 1; + this.AdministratorOnly = false; + this.Title = ''; + this.Image = ''; + this.Description = ''; + this.Volumes = []; + this.Ports = []; + this.Env = []; + this.Labels = []; + this.RestartPolicy = 'always'; + this.Registry = {}; +} + +function TemplateCreateRequest(model) { + this.Type = model.Type; + this.Name = model.Name; + this.Hostname = model.Hostname; + this.Title = model.Title; + this.Description = model.Description; + this.Note = model.Note; + this.Categories = model.Categories; + this.Platform = model.Platform; + this.Logo = model.Logo; + this.Image = model.Image; + this.Registry = model.Registry.URL; + this.Command = model.Command; + this.Network = model.Network; + this.Privileged = model.Privileged; + this.Interactive = model.Interactive; + this.RestartPolicy = model.RestartPolicy; + this.Labels = model.Labels; + this.Repository = model.Repository; + this.Env = model.Env; + this.AdministratorOnly = model.AdministratorOnly; + + this.Ports = []; + for (var i = 0; i < model.Ports.length; i++) { + var binding = model.Ports[i]; + if (binding.containerPort && binding.protocol) { + var port = binding.hostPort ? binding.hostPort + ':' + binding.containerPort + '/' + binding.protocol: binding.containerPort + '/' + binding.protocol; + this.Ports.push(port); + } + } + + this.Volumes = model.Volumes; +} + +function TemplateUpdateRequest(model) { + TemplateCreateRequest.call(this, model); + this.id = model.Id; +} + +function TemplateViewModel(data) { + this.Id = data.Id; + this.Title = data.title; + this.Type = data.type; + this.Description = data.description; + this.AdministratorOnly = data.AdministratorOnly; + this.Name = data.name; + this.Note = data.note; + this.Categories = data.categories ? data.categories : []; + this.Platform = data.platform ? data.platform : ''; + this.Logo = data.logo; + this.Repository = data.repository; + this.Hostname = data.hostname; + this.Registry = data.registry ? { URL: data.registry } : {}; + this.Image = data.image; + this.Registry = data.registry ? data.registry : ''; + this.Command = data.command ? data.command : ''; + this.Network = data.network ? data.network : ''; + this.Privileged = data.privileged ? data.privileged : false; + this.Interactive = data.interactive ? data.interactive : false; + this.RestartPolicy = data.restart_policy ? data.restart_policy : 'always'; + this.Labels = data.labels ? data.labels : []; + this.Hosts = data.hosts ? data.hosts : []; + this.Env = templateEnv(data); + this.Volumes = templateVolumes(data); + this.Ports = templatePorts(data); +} + +function templatePorts(data) { + var ports = []; + + if (data.ports) { + ports = data.ports.map(function (p) { + var portAndProtocol = _.split(p, '/'); + var hostAndContainerPort = _.split(portAndProtocol[0], ':'); + + return { + hostPort: hostAndContainerPort.length > 1 ? hostAndContainerPort[0] : undefined, + containerPort: hostAndContainerPort.length > 1 ? hostAndContainerPort[1] : hostAndContainerPort[0], + protocol: portAndProtocol[1] + }; + }); + } + + return ports; +} + +function templateVolumes(data) { + var volumes = []; + + if (data.volumes) { + volumes = data.volumes.map(function (v) { + return { + container: v.container, + readonly: v.readonly || false, + type: v.bind ? 'bind' : 'auto', + bind : v.bind ? v.bind : null + }; + }); + } + + return volumes; +} + +function templateEnv(data) { + var env = []; + + if (data.env) { + env = data.env.map(function(envvar) { + envvar.type = 2; + envvar.value = envvar.default ? envvar.default : ''; + + if (envvar.preset) { + envvar.type = 1; + } + + if (envvar.select) { + envvar.type = 3; + for (var i = 0; i < envvar.select.length; i++) { + var allowedValue = envvar.select[i]; + if (allowedValue.default) { + envvar.value = allowedValue.value; + break; + } + } + } + return envvar; + }); + } + + return env; +} diff --git a/app/portainer/rest/endpoint.js b/app/portainer/rest/endpoint.js index 5969212a0..455a27448 100644 --- a/app/portainer/rest/endpoint.js +++ b/app/portainer/rest/endpoint.js @@ -6,6 +6,7 @@ angular.module('portainer.app') get: { method: 'GET', params: { id: '@id' } }, update: { method: 'PUT', params: { id: '@id' } }, updateAccess: { method: 'PUT', params: { id: '@id', action: 'access' } }, - remove: { method: 'DELETE', params: { id: '@id'} } + remove: { method: 'DELETE', params: { id: '@id'} }, + snapshot: { method: 'POST', params: { id: 'snapshot' }} }); }]); diff --git a/app/portainer/rest/template.js b/app/portainer/rest/template.js index 22a8542de..244a50569 100644 --- a/app/portainer/rest/template.js +++ b/app/portainer/rest/template.js @@ -1,6 +1,10 @@ angular.module('portainer.app') -.factory('Template', ['$resource', 'API_ENDPOINT_TEMPLATES', function TemplateFactory($resource, API_ENDPOINT_TEMPLATES) { - return $resource(API_ENDPOINT_TEMPLATES, {}, { - get: {method: 'GET', isArray: true} +.factory('Templates', ['$resource', 'API_ENDPOINT_TEMPLATES', function TemplatesFactory($resource, API_ENDPOINT_TEMPLATES) { + return $resource(API_ENDPOINT_TEMPLATES + '/:id', {}, { + create: { method: 'POST' }, + query: { method: 'GET', isArray: true }, + get: { method: 'GET', params: { id: '@id'} }, + update: { method: 'PUT', params: { id: '@id'} }, + remove: { method: 'DELETE', params: { id: '@id'} } }); }]); diff --git a/app/portainer/services/api/endpointService.js b/app/portainer/services/api/endpointService.js index e7dd9bb97..aa3d57bb6 100644 --- a/app/portainer/services/api/endpointService.js +++ b/app/portainer/services/api/endpointService.js @@ -12,6 +12,10 @@ function EndpointServiceFactory($q, Endpoints, FileUploadService) { return Endpoints.query({}).$promise; }; + service.snapshot = function() { + return Endpoints.snapshot({}, {}).$promise; + }; + service.endpointsByGroup = function(groupId) { var deferred = $q.defer(); @@ -57,7 +61,7 @@ function EndpointServiceFactory($q, Endpoints, FileUploadService) { service.createLocalEndpoint = function() { var deferred = $q.defer(); - FileUploadService.createEndpoint('local', 1, 'unix:///var/run/docker.sock', '', 1, [], false) + FileUploadService.createEndpoint('local', 1, '', '', 1, [], false) .then(function success(response) { deferred.resolve(response.data); }) diff --git a/app/portainer/services/api/stackService.js b/app/portainer/services/api/stackService.js index c32f6bec2..e21da318c 100644 --- a/app/portainer/services/api/stackService.js +++ b/app/portainer/services/api/stackService.js @@ -223,8 +223,8 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic return Stack.update({ endpointId: stack.EndpointId }, { id: stack.Id, StackFileContent: stackFile, Env: env, Prune: prune }).$promise; }; - service.createComposeStackFromFileUpload = function(name, stackFile, endpointId) { - return FileUploadService.createComposeStack(name, stackFile, endpointId); + service.createComposeStackFromFileUpload = function(name, stackFile, env, endpointId) { + return FileUploadService.createComposeStack(name, stackFile, env, endpointId); }; service.createSwarmStackFromFileUpload = function(name, stackFile, env, endpointId) { @@ -245,10 +245,11 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic return deferred.promise; }; - service.createComposeStackFromFileContent = function(name, stackFileContent, endpointId) { + service.createComposeStackFromFileContent = function(name, stackFileContent, env, endpointId) { var payload = { Name: name, - StackFileContent: stackFileContent + StackFileContent: stackFileContent, + Env: env }; return Stack.create({ method: 'string', type: 2, endpointId: endpointId }, payload).$promise; }; @@ -277,14 +278,16 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic return deferred.promise; }; - service.createComposeStackFromGitRepository = function(name, repositoryOptions, endpointId) { + service.createComposeStackFromGitRepository = function(name, repositoryOptions, env, endpointId) { var payload = { Name: name, RepositoryURL: repositoryOptions.RepositoryURL, + RepositoryReferenceName: repositoryOptions.RepositoryReferenceName, ComposeFilePathInRepository: repositoryOptions.ComposeFilePathInRepository, RepositoryAuthentication: repositoryOptions.RepositoryAuthentication, RepositoryUsername: repositoryOptions.RepositoryUsername, - RepositoryPassword: repositoryOptions.RepositoryPassword + RepositoryPassword: repositoryOptions.RepositoryPassword, + Env: env }; return Stack.create({ method: 'repository', type: 2, endpointId: endpointId }, payload).$promise; }; @@ -299,6 +302,7 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic Name: name, SwarmID: swarm.Id, RepositoryURL: repositoryOptions.RepositoryURL, + RepositoryReferenceName: repositoryOptions.RepositoryReferenceName, ComposeFilePathInRepository: repositoryOptions.ComposeFilePathInRepository, RepositoryAuthentication: repositoryOptions.RepositoryAuthentication, RepositoryUsername: repositoryOptions.RepositoryUsername, diff --git a/app/portainer/services/templateService.js b/app/portainer/services/api/templateService.js similarity index 65% rename from app/portainer/services/templateService.js rename to app/portainer/services/api/templateService.js index 57ec07c2f..4d82bf5db 100644 --- a/app/portainer/services/templateService.js +++ b/app/portainer/services/api/templateService.js @@ -1,43 +1,64 @@ angular.module('portainer.app') -.factory('TemplateService', ['$q', 'Template', 'TemplateHelper', 'ImageHelper', 'ContainerHelper', function TemplateServiceFactory($q, Template, TemplateHelper, ImageHelper, ContainerHelper) { +.factory('TemplateService', ['$q', 'Templates', 'TemplateHelper', 'ImageHelper', 'ContainerHelper', +function TemplateServiceFactory($q, Templates, TemplateHelper, ImageHelper, ContainerHelper) { 'use strict'; var service = {}; - service.getTemplates = function(key) { + service.templates = function() { var deferred = $q.defer(); - Template.get({key: key}).$promise + + Templates.query().$promise .then(function success(data) { - var templates = data.map(function (tpl, idx) { - var template; - if (tpl.type === 'stack') { - template = new StackTemplateViewModel(tpl); - } else if (tpl.type === 'container' && key === 'linuxserver.io') { - template = new TemplateLSIOViewModel(tpl); - } else { - template = new TemplateViewModel(tpl); - } - template.index = idx; - return template; + var templates = data.map(function (item) { + return new TemplateViewModel(item); }); - if (key === 'linuxserver.io') { - templates = TemplateHelper.filterLinuxServerIOTemplates(templates); - } deferred.resolve(templates); }) .catch(function error(err) { deferred.reject({ msg: 'Unable to retrieve templates', err: err }); }); + return deferred.promise; }; - service.createTemplateConfiguration = function(template, containerName, network, containerMapping) { + service.template = function(id) { + var deferred = $q.defer(); + + Templates.get({ id: id }).$promise + .then(function success(data) { + var template = new TemplateViewModel(data); + deferred.resolve(template); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve template details', err: err }); + }); + + + return deferred.promise; + }; + + service.delete = function(id) { + return Templates.remove({ id: id }).$promise; + }; + + service.create = function(model) { + var payload = new TemplateCreateRequest(model); + return Templates.create(payload).$promise; + }; + + service.update = function(model) { + var payload = new TemplateUpdateRequest(model); + return Templates.update(payload).$promise; + }; + + service.createTemplateConfiguration = function(template, containerName, network) { var imageConfiguration = ImageHelper.createImageConfigForContainer(template.Image, template.Registry); - var containerConfiguration = service.createContainerConfiguration(template, containerName, network, containerMapping); + var containerConfiguration = service.createContainerConfiguration(template, containerName, network); containerConfiguration.Image = imageConfiguration.fromImage + ':' + imageConfiguration.tag; return containerConfiguration; }; - service.createContainerConfiguration = function(template, containerName, network, containerMapping) { + service.createContainerConfiguration = function(template, containerName, network) { var configuration = TemplateHelper.getDefaultContainerConfiguration(); configuration.HostConfig.NetworkMode = network.Name; configuration.HostConfig.Privileged = template.Privileged; @@ -46,7 +67,7 @@ angular.module('portainer.app') configuration.name = containerName; configuration.Hostname = template.Hostname; configuration.Image = template.Image; - configuration.Env = TemplateHelper.EnvToStringArray(template.Env, containerMapping); + configuration.Env = TemplateHelper.EnvToStringArray(template.Env); configuration.Cmd = ContainerHelper.commandStringToArray(template.Command); var portConfiguration = TemplateHelper.portArrayToPortConfiguration(template.Ports); configuration.HostConfig.PortBindings = portConfiguration.bindings; @@ -63,7 +84,7 @@ angular.module('portainer.app') TemplateHelper.createVolumeBindings(volumes, generatedVolumesPile); volumes.forEach(function (volume) { if (volume.binding) { - configuration.Volumes[volume.containerPath] = {}; + configuration.Volumes[volume.container] = {}; configuration.HostConfig.Binds.push(volume.binding); } }); diff --git a/app/portainer/services/datatableService.js b/app/portainer/services/datatableService.js index 7809c4b1a..2842c948d 100644 --- a/app/portainer/services/datatableService.js +++ b/app/portainer/services/datatableService.js @@ -37,6 +37,10 @@ function DatatableServiceFactory(LocalStorage) { LocalStorage.storeDataTableExpandedItems(key, expandedItems); }; + service.setColumnVisibilitySettings = function(key, columnVisibility) { + LocalStorage.storeColumnVisibilitySettings(key, columnVisibility); + }; + service.getDataTableExpandedItems = function(key) { return LocalStorage.getDataTableExpandedItems(key); }; @@ -49,5 +53,9 @@ function DatatableServiceFactory(LocalStorage) { return LocalStorage.getDataTableSelectedItems(key); }; + service.getColumnVisibilitySettings = function(key) { + return LocalStorage.getColumnVisibilitySettings(key); + }; + return service; }]); diff --git a/app/portainer/services/fileUpload.js b/app/portainer/services/fileUpload.js index aef41e47a..d74cb8f8b 100644 --- a/app/portainer/services/fileUpload.js +++ b/app/portainer/services/fileUpload.js @@ -10,7 +10,6 @@ angular.module('portainer.app') service.buildImage = function(names, file, path) { var endpointID = EndpointProvider.endpointID(); - Upload.setDefaults({ ngfMinSize: 10 }); return Upload.http({ url: 'api/endpoints/' + endpointID + '/docker/build', headers : { @@ -28,6 +27,18 @@ angular.module('portainer.app') }); }; + service.loadImages = function(file) { + var endpointID = EndpointProvider.endpointID(); + return Upload.http({ + url: 'api/endpoints/' + endpointID + '/docker/images/load', + headers : { + 'Content-Type': file.type + }, + data: file, + ignoreLoadingBar: true + }); + }; + service.createSwarmStack = function(stackName, swarmId, file, env, endpointId) { return Upload.upload({ url: 'api/stacks?method=file&type=1&endpointId=' + endpointId, @@ -41,12 +52,13 @@ angular.module('portainer.app') }); }; - service.createComposeStack = function(stackName, file, endpointId) { + service.createComposeStack = function(stackName, file, env, endpointId) { return Upload.upload({ url: 'api/stacks?method=file&type=2&endpointId=' + endpointId, data: { file: file, - Name: stackName + Name: stackName, + Env: Upload.json(env) }, ignoreLoadingBar: true }); @@ -79,7 +91,7 @@ angular.module('portainer.app') data: { Name: name, EndpointType: 3, - GroupID: groupID, + GroupID: groupId, Tags: Upload.json(tags), AzureApplicationID: applicationId, AzureTenantID: tenantId, diff --git a/app/portainer/services/localStorage.js b/app/portainer/services/localStorage.js index c94e0cadc..cb1dadceb 100644 --- a/app/portainer/services/localStorage.js +++ b/app/portainer/services/localStorage.js @@ -77,6 +77,12 @@ angular.module('portainer.app') getSwarmVisualizerSettings: function(key) { return localStorageService.get('swarmvisualizer_' + key); }, + storeColumnVisibilitySettings: function(key, data) { + localStorageService.set('col_visibility_' + key, data); + }, + getColumnVisibilitySettings: function(key) { + return localStorageService.get('col_visibility_' + key); + }, clean: function() { localStorageService.clearAll(); } diff --git a/app/portainer/services/modalService.js b/app/portainer/services/modalService.js index 196b74640..1a16b8e55 100644 --- a/app/portainer/services/modalService.js +++ b/app/portainer/services/modalService.js @@ -46,7 +46,7 @@ angular.module('portainer.app') applyBoxCSS(box); }; - service.customPrompt = function(options) { + service.customPrompt = function(options, optionToggled) { var box = bootbox.prompt({ title: options.title, inputType: options.inputType, @@ -56,7 +56,7 @@ angular.module('portainer.app') }); applyBoxCSS(box); box.find('.bootbox-body').prepend('

    ' + options.message + '

    '); - box.find('.bootbox-input-checkbox').prop('checked', true); + box.find('.bootbox-input-checkbox').prop('checked', optionToggled); }; service.confirmAccessControlUpdate = function(callback, msg) { @@ -139,17 +139,31 @@ angular.module('portainer.app') } }, callback: callback - }); + }, false); }; - service.confirmExperimentalFeature = function(callback) { + service.confirmEndpointSnapshot = function(callback) { service.confirm({ - title: 'Experimental feature', - message: 'This feature is currently experimental, please use with caution.', + title: 'Are you sure?', + message: 'Triggering a manual refresh will poll each endpoint to retrieve its information, this may take a few moments.', buttons: { confirm: { label: 'Continue', - className: 'btn-danger' + className: 'btn-primary' + } + }, + callback: callback + }); + }; + + service.confirmImageExport = function(callback) { + service.confirm({ + title: 'Caution', + message: 'The export may take several minutes, do not navigate away whilst the export is in progress.', + buttons: { + confirm: { + label: 'Continue', + className: 'btn-primary' } }, callback: callback @@ -174,7 +188,7 @@ angular.module('portainer.app') } }, callback: callback - }); + }, false); }; return service; diff --git a/app/portainer/services/stateManager.js b/app/portainer/services/stateManager.js index d27844e60..557c0853c 100644 --- a/app/portainer/services/stateManager.js +++ b/app/portainer/services/stateManager.js @@ -25,8 +25,8 @@ function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, Settin LocalStorage.storeApplicationState(state.application); }; - manager.updateExternalContributions = function(displayExternalContributors) { - state.application.displayExternalContributors = displayExternalContributors; + manager.updateSnapshotInterval = function(interval) { + state.application.snapshotInterval = interval; LocalStorage.storeApplicationState(state.application); }; @@ -34,9 +34,10 @@ function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, Settin state.application.authentication = status.Authentication; state.application.analytics = status.Analytics; state.application.endpointManagement = status.EndpointManagement; + state.application.snapshot = status.Snapshot; state.application.version = status.Version; state.application.logo = settings.LogoURL; - state.application.displayExternalContributors = settings.DisplayExternalContributors; + state.application.snapshotInterval = settings.SnapshotInterval; state.application.validity = moment().unix(); } @@ -116,14 +117,11 @@ function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, Settin return extensions; } - manager.updateEndpointState = function(loading, type, extensions) { + manager.updateEndpointState = function(name, type, extensions) { var deferred = $q.defer(); - if (loading) { - state.loading = true; - } - if (type === 3) { + state.endpoint.name = name; state.endpoint.mode = { provider: 'AZURE' }; LocalStorage.storeEndpointState(state.endpoint); deferred.resolve(); @@ -138,6 +136,7 @@ function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, Settin var endpointMode = InfoHelper.determineEndpointMode(data.info, type); var endpointAPIVersion = parseFloat(data.version.ApiVersion); state.endpoint.mode = endpointMode; + state.endpoint.name = name; state.endpoint.apiVersion = endpointAPIVersion; state.endpoint.extensions = assignExtensions(extensions); LocalStorage.storeEndpointState(state.endpoint); diff --git a/app/portainer/views/auth/authController.js b/app/portainer/views/auth/authController.js index ab65f2163..3642bbf26 100644 --- a/app/portainer/views/auth/authController.js +++ b/app/portainer/views/auth/authController.js @@ -1,6 +1,6 @@ angular.module('portainer.app') -.controller('AuthenticationController', ['$scope', '$state', '$transition$', '$window', '$timeout', '$sanitize', 'Authentication', 'Users', 'UserService', 'EndpointService', 'StateManager', 'EndpointProvider', 'Notifications', 'SettingsService', 'ExtensionManager', -function ($scope, $state, $transition$, $window, $timeout, $sanitize, Authentication, Users, UserService, EndpointService, StateManager, EndpointProvider, Notifications, SettingsService, ExtensionManager) { +.controller('AuthenticationController', ['$scope', '$state', '$transition$', '$sanitize', 'Authentication', 'UserService', 'EndpointService', 'StateManager', 'Notifications', 'SettingsService', +function ($scope, $state, $transition$, $sanitize, Authentication, UserService, EndpointService, StateManager, Notifications, SettingsService) { $scope.logo = StateManager.getState().application.logo; @@ -13,47 +13,13 @@ function ($scope, $state, $transition$, $window, $timeout, $sanitize, Authentica AuthenticationError: '' }; - function redirectToDockerDashboard(endpoint) { - ExtensionManager.initEndpointExtensions(endpoint.Id) - .then(function success(data) { - var extensions = data; - return StateManager.updateEndpointState(true, endpoint.Type, extensions); - }) - .then(function success(data) { - $state.go('docker.dashboard'); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to connect to the Docker endpoint'); - }); - } - - function redirectToAzureDashboard(endpoint) { - StateManager.updateEndpointState(false, endpoint.Type, []) - .then(function success(data) { - $state.go('azure.dashboard'); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to connect to the Docker endpoint'); - }); - } - - function redirectToDashboard(endpoint) { - EndpointProvider.setEndpointID(endpoint.Id); - - if (endpoint.Type === 3) { - return redirectToAzureDashboard(endpoint); - } - redirectToDockerDashboard(endpoint); - } - function unauthenticatedFlow() { EndpointService.endpoints() .then(function success(data) { - var endpoints = data; - if (endpoints.length > 0) { - redirectToDashboard(endpoints[0]); - } else { + if (endpoints.length === 0) { $state.go('portainer.init.endpoint'); + } else { + $state.go('portainer.home'); } }) .catch(function error(err) { @@ -92,13 +58,10 @@ function ($scope, $state, $transition$, $window, $timeout, $sanitize, Authentica .then(function success(data) { var endpoints = data; var userDetails = Authentication.getUserDetails(); - if (endpoints.length > 0) { - redirectToDashboard(endpoints[0]); - } else if (endpoints.length === 0 && userDetails.role === 1) { + if (endpoints.length === 0 && userDetails.role === 1) { $state.go('portainer.init.endpoint'); - } else if (endpoints.length === 0 && userDetails.role === 2) { - Authentication.logout(); - $scope.state.AuthenticationError = 'User not allowed. Please contact your administrator.'; + } else { + $state.go('portainer.home'); } }) .catch(function error() { @@ -114,7 +77,7 @@ function ($scope, $state, $transition$, $window, $timeout, $sanitize, Authentica } if (Authentication.isAuthenticated()) { - $state.go('docker.dashboard'); + $state.go('portainer.home'); } var authenticationEnabled = $scope.applicationState.application.authentication; diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html index cce0f67c7..ff8e7c232 100644 --- a/app/portainer/views/endpoints/create/createendpoint.html +++ b/app/portainer/views/endpoints/create/createendpoint.html @@ -102,7 +102,7 @@
    -
    +

    This field is required.

    @@ -122,7 +122,7 @@
    -
    +

    This field is required.

    @@ -153,7 +153,7 @@
    -
    +

    This field is required.

    @@ -168,7 +168,7 @@
    -
    +

    This field is required.

    @@ -183,7 +183,7 @@
    -
    +

    This field is required.

    diff --git a/app/portainer/views/endpoints/edit/endpointController.js b/app/portainer/views/endpoints/edit/endpointController.js index 378924ccf..137bac012 100644 --- a/app/portainer/views/endpoints/edit/endpointController.js +++ b/app/portainer/views/endpoints/edit/endpointController.js @@ -67,7 +67,7 @@ function ($q, $scope, $state, $transition$, $filter, EndpointService, GroupServi }) .then(function success(data) { var endpoint = data.endpoint; - if (endpoint.URL.indexOf('unix://') === 0) { + if (endpoint.URL.indexOf('unix://') === 0 || endpoint.URL.indexOf('npipe://') === 0) { $scope.endpointType = 'local'; } else { $scope.endpointType = 'remote'; diff --git a/app/portainer/views/endpoints/endpoints.html b/app/portainer/views/endpoints/endpoints.html index cb37ae53e..31591fcdc 100644 --- a/app/portainer/views/endpoints/endpoints.html +++ b/app/portainer/views/endpoints/endpoints.html @@ -27,7 +27,7 @@ - Groups > {{ group.Name }} + Groups > {{ ::group.Name }} diff --git a/app/portainer/views/groups/groups.html b/app/portainer/views/groups/groups.html index ccf33790b..5b95d84b5 100644 --- a/app/portainer/views/groups/groups.html +++ b/app/portainer/views/groups/groups.html @@ -12,7 +12,7 @@ diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html new file mode 100644 index 000000000..d7190ef63 --- /dev/null +++ b/app/portainer/views/home/home.html @@ -0,0 +1,37 @@ + + + + + + + Endpoints + + + + +

    + Welcome to Portainer ! Click on any endpoint in the list below to access management features. +

    +

    + + You do not have access to any environment. Please contact your administrator. +

    + +

    + + Endpoint snapshot is disabled. +

    +     +     + +
    +
    + +
    +
    diff --git a/app/portainer/views/home/homeController.js b/app/portainer/views/home/homeController.js new file mode 100644 index 000000000..88bee800b --- /dev/null +++ b/app/portainer/views/home/homeController.js @@ -0,0 +1,76 @@ +angular.module('portainer.app') +.controller('HomeController', ['$q', '$scope', '$state', 'Authentication', 'EndpointService', 'EndpointHelper', 'GroupService', 'Notifications', 'EndpointProvider', 'StateManager', 'ExtensionManager', 'ModalService', +function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, GroupService, Notifications, EndpointProvider, StateManager, ExtensionManager, ModalService) { + + $scope.goToDashboard = function(endpoint) { + EndpointProvider.setEndpointID(endpoint.Id); + EndpointProvider.setEndpointPublicURL(endpoint.PublicURL); + if (endpoint.Type === 3) { + switchToAzureEndpoint(endpoint); + } else { + switchToDockerEndpoint(endpoint); + } + }; + + function triggerSnapshot() { + EndpointService.snapshot() + .then(function success(data) { + Notifications.success('Success', 'Endpoints updated'); + $state.reload(); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'An error occured during endpoint snapshot'); + }); + } + + $scope.triggerSnapshot = function() { + ModalService.confirmEndpointSnapshot(function (result) { + if(!result) { return; } + triggerSnapshot(); + }); + }; + + function switchToAzureEndpoint(endpoint) { + StateManager.updateEndpointState(endpoint.Name, endpoint.Type, []) + .then(function success() { + $state.go('azure.dashboard'); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to connect to the Azure endpoint'); + }); + } + + function switchToDockerEndpoint(endpoint) { + ExtensionManager.initEndpointExtensions(endpoint.Id) + .then(function success(data) { + var extensions = data; + return StateManager.updateEndpointState(endpoint.Name, endpoint.Type, extensions); + }) + .then(function success() { + $state.go('docker.dashboard'); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to connect to the Docker endpoint'); + }); + } + + function initView() { + $scope.isAdmin = Authentication.getUserDetails().role === 1; + + $q.all({ + endpoints: EndpointService.endpoints(), + groups: GroupService.groups() + }) + .then(function success(data) { + var endpoints = data.endpoints; + var groups = data.groups; + EndpointHelper.mapGroupNameToEndpoint(endpoints, groups); + $scope.endpoints = endpoints; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve endpoint information'); + }); + } + + initView(); +}]); diff --git a/app/portainer/views/init/admin/initAdminController.js b/app/portainer/views/init/admin/initAdminController.js index 4ea75c050..e43f8a0ec 100644 --- a/app/portainer/views/init/admin/initAdminController.js +++ b/app/portainer/views/init/admin/initAdminController.js @@ -1,6 +1,6 @@ angular.module('portainer.app') -.controller('InitAdminController', ['$scope', '$state', '$sanitize', 'Notifications', 'Authentication', 'StateManager', 'UserService', 'EndpointService', 'EndpointProvider', 'ExtensionManager', -function ($scope, $state, $sanitize, Notifications, Authentication, StateManager, UserService, EndpointService, EndpointProvider, ExtensionManager) { +.controller('InitAdminController', ['$scope', '$state', '$sanitize', 'Notifications', 'Authentication', 'StateManager', 'UserService', 'EndpointService', +function ($scope, $state, $sanitize, Notifications, Authentication, StateManager, UserService, EndpointService) { $scope.logo = StateManager.getState().application.logo; @@ -30,20 +30,7 @@ function ($scope, $state, $sanitize, Notifications, Authentication, StateManager if (data.length === 0) { $state.go('portainer.init.endpoint'); } else { - var endpoint = data[0]; - endpointID = endpoint.Id; - EndpointProvider.setEndpointID(endpointID); - ExtensionManager.initEndpointExtensions(endpointID) - .then(function success(data) { - var extensions = data; - return StateManager.updateEndpointState(false, endpoint.Type, extensions); - }) - .then(function success() { - $state.go('docker.dashboard'); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to connect to Docker environment'); - }); + $state.go('portainer.home'); } }) .catch(function error(err) { diff --git a/app/portainer/views/init/endpoint/initEndpoint.html b/app/portainer/views/init/endpoint/initEndpoint.html index 7de38d64e..f6fdb652e 100644 --- a/app/portainer/views/init/endpoint/initEndpoint.html +++ b/app/portainer/views/init/endpoint/initEndpoint.html @@ -77,11 +77,20 @@

    - Manage the Docker environment where Portainer is running using the Unix filesystem socket. + Manage the Docker environment where Portainer is running.

    - Ensure that you have started the Portainer container with the following Docker flag: -v "/var/run/docker.sock:/var/run/docker.sock". + Ensure that you have started the Portainer container with the following Docker flag: +

    +

    + -v "/var/run/docker.sock:/var/run/docker.sock" (Linux). +

    +

    + or +

    +

    + -v \\.\pipe\docker_engine:\\.\pipe\docker_engine (Windows).

    diff --git a/app/portainer/views/init/endpoint/initEndpointController.js b/app/portainer/views/init/endpoint/initEndpointController.js index a7e8f04bc..9a7b64276 100644 --- a/app/portainer/views/init/endpoint/initEndpointController.js +++ b/app/portainer/views/init/endpoint/initEndpointController.js @@ -1,9 +1,9 @@ angular.module('portainer.app') -.controller('InitEndpointController', ['$scope', '$state', 'EndpointService', 'StateManager', 'EndpointProvider', 'Notifications', 'ExtensionManager', -function ($scope, $state, EndpointService, StateManager, EndpointProvider, Notifications, ExtensionManager) { +.controller('InitEndpointController', ['$scope', '$state', 'EndpointService', 'StateManager', 'Notifications', +function ($scope, $state, EndpointService, StateManager, Notifications) { if (!_.isEmpty($scope.applicationState.endpoint)) { - $state.go('docker.dashboard'); + $state.go('portainer.home'); } $scope.logo = StateManager.getState().application.logo; @@ -30,22 +30,13 @@ function ($scope, $state, EndpointService, StateManager, EndpointProvider, Notif $scope.createLocalEndpoint = function() { var name = 'local'; - var URL = 'unix:///var/run/docker.sock'; + var URL = ''; var endpoint; $scope.state.actionInProgress = true; EndpointService.createLocalEndpoint() .then(function success(data) { - endpoint = data; - EndpointProvider.setEndpointID(endpoint.Id); - return ExtensionManager.initEndpointExtensions(endpoint.Id); - }) - .then(function success(data) { - var extensions = data; - return StateManager.updateEndpointState(false, endpoint.Type, extensions); - }) - .then(function success(data) { - $state.go('docker.dashboard'); + $state.go('portainer.home'); }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to connect to the Docker environment'); @@ -92,12 +83,7 @@ function ($scope, $state, EndpointService, StateManager, EndpointProvider, Notif $scope.state.actionInProgress = true; EndpointService.createAzureEndpoint(name, applicationId, tenantId, authenticationKey, 1, []) .then(function success(data) { - endpoint = data; - EndpointProvider.setEndpointID(endpoint.Id); - return StateManager.updateEndpointState(false, endpoint.Type, []); - }) - .then(function success(data) { - $state.go('azure.dashboard'); + $state.go('portainer.home'); }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to connect to the Azure environment'); @@ -112,16 +98,7 @@ function ($scope, $state, EndpointService, StateManager, EndpointProvider, Notif $scope.state.actionInProgress = true; EndpointService.createRemoteEndpoint(name, type, URL, PublicURL, 1, [], TLS, TLSSkipVerify, TLSSKipClientVerify, TLSCAFile, TLSCertFile, TLSKeyFile) .then(function success(data) { - endpoint = data; - EndpointProvider.setEndpointID(endpoint.Id); - return ExtensionManager.initEndpointExtensions(endpoint.Id); - }) - .then(function success(data) { - var extensions = data; - return StateManager.updateEndpointState(false, endpoint.Type, extensions); - }) - .then(function success(data) { - $state.go('docker.dashboard'); + $state.go('portainer.home'); }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to connect to the Docker environment'); diff --git a/app/portainer/views/registries/registries.html b/app/portainer/views/registries/registries.html index 72a7561d3..9a01180ab 100644 --- a/app/portainer/views/registries/registries.html +++ b/app/portainer/views/registries/registries.html @@ -73,7 +73,7 @@ diff --git a/app/portainer/views/settings/authentication/settingsAuthentication.html b/app/portainer/views/settings/authentication/settingsAuthentication.html index 9017b2470..72db0edef 100644 --- a/app/portainer/views/settings/authentication/settingsAuthentication.html +++ b/app/portainer/views/settings/authentication/settingsAuthentication.html @@ -49,11 +49,7 @@
    - When using LDAP authentication, Portainer will delegate user authentication to a LDAP server (exception for the admin user that always uses internal authentication). -

    - - Users still need to be created in Portainer beforehand. -

    + When using LDAP authentication, Portainer will delegate user authentication to a LDAP server and fallback to internal authentication if LDAP authentication fails.
    @@ -182,6 +178,25 @@
    +
    + Automatic user provisioning +
    +
    + + With automatic user provisioning enabled, Portainer will create user(s) automatically with standard user role and assign them to team(s) which matches to LDAP group name(s). If disabled, users must be created in Portainer beforehand. + +
    +
    +
    + + +
    +
    +
    User search configurations
    @@ -229,12 +244,66 @@
    - add search configuration + add user search configuration
    + +
    + Group search configurations +
    + + +
    + +
    + + Extra search configuration + +
    + +
    + +
    + +
    + + +
    + +
    +
    +
    + +
    + +
    +
    + +
    +
    + +
    + + add group search configuration + +
    + +
    +
    diff --git a/app/portainer/views/settings/authentication/settingsAuthenticationController.js b/app/portainer/views/settings/authentication/settingsAuthenticationController.js index f47d01a8f..8c617678b 100644 --- a/app/portainer/views/settings/authentication/settingsAuthenticationController.js +++ b/app/portainer/views/settings/authentication/settingsAuthenticationController.js @@ -21,6 +21,14 @@ function ($q, $scope, Notifications, SettingsService, FileUploadService) { $scope.removeSearchConfiguration = function(index) { $scope.LDAPSettings.SearchSettings.splice(index, 1); }; + + $scope.addGroupSearchConfiguration = function() { + $scope.LDAPSettings.GroupSearchSettings.push({ GroupBaseDN: '', GroupAttribute: '', GroupFilter: '' }); + }; + + $scope.removeGroupSearchConfiguration = function(index) { + $scope.LDAPSettings.GroupSearchSettings.splice(index, 1); + }; $scope.LDAPConnectivityCheck = function() { var settings = $scope.settings; diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html index 83195f3e7..741f8d6cb 100644 --- a/app/portainer/views/settings/settings.html +++ b/app/portainer/views/settings/settings.html @@ -9,6 +9,14 @@
    + +
    + +
    + +
    +
    +
    @@ -63,47 +71,6 @@
    - -
    - App Templates -
    -
    -
    - - -
    -
    -
    -
    - - You can specify the URL to your own template definitions file here. See Portainer documentation for more details. - -
    -
    - -
    - -
    -
    -
    -
    -
    - - -
    -
    -
    diff --git a/app/portainer/views/settings/settingsController.js b/app/portainer/views/settings/settingsController.js index f21d28446..c2b7b2127 100644 --- a/app/portainer/views/settings/settingsController.js +++ b/app/portainer/views/settings/settingsController.js @@ -8,8 +8,6 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ $scope.formValues = { customLogo: false, - customTemplates: false, - externalContributions: false, restrictBindMounts: false, restrictPrivilegedMode: false, labelName: '', @@ -41,11 +39,6 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ settings.LogoURL = ''; } - if (!$scope.formValues.customTemplates) { - settings.TemplatesURL = DEFAULT_TEMPLATES_URL; - } - - settings.DisplayExternalContributors = !$scope.formValues.externalContributions; settings.AllowBindMountsForRegularUsers = !$scope.formValues.restrictBindMounts; settings.AllowPrivilegedModeForRegularUsers = !$scope.formValues.restrictPrivilegedMode; @@ -58,7 +51,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ .then(function success(data) { Notifications.success('Settings updated'); StateManager.updateLogo(settings.LogoURL); - StateManager.updateExternalContributions(settings.DisplayExternalContributors); + StateManager.updateSnapshotInterval(settings.SnapshotInterval); $state.reload(); }) .catch(function error(err) { @@ -77,10 +70,6 @@ function ($scope, $state, Notifications, SettingsService, StateManager, DEFAULT_ if (settings.LogoURL !== '') { $scope.formValues.customLogo = true; } - if (settings.TemplatesURL !== DEFAULT_TEMPLATES_URL) { - $scope.formValues.customTemplates = true; - } - $scope.formValues.externalContributions = !settings.DisplayExternalContributors; $scope.formValues.restrictBindMounts = !settings.AllowBindMountsForRegularUsers; $scope.formValues.restrictPrivilegedMode = !settings.AllowPrivilegedModeForRegularUsers; }) diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index 32c5bed32..d105549c5 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -1,35 +1,32 @@ +
    + + Specify a reference of the repository using the following syntax: branches with refs/heads/branch_name or tags with refs/tags/tag_name. If not specified, will use the default HEAD reference normally the master branch. + +
    +
    + +
    + +
    +
    Indicate the path to the Compose file from the root of your repository. @@ -160,7 +171,7 @@
    -
    +
    Environment
    diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html index ca400809c..85defd1e2 100644 --- a/app/portainer/views/stacks/edit/stack.html +++ b/app/portainer/views/stacks/edit/stack.html @@ -171,7 +171,7 @@ diff --git a/app/portainer/views/tags/tags.html b/app/portainer/views/tags/tags.html index 4d4b27a65..e0fa96e2f 100644 --- a/app/portainer/views/tags/tags.html +++ b/app/portainer/views/tags/tags.html @@ -19,14 +19,15 @@ -
    - +
    +
    -
    +

    This field is required.

    +

    This tag already exists.

    @@ -51,7 +52,7 @@
    diff --git a/app/portainer/views/tags/tagsController.js b/app/portainer/views/tags/tagsController.js index e8da81ec8..37f5eb5d0 100644 --- a/app/portainer/views/tags/tagsController.js +++ b/app/portainer/views/tags/tagsController.js @@ -10,6 +10,17 @@ function ($scope, $state, TagService, Notifications) { Name: '' }; + $scope.checkNameValidity = function(form) { + var valid = true; + for (var i = 0; i < $scope.tags.length; i++) { + if ($scope.formValues.Name === $scope.tags[i].Name) { + valid = false; + break; + } + } + form.name.$setValidity('validName', valid); + }; + $scope.removeAction = function (selectedItems) { var actionCount = selectedItems.length; angular.forEach(selectedItems, function (tag) { diff --git a/app/portainer/views/teams/teams.html b/app/portainer/views/teams/teams.html index ab1088faa..58733a269 100644 --- a/app/portainer/views/teams/teams.html +++ b/app/portainer/views/teams/teams.html @@ -13,14 +13,19 @@ - +
    - -
    -
    - - + +
    + +
    +
    +
    +
    +
    +

    This field is required.

    +

    This team already exists.

    @@ -49,13 +54,10 @@
    - - - {{ state.teamCreationError }} -
    @@ -69,7 +71,7 @@
    diff --git a/app/portainer/views/teams/teamsController.js b/app/portainer/views/teams/teamsController.js index b90e68447..ef9196743 100644 --- a/app/portainer/views/teams/teamsController.js +++ b/app/portainer/views/teams/teamsController.js @@ -2,8 +2,6 @@ angular.module('portainer.app') .controller('TeamsController', ['$q', '$scope', '$state', 'TeamService', 'UserService', 'ModalService', 'Notifications', 'Authentication', function ($q, $scope, $state, TeamService, UserService, ModalService, Notifications, Authentication) { $scope.state = { - userGroupGroupCreationError: '', - validName: false, actionInProgress: false }; @@ -12,7 +10,7 @@ function ($q, $scope, $state, TeamService, UserService, ModalService, Notificati Leaders: [] }; - $scope.checkNameValidity = function() { + $scope.checkNameValidity = function(form) { var valid = true; for (var i = 0; i < $scope.teams.length; i++) { if ($scope.formValues.Name === $scope.teams[i].Name) { @@ -20,19 +18,17 @@ function ($q, $scope, $state, TeamService, UserService, ModalService, Notificati break; } } - $scope.state.validName = valid; - $scope.state.teamCreationError = valid ? '' : 'Team name already existing'; + form.team_name.$setValidity('validName', valid); }; $scope.addTeam = function() { - $scope.state.actionInProgress = true; - $scope.state.teamCreationError = ''; var teamName = $scope.formValues.Name; var leaderIds = []; angular.forEach($scope.formValues.Leaders, function(user) { leaderIds.push(user.Id); }); + $scope.state.actionInProgress = true; TeamService.createTeam(teamName, leaderIds) .then(function success(data) { Notifications.success('Team successfully created', teamName); diff --git a/app/portainer/views/templates/create/createTemplateController.js b/app/portainer/views/templates/create/createTemplateController.js new file mode 100644 index 000000000..57f6c577e --- /dev/null +++ b/app/portainer/views/templates/create/createTemplateController.js @@ -0,0 +1,49 @@ +angular.module('portainer.app') +.controller('CreateTemplateController', ['$q', '$scope', '$state', 'TemplateService', 'TemplateHelper', 'NetworkService', 'Notifications', +function ($q, $scope, $state, TemplateService, TemplateHelper, NetworkService, Notifications) { + + $scope.state = { + actionInProgress: false + }; + + $scope.create = function() { + var model = $scope.model; + + $scope.state.actionInProgress = true; + TemplateService.create(model) + .then(function success() { + Notifications.success('Template successfully created', model.Title); + $state.go('portainer.templates'); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to create template'); + }) + .finally(function final() { + $scope.state.actionInProgress = false; + }); + }; + + function initView() { + $scope.model = new TemplateDefaultModel(); + var provider = $scope.applicationState.endpoint.mode.provider; + var apiVersion = $scope.applicationState.endpoint.apiVersion; + + $q.all({ + templates: TemplateService.templates(), + networks: NetworkService.networks( + provider === 'DOCKER_STANDALONE' || provider === 'DOCKER_SWARM_MODE', + false, + provider === 'DOCKER_SWARM_MODE' && apiVersion >= 1.25 + ) + }) + .then(function success(data) { + $scope.categories = TemplateHelper.getUniqueCategories(data.templates); + $scope.networks = data.networks; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve template details'); + }); + } + + initView(); +}]); diff --git a/app/portainer/views/templates/create/createtemplate.html b/app/portainer/views/templates/create/createtemplate.html new file mode 100644 index 000000000..49dbe20df --- /dev/null +++ b/app/portainer/views/templates/create/createtemplate.html @@ -0,0 +1,24 @@ + + + + Templates > Add template + + + +
    +
    + + + + + +
    +
    diff --git a/app/portainer/views/templates/edit/template.html b/app/portainer/views/templates/edit/template.html new file mode 100644 index 000000000..332354176 --- /dev/null +++ b/app/portainer/views/templates/edit/template.html @@ -0,0 +1,28 @@ + + + + + + + + Templates > {{ ::template.Title }} + + + +
    +
    + + + + + +
    +
    diff --git a/app/portainer/views/templates/edit/templateController.js b/app/portainer/views/templates/edit/templateController.js new file mode 100644 index 000000000..ccf82d228 --- /dev/null +++ b/app/portainer/views/templates/edit/templateController.js @@ -0,0 +1,51 @@ +angular.module('portainer.app') +.controller('TemplateController', ['$q', '$scope', '$state', '$transition$', 'TemplateService', 'TemplateHelper', 'NetworkService', 'Notifications', +function ($q, $scope, $state, $transition$, TemplateService, TemplateHelper, NetworkService, Notifications) { + + $scope.state = { + actionInProgress: false + }; + + $scope.update = function() { + var model = $scope.template; + + $scope.state.actionInProgress = true; + TemplateService.update(model) + .then(function success() { + Notifications.success('Template successfully updated', model.Title); + $state.go('portainer.templates'); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to update template'); + }) + .finally(function final() { + $scope.state.actionInProgress = false; + }); + }; + + function initView() { + var provider = $scope.applicationState.endpoint.mode.provider; + var apiVersion = $scope.applicationState.endpoint.apiVersion; + + var templateId = $transition$.params().id; + $q.all({ + templates: TemplateService.templates(), + template: TemplateService.template(templateId), + networks: NetworkService.networks( + provider === 'DOCKER_STANDALONE' || provider === 'DOCKER_SWARM_MODE', + false, + provider === 'DOCKER_SWARM_MODE' && apiVersion >= 1.25 + ) + }) + .then(function success(data) { + $scope.categories = TemplateHelper.getUniqueCategories(data.templates); + $scope.template = data.template; + $scope.networks = data.networks; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve template details'); + }); + } + + initView(); +}]); diff --git a/app/docker/views/templates/templates.html b/app/portainer/views/templates/templates.html similarity index 70% rename from app/docker/views/templates/templates.html rename to app/portainer/views/templates/templates.html index 3c029d719..a0715ef2b 100644 --- a/app/docker/views/templates/templates.html +++ b/app/portainer/views/templates/templates.html @@ -1,6 +1,6 @@ - + @@ -9,13 +9,9 @@
    -
    +
    - -
    - -
    -     +
    @@ -43,10 +39,12 @@
    -
    - +
    +
    - - + + -
    @@ -212,15 +211,15 @@
    container - +
    - - - + + +
    - +
    @@ -313,7 +312,7 @@
    - +
    @@ -334,6 +333,7 @@ Deploy the container Deployment in progress... + {{ state.formValidationError }}
    @@ -346,124 +346,17 @@
    -
    -
    - - -
    - Category - -
    -     - -
    - - - - - - -
    -     - - -
    -
    - Deployment method -
    -
    -
    -
    -
    - - -
    -
    - - -
    -
    -
    -
    - -
    -
    - Templates -
    -
    -
    - -
    - -
    -
    - - - - - - - - -
    - - {{ tpl.Title }} - - - - - - -
    - - -
    - - {{ tpl.Description }} - - - {{ tpl.Categories.join(', ') }} - -
    - -     - -
    - -
    -
    - Loading... -
    -
    - No templates available. -
    -
    - -     -     +
    +
    diff --git a/app/docker/views/templates/templatesController.js b/app/portainer/views/templates/templatesController.js similarity index 61% rename from app/docker/views/templates/templatesController.js rename to app/portainer/views/templates/templatesController.js index 7ca0dcaa2..30c4119ec 100644 --- a/app/docker/views/templates/templatesController.js +++ b/app/portainer/views/templates/templatesController.js @@ -1,18 +1,11 @@ -angular.module('portainer.docker') -.controller('TemplatesController', ['$scope', '$q', '$state', '$transition$', '$anchorScroll', '$filter', 'ContainerService', 'ContainerHelper', 'ImageService', 'NetworkService', 'TemplateService', 'TemplateHelper', 'VolumeService', 'Notifications', 'PaginationService', 'ResourceControlService', 'Authentication', 'FormValidator', 'SettingsService', 'StackService', 'EndpointProvider', -function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerService, ContainerHelper, ImageService, NetworkService, TemplateService, TemplateHelper, VolumeService, Notifications, PaginationService, ResourceControlService, Authentication, FormValidator, SettingsService, StackService, EndpointProvider) { +angular.module('portainer.app') +.controller('TemplatesController', ['$scope', '$q', '$state', '$transition$', '$anchorScroll', 'ContainerService', 'ImageService', 'NetworkService', 'TemplateService', 'TemplateHelper', 'VolumeService', 'Notifications', 'ResourceControlService', 'Authentication', 'FormValidator', 'SettingsService', 'StackService', 'EndpointProvider', 'ModalService', +function ($scope, $q, $state, $transition$, $anchorScroll, ContainerService, ImageService, NetworkService, TemplateService, TemplateHelper, VolumeService, Notifications, ResourceControlService, Authentication, FormValidator, SettingsService, StackService, EndpointProvider, ModalService) { $scope.state = { selectedTemplate: null, showAdvancedOptions: false, - hideDescriptions: $transition$.params().hide_descriptions, formValidationError: '', - showDeploymentSelector: false, - actionInProgress: false, - filters: { - Categories: '!', - Platform: '!', - Type: 'container' - } + actionInProgress: false }; $scope.formValues = { @@ -22,7 +15,7 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer }; $scope.addVolume = function () { - $scope.state.selectedTemplate.Volumes.push({ containerPath: '', name: '', readOnly: false, type: 'auto' }); + $scope.state.selectedTemplate.Volumes.push({ containerPath: '', bind: '', readonly: false, type: 'auto' }); }; $scope.removeVolume = function(index) { @@ -98,13 +91,45 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer }); } + function createComposeStackFromTemplate(template, userId, accessControlData) { + var stackName = $scope.formValues.name; + + for (var i = 0; i < template.Env.length; i++) { + var envvar = template.Env[i]; + if (envvar.preset) { + envvar.value = envvar.default; + } + } + + var repositoryOptions = { + RepositoryURL: template.Repository.url, + ComposeFilePathInRepository: template.Repository.stackfile + }; + + var endpointId = EndpointProvider.endpointID(); + StackService.createComposeStackFromGitRepository(stackName, repositoryOptions, template.Env, endpointId) + .then(function success(data) { + return ResourceControlService.applyResourceControl('stack', stackName, userId, accessControlData, []); + }) + .then(function success() { + Notifications.success('Stack successfully deployed'); + $state.go('portainer.stacks'); + }) + .catch(function error(err) { + Notifications.warning('Deployment error', err.data.err); + }) + .finally(function final() { + $scope.state.actionInProgress = false; + }); + } + function createStackFromTemplate(template, userId, accessControlData) { var stackName = $scope.formValues.name; for (var i = 0; i < template.Env.length; i++) { var envvar = template.Env[i]; - if (envvar.set) { - envvar.value = envvar.set; + if (envvar.preset) { + envvar.value = envvar.default; } } @@ -144,104 +169,88 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer var templatesKey = $scope.templatesKey; $scope.state.actionInProgress = true; - if (template.Type === 'stack') { + if (template.Type === 2) { createStackFromTemplate(template, userId, accessControlData); + } else if (template.Type === 3) { + createComposeStackFromTemplate(template, userId, accessControlData); } else { createContainerFromTemplate(template, userId, accessControlData); } }; - $scope.unselectTemplate = function() { - var currentTemplateIndex = $scope.state.selectedTemplate.index; - $('#template_' + currentTemplateIndex).toggleClass('template-container--selected'); + $scope.unselectTemplate = function(template) { + template.Selected = false; $scope.state.selectedTemplate = null; }; - $scope.selectTemplate = function(index, pos) { - if ($scope.state.selectedTemplate && $scope.state.selectedTemplate.index !== index) { - $scope.unselectTemplate(); + $scope.selectTemplate = function(template) { + if ($scope.state.selectedTemplate) { + $scope.unselectTemplate($scope.state.selectedTemplate); } - var templates = $filter('filter')($scope.templates, $scope.state.filters, true); - var template = templates[pos]; - if (template === $scope.state.selectedTemplate) { - $scope.unselectTemplate(); - } else { - selectTemplate(index, pos, templates); - } - }; - - function selectTemplate(index, pos, filteredTemplates) { - $('#template_' + index).toggleClass('template-container--selected'); - var selectedTemplate = filteredTemplates[pos]; - $scope.state.selectedTemplate = selectedTemplate; - - if (selectedTemplate.Network) { - $scope.formValues.network = _.find($scope.availableNetworks, function(o) { return o.Name === selectedTemplate.Network; }); + template.Selected = true; + if (template.Network) { + $scope.formValues.network = _.find($scope.availableNetworks, function(o) { return o.Name === template.Network; }); } else { $scope.formValues.network = _.find($scope.availableNetworks, function(o) { return o.Name === 'bridge'; }); } - if (selectedTemplate.Name) { - $scope.formValues.name = selectedTemplate.Name; - } else { - $scope.formValues.name = ''; - } - + $scope.formValues.name = template.Name ? template.Name : ''; + $scope.state.selectedTemplate = template; $anchorScroll('view-top'); - } + }; function createTemplateConfiguration(template) { var network = $scope.formValues.network; var name = $scope.formValues.name; - var containerMapping = determineContainerMapping(network); - return TemplateService.createTemplateConfiguration(template, name, network, containerMapping); + return TemplateService.createTemplateConfiguration(template, name, network); } - function determineContainerMapping(network) { - var containerMapping = 'BY_CONTAINER_IP'; - if (network.Name !== 'bridge') { - containerMapping = 'BY_CONTAINER_NAME'; - } - return containerMapping; - } - - $scope.updateCategories = function(templates, type) { - $scope.state.filters.Categories = '!'; - updateCategories(templates, type); + $scope.deleteTemplate = function(template) { + ModalService.confirmDeletion( + 'Do you want to delete this template?', + function onConfirm(confirmed) { + if(!confirmed) { return; } + deleteTemplate(template); + } + ); }; - function updateCategories(templates, type) { - var availableCategories = []; - angular.forEach(templates, function(template) { - if (template.Type === type) { - availableCategories = availableCategories.concat(template.Categories); - } + function deleteTemplate(template) { + TemplateService.delete(template.Id) + .then(function success() { + Notifications.success('Template successfully deleted'); + var idx = $scope.templates.indexOf(template); + $scope.templates.splice(idx, 1); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove template'); }); - $scope.availableCategories = _.sortBy(_.uniq(availableCategories)); } - function initTemplates(templatesKey, type, provider, apiVersion) { + function initView() { + var userDetails = Authentication.getUserDetails(); + $scope.isAdmin = userDetails.role === 1; + + var endpointMode = $scope.applicationState.endpoint.mode; + var apiVersion = $scope.applicationState.endpoint.apiVersion; + $q.all({ - templates: TemplateService.getTemplates(templatesKey), - containers: ContainerService.containers(0), + templates: TemplateService.templates(), volumes: VolumeService.getVolumes(), networks: NetworkService.networks( - provider === 'DOCKER_STANDALONE' || provider === 'DOCKER_SWARM_MODE', + endpointMode.provider === 'DOCKER_STANDALONE' || endpointMode.provider === 'DOCKER_SWARM_MODE', false, - provider === 'DOCKER_SWARM_MODE' && apiVersion >= 1.25 + endpointMode.provider === 'DOCKER_SWARM_MODE' && apiVersion >= 1.25 ), settings: SettingsService.publicSettings() }) .then(function success(data) { var templates = data.templates; - updateCategories(templates, type); $scope.templates = templates; - $scope.runningContainers = data.containers; $scope.availableVolumes = data.volumes.Volumes; var networks = data.networks; $scope.availableNetworks = networks; - $scope.globalNetworkCount = networks.length; var settings = data.settings; $scope.allowBindMounts = settings.AllowBindMountsForRegularUsers; }) @@ -251,24 +260,5 @@ function ($scope, $q, $state, $transition$, $anchorScroll, $filter, ContainerSer }); } - function initView() { - var templatesKey = $transition$.params().key; - $scope.templatesKey = templatesKey; - - var userDetails = Authentication.getUserDetails(); - $scope.isAdmin = userDetails.role === 1; - - var endpointMode = $scope.applicationState.endpoint.mode; - var apiVersion = $scope.applicationState.endpoint.apiVersion; - - if (templatesKey !== 'linuxserver.io' - && endpointMode.provider === 'DOCKER_SWARM_MODE' && endpointMode.role === 'MANAGER' && apiVersion >= 1.25) { - $scope.state.filters.Type = 'stack'; - $scope.state.showDeploymentSelector = true; - } - - initTemplates(templatesKey, $scope.state.filters.Type, endpointMode.provider, apiVersion); - } - initView(); }]); diff --git a/app/portainer/views/users/users.html b/app/portainer/views/users/users.html index 78ae271b9..145dab962 100644 --- a/app/portainer/views/users/users.html +++ b/app/portainer/views/users/users.html @@ -22,7 +22,7 @@
    - +
    @@ -117,7 +117,7 @@ diff --git a/assets/css/app.css b/assets/css/app.css index 4995217d5..e13a1e66a 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -119,10 +119,14 @@ a[ng-click]{ color: white; } -.fa.blue-icon { +.fa.blue-icon, .fab.blue-icon { color: #337ab7; } +.text-warning { + color: #f0ad4e; +} + .widget .widget-body table tbody .image-tag { font-size: 90% !important; margin-right: 5px; @@ -136,10 +140,15 @@ a[ng-click]{ font-weight: normal; } -.widget .widget-body table tbody td { +.widget .widget-body .nowrap-cells tbody td { white-space: nowrap; } +.widget .widget-body table tbody td { + white-space: normal; + word-break: break-word; +} + .template-widget { height: 100%; } @@ -149,19 +158,13 @@ a[ng-click]{ overflow-y: auto; } -.template-list { +.blocklist { display: flex; flex-direction: column; + padding: 10px; } -.template-logo { - width: 100%; - max-width: 60px; - height: 100%; - max-height: 60px; -} - -.template-container { +.blocklist-item { padding: 0.7rem; margin-bottom: 0.7rem; cursor: pointer; @@ -170,41 +173,70 @@ a[ng-click]{ box-shadow: 0 3px 10px -2px rgba(161, 170, 166, 0.5); } -.template-container--selected { +.blocklist-item--selected { border: 2px solid #333333; background-color: #ececec; color: #2d3e63; } -.template-container:hover { +.blocklist-item:hover { background-color: #ececec; color: #2d3e63; } -.template-main { +.blocklist-item-box { display: flex; } +.blocklist-item-line.endpoint-item { + padding: 4px; +} + +.blocklist-item-line { + display: flex; + justify-content: space-between; +} + +.blocklist-item-logo { + width: 100%; + max-width: 60px; + height: 100%; + max-height: 60px; +} + +.blocklist-item-logo.endpoint-item { + margin: 10px 4px 0 6px; +} + +.blocklist-item-logo.endpoint-item.azure { + margin: 0 0 0 10px; +} + +.blocklist-item-title { + font-size: 1.8em; + font-weight: bold; +} + +.blocklist-item-title.endpoint-item { + font-size: 1em; + font-weight: bold; +} + +.blocklist-item-subtitle { + font-size: 0.9em; + padding-right: 1em; +} + +.blocklist-item-desc { + font-size: 0.9em; + padding-right: 1em; +} + .template-note { padding: 0.5em; font-size: 0.9em; } -.template-title { - font-size: 1.8em; - font-weight: bold; -} - -.template-description { - font-size: 0.9em; - padding-right: 1em; -} - -.template-line { - display: flex; - justify-content: space-between; -} - .nopadding { padding: 0 !important; } @@ -304,8 +336,10 @@ ul.sidebar .sidebar-title { height: auto; } -ul.sidebar .sidebar-title .endpoint-name { +ul.sidebar .sidebar-title.endpoint-name { color: #fff; + text-align: center; + text-indent: 0; } ul.sidebar .sidebar-list a { @@ -708,12 +742,15 @@ ul.sidebar .sidebar-list .sidebar-sublist a.active { .log_viewer { height:100%; overflow-y: scroll; - white-space: pre-wrap; color: black; font-size: .85em; background-color: white; } +.log_viewer.wrap_lines { + white-space: pre-wrap; +} + .log_viewer .inner_line { padding: 0 15px; cursor: pointer; @@ -741,6 +778,16 @@ ul.sidebar .sidebar-list .sidebar-sublist a.active { border-radius: 4px; } +.template-envvar { + padding-bottom: 5px; +} + +.line-separator{ + border-bottom: 1px solid #777; + width: 50%; + margin: 20px auto 10px auto; +} + /*bootbox override*/ .modal-open { padding-right: 0 !important; diff --git a/build/windows/nanoserver/Dockerfile b/build/windows/nanoserver/Dockerfile index ae8a25a39..36919634c 100644 --- a/build/windows/nanoserver/Dockerfile +++ b/build/windows/nanoserver/Dockerfile @@ -1,5 +1,7 @@ FROM microsoft/nanoserver +USER ContainerAdministrator + COPY dist / VOLUME C:\\data diff --git a/distribution/portainer.spec b/distribution/portainer.spec index d38ffc694..41de878c5 100644 --- a/distribution/portainer.spec +++ b/distribution/portainer.spec @@ -1,5 +1,5 @@ Name: portainer -Version: 1.18.1 +Version: 1.19.0 Release: 0 License: Zlib Summary: A lightweight docker management UI diff --git a/gruntfile.js b/gruntfile.js index a3b79f67f..7337b128d 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -31,6 +31,7 @@ module.exports = function (grunt) { 'clean:all', 'before-copy', 'copy:assets', + 'copy:templates', 'after-copy' ]); grunt.registerTask('build', [ @@ -78,6 +79,7 @@ module.exports = function (grunt) { // Project configuration. grunt.initConfig({ + root: 'dist', distdir: 'dist/public', shippedDockerVersion: '18.03.1-ce', pkg: grunt.file.readJSON('package.json'), @@ -163,6 +165,11 @@ gruntfile_cfg.copy = { {dest: '<%= distdir %>/images/', src: '**', expand: true, cwd: 'assets/images/'}, {dest: '<%= distdir %>/ico', src: '**', expand: true, cwd: 'assets/ico'} ] + }, + templates: { + files: [ + { dest: '<%= root %>/', src: 'templates.json', cwd: '' } + ] } }; @@ -269,7 +276,7 @@ function shell_buildBinary(p, a) { function shell_run(arch) { return [ 'docker rm -f portainer', - 'docker run -d -p 9000:9000 -v $(pwd)/dist:/app -v /tmp/portainer:/data -v /var/run/docker.sock:/var/run/docker.sock:z --name portainer portainer/base /app/portainer-linux-' + arch + ' --no-analytics' + 'docker run -d -p 9000:9000 -v $(pwd)/dist:/app -v /tmp/portainer:/data -v /var/run/docker.sock:/var/run/docker.sock:z --name portainer portainer/base /app/portainer-linux-' + arch + ' --no-analytics --template-file /app/templates.json' ].join(';'); } diff --git a/package.json b/package.json index 5a4becede..a6619e4af 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Portainer.io", "name": "portainer", "homepage": "http://portainer.io", - "version": "1.18.1", + "version": "1.19.0", "repository": { "type": "git", "url": "git@github.com:portainer/portainer.git" @@ -23,11 +23,12 @@ "node": ">= 0.8.4" }, "dependencies": { - "@fortawesome/fontawesome-free-webfonts": "^1.0.4", + "@fortawesome/fontawesome-free-webfonts": "^1.0.9", "@uirouter/angularjs": "~1.0.6", "angular": "~1.5.0", "angular-clipboard": "^1.6.2", "angular-cookies": "~1.5.0", + "angular-file-saver": "^1.1.3", "angular-google-analytics": "github:revolunet/angular-google-analytics#~1.1.9", "angular-json-tree": "1.0.1", "angular-jwt": "~0.1.8", diff --git a/templates.json b/templates.json new file mode 100644 index 000000000..bedcd2dd6 --- /dev/null +++ b/templates.json @@ -0,0 +1,828 @@ +[ + { + "type": 1, + "title": "Registry", + "description": "Docker image registry", + "categories": ["docker"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/registry.png", + "image": "registry:latest", + "ports": [ + "5000/tcp" + ], + "volumes": [{ "container": "/var/lib/registry"}] + }, + { + "type": 1, + "title": "Nginx", + "description": "High performance web server", + "categories": ["webserver"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/nginx.png", + "image": "nginx:latest", + "ports": [ + "80/tcp", + "443/tcp" + ], + "volumes": [{"container": "/etc/nginx"}, {"container": "/usr/share/nginx/html"}] + }, + { + "type": 1, + "title": "Httpd", + "description": "Open-source HTTP server", + "categories": ["webserver"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/httpd.png", + "image": "httpd:latest", + "ports": [ + "80/tcp" + ], + "volumes": [{"container": "/usr/local/apache2/htdocs/"}] + }, + { + "type": 1, + "title": "Caddy", + "description": "HTTP/2 web server with automatic HTTPS", + "categories": ["webserver"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/caddy.png", + "image": "abiosoft/caddy:latest", + "ports": [ + "80/tcp", "443/tcp", "2015/tcp" + ], + "volumes": [{"container": "/root/.caddy"}] + }, + { + "type": 1, + "title": "MySQL", + "description": "The most popular open-source database", + "categories": ["database"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/mysql.png", + "image": "mysql:latest", + "env": [ + { + "name": "MYSQL_ROOT_PASSWORD", + "label": "Root password" + } + ], + "ports": [ + "3306/tcp" + ], + "volumes": [{"container": "/var/lib/mysql"}] + }, + { + "type": 1, + "title": "MariaDB", + "description": "Performance beyond MySQL", + "categories": ["database"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/mariadb.png", + "image": "mariadb:latest", + "env": [ + { + "name": "MYSQL_ROOT_PASSWORD", + "label": "Root password" + } + ], + "ports": [ + "3306/tcp" + ], + "volumes": [{"container": "/var/lib/mysql"}] + }, + { + "type": 1, + "title": "PostgreSQL", + "description": "The most advanced open-source database", + "categories": ["database"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/postgres.png", + "image": "postgres:latest", + "env": [ + { + "name": "POSTGRES_USER", + "label": "Superuser" + }, + { + "name": "POSTGRES_PASSWORD", + "label": "Superuser password" + } + ], + "ports": [ + "5432/tcp" + ], + "volumes": [{"container": "/var/lib/postgresql/data"}] + }, + { + "type": 1, + "title": "Mongo", + "description": "Open-source document-oriented database", + "categories": ["database"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/mongo.png", + "image": "mongo:latest", + "ports": [ + "27017/tcp" + ], + "volumes": [{"container": "/data/db"}] + }, + { + "type": 1, + "title": "CockroachDB", + "description": "An open-source, survivable, strongly consistent, scale-out SQL database", + "categories": ["database"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/cockroachdb.png", + "image": "cockroachdb/cockroach:latest", + "ports": [ + "26257/tcp", + "8080/tcp" + ], + "volumes": [{"container": "/cockroach/cockroach-data"}], + "command": "start --insecure" + }, + { + "type": 1, + "title": "CrateDB", + "description": "An open-source distributed SQL database", + "categories": ["database"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/cratedb.png", + "image": "crate:latest", + "ports": [ + "4200/tcp", + "4300/tcp" + ], + "volumes": [{"container": "/data"}] + }, + { + "type": 1, + "title": "Elasticsearch", + "description": "Open-source search and analytics engine", + "categories": ["database"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/elasticsearch.png", + "image": "elasticsearch:latest", + "ports": [ + "9200/tcp", + "9300/tcp" + ], + "volumes": [{"container": "/usr/share/elasticsearch/data"}] + }, + { + "type": 1, + "title": "Gitlab CE", + "description": "Open-source end-to-end software development platform", + "note": "Default username is root. Check the Gitlab documentation to get started.", + "categories": ["development", "project-management"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/gitlab_ce.png", + "image": "gitlab/gitlab-ce:latest", + "ports": [ + "80/tcp", + "443/tcp", + "22/tcp" + ], + "volumes": [ + { "container": "/etc/gitlab" }, + { "container": "/var/log/gitlab" }, + { "container": "/var/opt/gitlab" } + ] + }, + { + "type": 1, + "title": "Minio", + "description": "A distributed object storage server built for cloud applications and devops", + "categories": ["storage"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/minio.png", + "image": "minio/minio:latest", + "ports": [ + "9000/tcp" + ], + "env": [ + { + "name": "MINIO_ACCESS_KEY", + "label": "Minio access key" + }, + { + "name": "MINIO_SECRET_KEY", + "label": "Minio secret key" + } + ], + "volumes": [{"container": "/data"}, {"container": "/root/.minio"}], + "command": "server /data" + }, + { + "type": 1, + "title": "Scality S3", + "description": "Standalone AWS S3 protocol server", + "categories": ["storage"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/scality-s3.png", + "image": "scality/s3server", + "ports": [ + "8000/tcp" + ], + "env": [ + { + "name": "SCALITY_ACCESS_KEY", + "label": "Scality S3 access key" + }, + { + "name": "SCALITY_SECRET_KEY", + "label": "Scality S3 secret key" + } + ], + "volumes": [{"container": "/usr/src/app/localData"}, {"container": "/usr/src/app/localMetadata"}] + }, + { + "type": 1, + "title": "SQL Server", + "description": "Microsoft SQL Server on Linux", + "categories": ["database"], + "platform": "linux", + "note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.", + "logo": "https://portainer.io/images/logos/microsoft.png", + "image": "microsoft/mssql-server-linux:2017-GA", + "ports": [ + "1433/tcp" + ], + "env": [ + { + "name": "ACCEPT_EULA", + "set": "Y" + }, + { + "name": "SA_PASSWORD", + "label": "SA password" + } + ] + }, + { + "type": 1, + "title": "SQL Server", + "description": "Microsoft SQL Server Developer for Windows containers", + "categories": ["database"], + "platform": "windows", + "note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.", + "logo": "https://portainer.io/images/logos/microsoft.png", + "image": "microsoft/mssql-server-windows-developer:latest", + "ports": [ + "1433/tcp" + ], + "env": [ + { + "name": "ACCEPT_EULA", + "set": "Y" + }, + { + "name": "sa_password", + "label": "SA password" + } + ], + "volumes": [{"container": "C:/temp/"}] + }, + { + "type": 1, + "title": "SQL Server Express", + "description": "Microsoft SQL Server Express for Windows containers", + "categories": ["database"], + "platform": "windows", + "note": "Password needs to include at least 8 characters including uppercase, lowercase letters, base-10 digits and/or non-alphanumeric symbols.", + "logo": "https://portainer.io/images/logos/microsoft.png", + "image": "microsoft/mssql-server-windows-express:latest", + "ports": [ + "1433/tcp" + ], + "env": [ + { + "name": "ACCEPT_EULA", + "set": "Y" + }, + { + "name": "sa_password", + "label": "SA password" + } + ], + "volumes": [{"container": "C:/temp/"}] + }, + { + "type": 1, + "title": "IronFunctions API", + "description": "Open-source serverless computing platform", + "categories": ["serverless"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/ironfunctions.png", + "image": "iron/functions:latest", + "ports": [ + "8080/tcp" + ], + "volumes": [{"container": "/app/data"}], + "privileged": true + }, + { + "type": 1, + "title": "IronFunctions UI", + "description": "Open-source user interface for IronFunctions", + "categories": ["serverless"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/ironfunctions.png", + "image": "iron/functions-ui:latest", + "ports": [ + "4000/tcp" + ], + "volumes": [{"container": "/app/data"}], + "env": [ + { + "name": "API_URL", + "label": "API URL" + } + ], + "privileged": true + }, + { + "type": 1, + "title": "Solr", + "description": "Open-source enterprise search platform", + "categories": ["search-engine"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/solr.png", + "image": "solr:latest", + "ports": [ + "8983/tcp" + ], + "volumes": [{"container": "/opt/solr/mydata"}] + }, + { + "type": 1, + "title": "Redis", + "description": "Open-source in-memory data structure store", + "categories": ["database"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/redis.png", + "image": "redis:latest", + "ports": [ + "6379/tcp" + ], + "volumes": [{"container": "/data"}] + }, + { + "type": 1, + "title": "RabbitMQ", + "description": "Highly reliable enterprise messaging system", + "categories": ["messaging"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/rabbitmq.png", + "image": "rabbitmq:latest", + "ports": [ + "5671/tcp", + "5672/tcp" + ], + "volumes": [{"container": "/var/lib/rabbitmq"}] + }, + { + "type": 1, + "title": "Ghost", + "description": "Free and open-source blogging platform", + "categories": ["blog"], + "note": "Access the blog management interface under /ghost/.", + "platform": "linux", + "logo": "https://portainer.io/images/logos/ghost.png", + "image": "ghost:latest", + "ports": [ + "2368/tcp" + ], + "volumes": [{"container": "/var/lib/ghost/content"}] + }, + { + "type": 1, + "title": "Plesk", + "description": "WebOps platform and hosting control panel", + "categories": ["CMS"], + "platform": "linux", + "note": "Default credentials: admin / changeme", + "logo": "https://portainer.io/images/logos/plesk.png", + "image": "plesk/plesk:preview", + "ports": [ + "21/tcp", "80/tcp", "443/tcp", "8880/tcp", "8443/tcp", "8447/tcp" + ] + }, + { + "type": 1, + "title": "Joomla", + "description": "Another free and open-source CMS", + "categories": ["CMS"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/joomla.png", + "image": "joomla:latest", + "env": [ + { + "name": "JOOMLA_DB_HOST", + "label": "MySQL database host", + "type": "container" + }, + { + "name": "JOOMLA_DB_PASSWORD", + "label": "Database password" + } + ], + "ports": [ + "80/tcp" + ], + "volumes": [{"container": "/var/www/html"}] + }, + { + "type": 1, + "title": "Drupal", + "description": "Open-source content management framework", + "categories": ["CMS"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/drupal.png", + "image": "drupal:latest", + "ports": [ + "80/tcp" + ], + "volumes": [{"container": "/var/www/html"}] + }, + { + "type": 1, + "title": "Plone", + "description": "A free and open-source CMS built on top of Zope", + "categories": ["CMS"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/plone.png", + "image": "plone:latest", + "ports": [ + "8080/tcp" + ], + "volumes": [{"container": "/data"}] + }, + { + "type": 1, + "title": "Magento 2", + "description": "Open-source e-commerce platform", + "categories": ["CMS"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/magento.png", + "image": "alankent/gsd:latest", + "ports": [ + "80/tcp", + "3000/tcp", + "3001/tcp" + ], + "volumes": [{"container": "/var/www/html/"}] + }, + { + "type": 1, + "title": "Sematext Docker Agent", + "description": "Collect logs, metrics and docker events", + "categories": ["Log Management", "Monitoring"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/sematext_agent.png", + "image": "sematext/sematext-agent-docker:latest", + "name": "sematext-agent", + "privileged": true, + "env": [ + { + "name": "LOGSENE_TOKEN", + "label": "Logs token" + }, + { + "name": "SPM_TOKEN", + "label": "SPM monitoring token" + } + ], + "volumes": [ + { + "container": "/var/run/docker.sock", + "bind": "/var/run/docker.sock" + } + ] + }, + { + "type": 1, + "title": "Mautic", + "description": "Open-source marketing automation platform", + "categories": ["marketing"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/mautic.png", + "image": "mautic/mautic:latest", + "env": [ + { + "name": "MAUTIC_DB_HOST", + "label": "MySQL database host", + "type": "container" + }, + { + "name": "MAUTIC_DB_PASSWORD", + "label": "Database password" + } + ], + "ports": [ + "80/tcp" + ], + "volumes": [{"container": "/var/www/html"}] + }, + { + "type": 1, + "title": "Wowza", + "description": "Streaming media server", + "categories": ["streaming"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/wowza.png", + "image": "sameersbn/wowza:4.1.2-8", + "env": [ + { + "name": "WOWZA_ACCEPT_LICENSE", + "label": "Agree to Wowza EULA", + "set": "yes" + }, + { + "name": "WOWZA_KEY", + "label": "License key" + } + ], + "ports": [ + "1935/tcp", + "8086/tcp", + "8087/tcp", + "8088/tcp" + ], + "volumes": [{"container": "/var/lib/wowza"}] + }, + { + "type": 1, + "title": "Jenkins", + "description": "Open-source continuous integration tool", + "categories": ["continuous-integration"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/jenkins.png", + "image": "jenkins/jenkins:lts", + "ports": [ + "8080/tcp", + "50000/tcp" + ], + "env": [ + { + "name": "JENKINS_OPTS", + "label": "Jenkins options" + } + ], + "volumes": [{"container": "/var/jenkins_home"}] + }, + { + "type": 1, + "title": "Redmine", + "description": "Open-source project management tool", + "categories": ["project-management"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/redmine.png", + "image": "redmine:latest", + "ports": [ + "3000/tcp" + ], + "volumes": [{"container": "/usr/src/redmine/files"}] + }, + { + "type": 1, + "title": "Odoo", + "description": "Open-source business apps", + "categories": ["project-management"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/odoo.png", + "image": "odoo:latest", + "env": [ + { + "name": "HOST", + "label": "PostgreSQL database host", + "type": "container" + }, + { + "name": "USER", + "label": "Database user" + }, + { + "name": "PASSWORD", + "label": "Database password" + } + ], + "ports": [ + "8069/tcp" + ], + "volumes": [{"container": "/var/lib/odoo"}, {"container": "/mnt/extra-addons"}] + }, + { + "type": 1, + "title": "Urbackup", + "description": "Open-source network backup", + "categories": ["backup"], + "platform": "linux", + "note": "This application web interface is exposed on the port 55414 inside the container.", + "logo": "https://portainer.io/images/logos/urbackup.png", + "image": "cfstras/urbackup", + "ports": [ + "55413/tcp", "55414/tcp", "55415/tcp", "35622/tcp" + ], + "volumes": [{"container": "/var/urbackup"}] + }, + { + "type": 1, + "title": "File browser", + "description": "A web file manager", + "note": "Default credentials: admin/admin", + "categories": ["filesystem", "storage"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/filebrowser.png", + "image": "hacdias/filemanager:latest", + "ports": [ + "80/tcp" + ], + "volumes": [{"container": "/data"}, {"container": "/srv"}], + "command": "--port 80 --database /data/database.db --scope /srv" + }, + { + "type": 1, + "title": "CommandBox", + "description": "ColdFusion (CFML) CLI", + "categories": ["development"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/ortussolutions-commandbox.png", + "image": "ortussolutions/commandbox:latest", + "env": [ + { + "name": "CFENGINE", + "set": "lucee@4.5" + } + ], + "ports": [ + "8080/tcp", "8443/tcp" + ] + }, + { + "type": 1, + "title": "ContentBox", + "description": "Open-source modular CMS", + "categories": ["CMS"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/ortussolutions-contentbox.png", + "image": "ortussolutions/contentbox:latest", + "env": [ + { + "name": "express", + "set": "true" + }, + { + "name": "install", + "set": "true" + }, + { + "name": "CFENGINE", + "set": "lucee@4.5" + } + ], + "ports": [ + "8080/tcp", "8443/tcp" + ], + "volumes": [{"container": "/data/contentbox/db"}, {"container": "/app/includes/shared/media"}] + }, + { + "type": 2, + "title": "Portainer Agent", + "description": "Manage all the resources in your Swarm cluster", + "note": "The agent will be deployed globally inside your cluster and available on port 9001.", + "categories": ["portainer"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/portainer.png", + "repository": { + "url": "https://github.com/portainer/templates", + "stackfile": "stacks/portainer-agent/docker-stack.yml" + } + }, + { + "type": 2, + "title": "OpenFaaS", + "name": "func", + "description": "Serverless functions made simple", + "note": "Deploys the API gateway and sample functions. You can access the UI on port 8080. Warning: the name of the stack must be 'func'.", + "categories": ["serverless"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/openfaas.png", + "repository": { + "url": "https://github.com/openfaas/faas", + "stackfile": "docker-compose.yml" + } + }, + { + "type": 2, + "title": "IronFunctions", + "description": "Open-source serverless computing platform", + "note": "Deploys the IronFunctions API and UI.", + "categories": ["serverless"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/ironfunctions.png", + "repository": { + "url": "https://github.com/portainer/templates", + "stackfile": "stacks/ironfunctions/docker-stack.yml" + } + }, + { + "type": 2, + "title": "CockroachDB", + "description": "CockroachDB cluster", + "note": "Deploys an insecure CockroachDB cluster, please refer to CockroachDB documentation for production deployments.", + "categories": ["database"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/cockroachdb.png", + "repository": { + "url": "https://github.com/portainer/templates", + "stackfile": "stacks/cockroachdb/docker-stack.yml" + } + }, + { + "type": 2, + "title": "Wordpress", + "description": "Wordpress setup with a MySQL database", + "note": "Deploys a Wordpress instance connected to a MySQL database.", + "categories": ["CMS"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/wordpress.png", + "repository": { + "url": "https://github.com/portainer/templates", + "stackfile": "stacks/wordpress/docker-stack.yml" + }, + "env": [ + { + "name": "MYSQL_DATABASE_PASSWORD", + "label": "Database root password", + "description": "Password used by the MySQL root user." + } + ] + }, + { + "type": 3, + "title": "Wordpress", + "description": "Wordpress setup with a MySQL database", + "note": "Deploys a Wordpress instance connected to a MySQL database.", + "categories": ["CMS"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/wordpress.png", + "repository": { + "url": "https://github.com/portainer/templates", + "stackfile": "stacks/wordpress/docker-compose.yml" + }, + "env": [ + { + "name": "MYSQL_DATABASE_PASSWORD", + "label": "Database root password", + "description": "Password used by the MySQL root user." + } + ] + }, + { + "type": 2, + "title": "Microsoft OMS Agent", + "description": "Microsoft Operations Management Suite Linux agent.", + "categories": ["OPS"], + "platform": "linux", + "logo": "https://portainer.io/images/logos/microsoft.png", + "repository": { + "url": "https://github.com/portainer/templates", + "stackfile": "stacks/microsoft-oms/docker-stack.yml" + }, + "env": [ + { + "name": "AZURE_WORKSPACE_ID", + "label": "Workspace ID", + "description": "Azure Workspace ID" + }, + { + "name": "AZURE_PRIMARY_KEY", + "label": "Primary key", + "description": "Azure primary key" + } + ] + }, + { + "title": "Sematext Docker Agent", + "type": 2, + "categories": ["Log Management", "Monitoring"], + "description": "Collect logs, metrics and docker events", + "logo": "https://portainer.io/images/logos/sematext_agent.png", + "platform": "linux", + "repository": { + "url": "https://github.com/portainer/templates", + "stackfile": "stacks/sematext-agent-docker/docker-stack.yml" + }, + "env": [ + { + "name": "LOGSENE_TOKEN", + "label": "Logs token" + }, + { + "name": "SPM_TOKEN", + "label": "SPM monitoring token" + } + ] + } +] diff --git a/vendor.yml b/vendor.yml index 9753cc5dc..097faec26 100644 --- a/vendor.yml +++ b/vendor.yml @@ -52,3 +52,4 @@ angular: - 'angular-loading-bar/build/loading-bar.js' - 'angularjs-scroll-glue/src/scrollglue.js' - 'angular-clipboard/angular-clipboard.js' + - 'angular-file-saver/dist/angular-file-saver.bundle.js' diff --git a/yarn.lock b/yarn.lock index 916205b2c..0cfd0d2c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,9 +2,9 @@ # yarn lockfile v1 -"@fortawesome/fontawesome-free-webfonts@^1.0.4": - version "1.0.4" - resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.4.tgz#bac5d89755bf3bc2d2b4deee47d92febf641bb1f" +"@fortawesome/fontawesome-free-webfonts@^1.0.9": + version "1.0.9" + resolved "https://registry.yarnpkg.com/@fortawesome/fontawesome-free-webfonts/-/fontawesome-free-webfonts-1.0.9.tgz#72f2c10453422aba0d338fa6a9cb761b50ba24d5" "@uirouter/angularjs@~1.0.6": version "1.0.11" @@ -99,6 +99,13 @@ angular-cookies@~1.5.0: version "1.5.11" resolved "https://registry.yarnpkg.com/angular-cookies/-/angular-cookies-1.5.11.tgz#88558de7c5044dcc3abeb79614d7ef8107ba49c0" +angular-file-saver@^1.1.3: + version "1.1.3" + resolved "https://registry.yarnpkg.com/angular-file-saver/-/angular-file-saver-1.1.3.tgz#dcaec0695214f226a4caafc8c16d21a9a61f7d1b" + dependencies: + blob-tmp "^1.0.0" + file-saver "^1.3.3" + "angular-google-analytics@github:revolunet/angular-google-analytics#~1.1.9": version "1.1.8" resolved "https://codeload.github.com/revolunet/angular-google-analytics/tar.gz/92768a525870bc066dcf85fbe9d9f115358a6d91" @@ -343,6 +350,10 @@ beeper@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/beeper/-/beeper-1.1.1.tgz#e6d5ea8c5dad001304a70b22638447f69cb2f809" +blob-tmp@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/blob-tmp/-/blob-tmp-1.0.0.tgz#de82491e222ff1354c77a93ee8e4ea2c89544273" + body-parser@~1.13.3: version "1.13.3" resolved "https://registry.yarnpkg.com/body-parser/-/body-parser-1.13.3.tgz#c08cf330c3358e151016a05746f13f029c97fa97" @@ -1384,6 +1395,10 @@ file-entry-cache@^2.0.0: flat-cache "^1.2.1" object-assign "^4.0.1" +file-saver@^1.3.3: + version "1.3.8" + resolved "https://registry.yarnpkg.com/file-saver/-/file-saver-1.3.8.tgz#e68a30c7cb044e2fb362b428469feb291c2e09d8" + file-sync-cmp@^0.1.0: version "0.1.1" resolved "https://registry.yarnpkg.com/file-sync-cmp/-/file-sync-cmp-0.1.1.tgz#a5e7a8ffbfa493b43b923bbd4ca89a53b63b612b"