From 313c8be997a4d000cb409557bfab0bea4ae26616 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sat, 15 Sep 2018 19:26:03 +0800 Subject: [PATCH 01/93] chore(version): bump version number --- api/portainer.go | 2 +- api/swagger.yaml | 4 ++-- distribution/portainer.spec | 2 +- package.json | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/api/portainer.go b/api/portainer.go index 6367b14e0..2db839506 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -639,7 +639,7 @@ type ( const ( // APIVersion is the version number of the Portainer API - APIVersion = "1.19.2" + APIVersion = "1.20-dev" // DBVersion is the version number of the Portainer database DBVersion = 14 // MessageOfTheDayURL represents the URL where Portainer MOTD message can be retrieved diff --git a/api/swagger.yaml b/api/swagger.yaml index 890c5fc2a..1fda7d40f 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.19.2" + version: "1.20-dev" title: "Portainer API" contact: email: "info@portainer.io" @@ -2816,7 +2816,7 @@ definitions: description: "Is analytics enabled" Version: type: "string" - example: "1.19.2" + example: "1.20-dev" description: "Portainer API version" PublicSettingsInspectResponse: type: "object" diff --git a/distribution/portainer.spec b/distribution/portainer.spec index af2337e91..abbd4b371 100644 --- a/distribution/portainer.spec +++ b/distribution/portainer.spec @@ -1,5 +1,5 @@ Name: portainer -Version: 1.19.2 +Version: 1.20-dev Release: 0 License: Zlib Summary: A lightweight docker management UI diff --git a/package.json b/package.json index ffe21637b..2e60ee1ea 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Portainer.io", "name": "portainer", "homepage": "http://portainer.io", - "version": "1.19.2", + "version": "1.20-dev", "repository": { "type": "git", "url": "git@github.com:portainer/portainer.git" From 22450bbdebc47f98071c241a4c74842143683e4a Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sun, 16 Sep 2018 10:34:46 +0800 Subject: [PATCH 02/93] chore(build): update build script and add grunt yarn script (#2276) --- build.sh | 2 +- package.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build.sh b/build.sh index 36e86b8a9..c00f5dd0b 100755 --- a/build.sh +++ b/build.sh @@ -24,7 +24,7 @@ function build_archive() { function build_all() { mkdir -pv "${ARCHIVE_BUILD_FOLDER}" for tag in $@; do - grunt "release:`echo "$tag" | tr '-' ':'`" + yarn grunt "release:`echo "$tag" | tr '-' ':'`" name="portainer"; if [ "$(echo "$tag" | cut -c1)" = "w" ]; then name="${name}.exe"; fi mv dist/portainer-$tag* dist/$name if [ `echo $tag | cut -d \- -f 1` == 'linux' ]; then build_and_push_images "$tag"; fi diff --git a/package.json b/package.json index 2e60ee1ea..6d7486278 100644 --- a/package.json +++ b/package.json @@ -20,6 +20,7 @@ } ], "scripts": { + "grunt": "grunt", "dev": "yarn grunt run-dev", "clean-all": "yarn grunt clean:all", "build": "yarn grunt build", From b192b098ca0e6b9925f9ce6eb30e8b714961c6d1 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Mon, 17 Sep 2018 09:26:37 +0800 Subject: [PATCH 03/93] feat(build-system): update shippedDockerVersion to 18.06.1-ce (#2281) --- gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gruntfile.js b/gruntfile.js index 79e05c95d..873d55473 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -80,7 +80,7 @@ module.exports = function (grunt) { grunt.initConfig({ root: 'dist', distdir: 'dist/public', - shippedDockerVersion: '18.03.1-ce', + shippedDockerVersion: '18.06.1-ce', shippedDockerVersionWindows: '17.09.0-ce', pkg: grunt.file.readJSON('package.json'), config: gruntfile_cfg.config, From c3d80a1b21b6c6b2f4f824069693bed645929717 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 19 Sep 2018 11:40:06 +0800 Subject: [PATCH 04/93] docs(project): update CONTRIBUTING.md --- CONTRIBUTING.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 3ddc75e8c..e26559a7e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -77,14 +77,14 @@ The subject contains succinct description of the change: ## Contribution process -Our contribution process is described below. Some of the steps can be visualized inside Github via specific `contrib/` labels, such as `contrib/func-review-in-progress` or `contrib/tech-review-approved`. +Our contribution process is described below. Some of the steps can be visualized inside Github via specific `status/` labels, such as `status/1-functional-review` or `status/2-technical-review`. ### Bug report -![portainer_bugreport_workflow](https://user-images.githubusercontent.com/5485061/43569306-5571b3a0-9637-11e8-8559-786cfc82a14f.png) +![portainer_bugreport_workflow](https://user-images.githubusercontent.com/5485061/45727219-50190a00-bbf5-11e8-9fe8-3a563bb8d5d7.png) ### Feature request -The feature request process is similar to the bug report process but has an extra functional validation before the technical validation. +The feature request process is similar to the bug report process but has an extra functional validation before the technical validation as well as a documentation validation before the testing phase. -![portainer_featurerequest_workflow](https://user-images.githubusercontent.com/5485061/43569315-5d30a308-9637-11e8-8292-3c62b5612925.png) +![portainer_featurerequest_workflow](https://user-images.githubusercontent.com/5485061/45727229-5ad39f00-bbf5-11e8-9550-16ba66c50615.png) From d5dd362d53ae60982b8ea5aa325d49d4f7f497c1 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Mon, 24 Sep 2018 12:09:12 +1200 Subject: [PATCH 05/93] =?UTF-8?q?feat(api):=20update=20client.Get=20with?= =?UTF-8?q?=20a=20new=20timeout=20parameter=20and=20default=E2=80=A6=20(#2?= =?UTF-8?q?297)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat(api): update client.Get with a new timeout parameter and default to 5s * fix(api): fix invalid type --- api/http/client/client.go | 15 +++++++++++---- api/http/handler/motd/motd.go | 2 +- api/http/handler/templates/template_list.go | 2 +- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/api/http/client/client.go b/api/http/client/client.go index 541ec8257..8892b6472 100644 --- a/api/http/client/client.go +++ b/api/http/client/client.go @@ -15,6 +15,7 @@ import ( const ( errInvalidResponseStatus = portainer.Error("Invalid response status (expecting 200)") + defaultHTTPTimeout = 5 ) // HTTPClient represents a client to send HTTP requests. @@ -26,7 +27,7 @@ type HTTPClient struct { func NewHTTPClient() *HTTPClient { return &HTTPClient{ &http.Client{ - Timeout: time.Second * 5, + Timeout: time.Second * time.Duration(defaultHTTPTimeout), }, } } @@ -67,10 +68,16 @@ func (client *HTTPClient) ExecuteAzureAuthenticationRequest(credentials *portain } // Get executes a simple HTTP GET to the specified URL and returns -// the content of the response body. -func Get(url string) ([]byte, error) { +// the content of the response body. Timeout can be specified via the timeout parameter, +// will default to defaultHTTPTimeout if set to 0. +func Get(url string, timeout int) ([]byte, error) { + + if timeout == 0 { + timeout = defaultHTTPTimeout + } + client := &http.Client{ - Timeout: time.Second * 3, + Timeout: time.Second * time.Duration(timeout), } response, err := client.Get(url) diff --git a/api/http/handler/motd/motd.go b/api/http/handler/motd/motd.go index fbe8b5acd..ca279d890 100644 --- a/api/http/handler/motd/motd.go +++ b/api/http/handler/motd/motd.go @@ -16,7 +16,7 @@ type motdResponse struct { func (handler *Handler) motd(w http.ResponseWriter, r *http.Request) { - motd, err := client.Get(portainer.MessageOfTheDayURL) + motd, err := client.Get(portainer.MessageOfTheDayURL, 0) if err != nil { w.WriteHeader(http.StatusInternalServerError) return diff --git a/api/http/handler/templates/template_list.go b/api/http/handler/templates/template_list.go index 24ca93bbd..7e802528f 100644 --- a/api/http/handler/templates/template_list.go +++ b/api/http/handler/templates/template_list.go @@ -26,7 +26,7 @@ func (handler *Handler) templateList(w http.ResponseWriter, r *http.Request) *ht } } else { var templateData []byte - templateData, err = client.Get(settings.TemplatesURL) + templateData, err = client.Get(settings.TemplatesURL, 0) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve external templates", err} } From 94b202fedc3a2bd94a0dbc187f26dd9b5d4373da Mon Sep 17 00:00:00 2001 From: Lukas Joergensen Date: Tue, 25 Sep 2018 01:10:41 +0200 Subject: [PATCH 06/93] fix(authentication): escape LDAP filters (#2209) --- api/ldap/ldap.go | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/api/ldap/ldap.go b/api/ldap/ldap.go index 528a92e7f..05c9d55d7 100644 --- a/api/ldap/ldap.go +++ b/api/ldap/ldap.go @@ -22,11 +22,13 @@ type Service struct{} func searchUser(username string, conn *ldap.Conn, settings []portainer.LDAPSearchSettings) (string, error) { var userDN string found := false + usernameEscaped := ldap.EscapeFilter(username) + for _, searchSettings := range settings { searchRequest := ldap.NewSearchRequest( searchSettings.BaseDN, ldap.ScopeWholeSubtree, ldap.NeverDerefAliases, 0, 0, false, - fmt.Sprintf("(&%s(%s=%s))", searchSettings.Filter, searchSettings.UserNameAttribute, username), + fmt.Sprintf("(&%s(%s=%s))", searchSettings.Filter, searchSettings.UserNameAttribute, usernameEscaped), []string{"dn"}, nil, ) @@ -134,12 +136,13 @@ func (*Service) GetUserGroups(username string, settings *portainer.LDAPSettings) // 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) + userDNEscaped := ldap.EscapeFilter(userDN) 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), + fmt.Sprintf("(&%s(%s=%s))", searchSettings.GroupFilter, searchSettings.GroupAttribute, userDNEscaped), []string{"cn"}, nil, ) From f0f01c33bd9df57de33cb2fc056c6b7cb367a821 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 26 Sep 2018 18:59:50 +1200 Subject: [PATCH 07/93] feat(endpoint-creation): add requirement message for agent endpoint (#2303) --- .../endpoints/create/createEndpointController.js | 10 ++++++++-- .../views/endpoints/create/createendpoint.html | 12 ++++++++++-- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/portainer/views/endpoints/create/createEndpointController.js b/app/portainer/views/endpoints/create/createEndpointController.js index 13fc1ad16..c682bee1b 100644 --- a/app/portainer/views/endpoints/create/createEndpointController.js +++ b/app/portainer/views/endpoints/create/createEndpointController.js @@ -1,6 +1,6 @@ angular.module('portainer.app') -.controller('CreateEndpointController', ['$q', '$scope', '$state', '$filter', 'EndpointService', 'GroupService', 'TagService', 'Notifications', -function ($q, $scope, $state, $filter, EndpointService, GroupService, TagService, Notifications) { +.controller('CreateEndpointController', ['$q', '$scope', '$state', '$filter', 'clipboard', 'EndpointService', 'GroupService', 'TagService', 'Notifications', +function ($q, $scope, $state, $filter, clipboard, EndpointService, GroupService, TagService, Notifications) { $scope.state = { EnvironmentType: 'docker', @@ -19,6 +19,12 @@ function ($q, $scope, $state, $filter, EndpointService, GroupService, TagService Tags: [] }; + $scope.copyAgentCommand = function() { + clipboard.copyText('curl -L https://portainer.io/download/agent-stack.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack.yml portainer-agent'); + $('#copyNotification').show(); + $('#copyNotification').fadeOut(2000); + }; + $scope.addDockerEndpoint = function() { var name = $scope.formValues.Name; var URL = $filter('stripprotocol')($scope.formValues.URL); diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html index ff8e7c232..4b7a762bd 100644 --- a/app/portainer/views/endpoints/create/createendpoint.html +++ b/app/portainer/views/endpoints/create/createendpoint.html @@ -64,8 +64,16 @@
- If you have started Portainer in the same overlay network as the agent, you can use tasks.AGENT_SERVICE_NAME:AGENT_SERVICE_PORT as the - endpoint URL format. + Ensure that you have deployed the Portainer agent in your cluster first. You can use execute the following command on any manager node to deploy it. +
+ + curl -L https://portainer.io/download/agent-stack.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack.yml portainer-agent + + Copy + + + +
From 92b15523f07d85cd577ef7c09e19c496c07f3755 Mon Sep 17 00:00:00 2001 From: Angele Date: Fri, 28 Sep 2018 00:49:30 +0200 Subject: [PATCH 08/93] feat(containers): add container name in error notification * containersDatable: add containers name if error on executeActionOnContainerList * Update containersDatatableActionsController.js * Update containersDatatableActionsController.js --- .../actions/containersDatatableActionsController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js b/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js index 88980f8f3..efacb89e7 100644 --- a/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js +++ b/app/docker/components/datatables/containers-datatable/actions/containersDatatableActionsController.js @@ -72,6 +72,7 @@ function ($state, ContainerService, ModalService, Notifications, HttpRequestHelp Notifications.success(successMessage, container.Names[0]); }) .catch(function error(err) { + errorMessage = errorMessage + ':' + container.Names[0]; Notifications.error('Failure', err, errorMessage); }) .finally(function final() { From 226c45f0355f9897e5e4762db2851b1081a8c8ee Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Fri, 28 Sep 2018 06:06:47 +0300 Subject: [PATCH 09/93] fix(template-creation): fix an issue related to the network setting (#2312) * bug(template): pass network name on creation * bug(templates): choose network object on update * fix(templates): set network only when available --- app/portainer/models/template.js | 2 +- app/portainer/views/templates/edit/templateController.js | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/app/portainer/models/template.js b/app/portainer/models/template.js index 0218ce8a2..6b9509958 100644 --- a/app/portainer/models/template.js +++ b/app/portainer/models/template.js @@ -25,7 +25,7 @@ function TemplateCreateRequest(model) { this.Image = model.Image; this.Registry = model.Registry.URL; this.Command = model.Command; - this.Network = model.Network; + this.Network = model.Network && model.Network.Name; this.Privileged = model.Privileged; this.Interactive = model.Interactive; this.RestartPolicy = model.RestartPolicy; diff --git a/app/portainer/views/templates/edit/templateController.js b/app/portainer/views/templates/edit/templateController.js index ccf82d228..352764e43 100644 --- a/app/portainer/views/templates/edit/templateController.js +++ b/app/portainer/views/templates/edit/templateController.js @@ -38,6 +38,12 @@ function ($q, $scope, $state, $transition$, TemplateService, TemplateHelper, Net ) }) .then(function success(data) { + var template = data.template; + if (template.Network) { + template.Network = _.find(data.networks, function(o) { return o.Name === template.Network; }); + } else { + template.Network = _.find(data.networks, function(o) { return o.Name === 'bridge'; }); + } $scope.categories = TemplateHelper.getUniqueCategories(data.templates); $scope.template = data.template; $scope.networks = data.networks; From 5be2684442db3716a41067f2eb60a017ec8c5df5 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sun, 30 Sep 2018 01:20:10 +0300 Subject: [PATCH 10/93] feat(home): add the ability to edit an endpoint (#2305) * feat(home): add edit button * feat(home): style edit button * feat(home): make endpoint editable on admin only --- .../endpoint-item/endpoint-item-controller.js | 12 ++++++++++++ .../endpoint-list/endpoint-item/endpointItem.html | 12 ++++++++++-- .../endpoint-list/endpoint-item/endpointItem.js | 7 +++++-- .../components/endpoint-list/endpoint-list.js | 4 +++- .../components/endpoint-list/endpointList.html | 2 ++ app/portainer/views/home/home.html | 2 ++ app/portainer/views/home/homeController.js | 6 ++++++ 7 files changed, 40 insertions(+), 5 deletions(-) create mode 100644 app/portainer/components/endpoint-list/endpoint-item/endpoint-item-controller.js diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpoint-item-controller.js b/app/portainer/components/endpoint-list/endpoint-item/endpoint-item-controller.js new file mode 100644 index 000000000..62433ee25 --- /dev/null +++ b/app/portainer/components/endpoint-list/endpoint-item/endpoint-item-controller.js @@ -0,0 +1,12 @@ +angular.module('portainer.app').controller('EndpointItemController', [ + function EndpointItemController() { + var ctrl = this; + + ctrl.editEndpoint = editEndpoint; + + function editEndpoint(event) { + event.stopPropagation(); + ctrl.onEdit(ctrl.model.Id); + } + } +]); diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html index 322ab9a90..6e643da5b 100644 --- a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html +++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html @@ -21,8 +21,16 @@ - - Group: {{ $ctrl.model.GroupName }} + + + + Group: {{ $ctrl.model.GroupName }} + + diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js index d04fb25cf..450fa089d 100644 --- a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js +++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.js @@ -2,6 +2,9 @@ angular.module('portainer.app').component('endpointItem', { templateUrl: 'app/portainer/components/endpoint-list/endpoint-item/endpointItem.html', bindings: { model: '<', - onSelect: '<' - } + onSelect: '<', + onEdit: '<', + isAdmin:'<' + }, + controller: 'EndpointItemController' }); diff --git a/app/portainer/components/endpoint-list/endpoint-list.js b/app/portainer/components/endpoint-list/endpoint-list.js index d11d7611d..d6a4bd33e 100644 --- a/app/portainer/components/endpoint-list/endpoint-list.js +++ b/app/portainer/components/endpoint-list/endpoint-list.js @@ -11,6 +11,8 @@ angular.module('portainer.app').component('endpointList', { endpoints: '<', dashboardAction: '<', snapshotAction: '<', - showSnapshotAction: '<' + showSnapshotAction: '<', + editAction: '<', + isAdmin:'<' } }); diff --git a/app/portainer/components/endpoint-list/endpointList.html b/app/portainer/components/endpoint-list/endpointList.html index 9110703f9..9b4850dd0 100644 --- a/app/portainer/components/endpoint-list/endpointList.html +++ b/app/portainer/components/endpoint-list/endpointList.html @@ -24,6 +24,8 @@ ng-repeat="endpoint in $ctrl.endpoints | filter:$ctrl.state.textFilter" model="endpoint" on-select="$ctrl.dashboardAction" + on-edit="$ctrl.editAction" + is-admin="$ctrl.isAdmin" >
Loading... diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html index e9de46386..1ffaa88bd 100644 --- a/app/portainer/views/home/home.html +++ b/app/portainer/views/home/home.html @@ -44,6 +44,8 @@ dashboard-action="goToDashboard" show-snapshot-action="!applicationState.application.authentication || isAdmin" snapshot-action="triggerSnapshot" + edit-action="goToEdit" + is-admin="isAdmin" >
diff --git a/app/portainer/views/home/homeController.js b/app/portainer/views/home/homeController.js index 684c1ff7e..f666e49d7 100644 --- a/app/portainer/views/home/homeController.js +++ b/app/portainer/views/home/homeController.js @@ -62,6 +62,12 @@ function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, G }); } + $scope.goToEdit = goToEdit; + + function goToEdit(id) { + $state.go('portainer.endpoints.endpoint', { id: id }); + } + function initView() { $scope.isAdmin = Authentication.getUserDetails().role === 1; From 6e262e6e8998a6550d8c477644f5d9b3b40f1123 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Sun, 30 Sep 2018 23:06:58 +0300 Subject: [PATCH 11/93] feat(home): support search in multiple fields (name, group, tag, status) (#2285) * feat(home): search multiple fields (group/tag) * feat(home): change search from "OR" to "AND" * feat(home): search only for a tag or a group * feat(home): search by keywords in name,group,tag * feat(home): support case insensitive search * style(home): remove unused $filter * feat(home): search state * style(home): update search input placeholder --- .../endpoint-list/endpoint-list-controller.js | 60 +++++++++++++++++++ .../components/endpoint-list/endpoint-list.js | 6 +- .../endpoint-list/endpointList.html | 11 +++- 3 files changed, 69 insertions(+), 8 deletions(-) create mode 100644 app/portainer/components/endpoint-list/endpoint-list-controller.js diff --git a/app/portainer/components/endpoint-list/endpoint-list-controller.js b/app/portainer/components/endpoint-list/endpoint-list-controller.js new file mode 100644 index 000000000..aab801410 --- /dev/null +++ b/app/portainer/components/endpoint-list/endpoint-list-controller.js @@ -0,0 +1,60 @@ +angular.module('portainer.app').controller('EndpointListController', [ + function EndpointListController() { + var ctrl = this; + ctrl.state = { + textFilter: '', + filteredEndpoints: [] + }; + + ctrl.$onChanges = $onChanges; + ctrl.onFilterChanged = onFilterChanged; + + function $onChanges(changesObj) { + handleEndpointsChange(changesObj.endpoints); + } + + function handleEndpointsChange(endpoints) { + if (!endpoints) { + return; + } + if (!endpoints.currentValue) { + return; + } + + onFilterChanged(); + } + + function onFilterChanged() { + var filterValue = ctrl.state.textFilter; + ctrl.state.filteredEndpoints = filterEndpoints( + ctrl.endpoints, + filterValue + ); + } + + function filterEndpoints(endpoints, filterValue) { + if (!endpoints || !endpoints.length || !filterValue) { + return endpoints; + } + var keywords = filterValue.split(' '); + return _.filter(endpoints, function(endpoint) { + var statusString = convertStatusToString(endpoint.Status); + return _.every(keywords, function(keyword) { + var lowerCaseKeyword = keyword.toLowerCase(); + return ( + _.includes(endpoint.Name.toLowerCase(), lowerCaseKeyword) || + _.includes(endpoint.GroupName.toLowerCase(), lowerCaseKeyword) || + _.some(endpoint.Tags, function(tag) { + return _.includes(tag.toLowerCase(), lowerCaseKeyword); + }) || + _.includes(statusString, keyword) + ); + }); + }); + } + + function convertStatusToString(status) { + return status === 1 ? 'up' : 'down'; + } + } +]); diff --git a/app/portainer/components/endpoint-list/endpoint-list.js b/app/portainer/components/endpoint-list/endpoint-list.js index d6a4bd33e..a622c3db4 100644 --- a/app/portainer/components/endpoint-list/endpoint-list.js +++ b/app/portainer/components/endpoint-list/endpoint-list.js @@ -1,10 +1,6 @@ angular.module('portainer.app').component('endpointList', { templateUrl: 'app/portainer/components/endpoint-list/endpointList.html', - controller: function() { - this.state = { - textFilter: '' - }; - }, + controller: 'EndpointListController', bindings: { titleText: '@', titleIcon: '@', diff --git a/app/portainer/components/endpoint-list/endpointList.html b/app/portainer/components/endpoint-list/endpointList.html index 9b4850dd0..2886916f1 100644 --- a/app/portainer/components/endpoint-list/endpointList.html +++ b/app/portainer/components/endpoint-list/endpointList.html @@ -16,12 +16,17 @@
- +
Loading...
-
+
No endpoint available.
From 9b4870d57e97ec6dedf29147726d335187efb498 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Mon, 1 Oct 2018 04:36:49 +0300 Subject: [PATCH 12/93] feat(stack-details): Add the ability to duplicate a stack (#2278) * feat(stack-details): add duplicate-stack button * feat(stack-details): add stack-duplication-form component * feat(stack-details): add duplicate stack method on controller * feat(stack-details): add duplicate stack method * feat(stack-details): remove old duplication in progress flag * feat(stack-details): combine migration and duplication forms * feat(stack-details): pass new stack name to server * feat(stack-details): add option to rename migrated stack * feat(stack-details): disable both migrate/duplicate buttons * feat(stack-details): disable migration button on same endpoint * feat(stack-details): change duplicate icon * style(stack-details): remove whitespaces and fix pattern * feat(stack-details): add name to migration payload in swagger.yml * style(stack-details): add semicolon * bug(stack-details): toggle endpoints before and after duplication --- api/http/handler/stacks/stack_migrate.go | 7 ++ api/swagger.yaml | 4 + .../stack-duplication-form-controller.js | 76 +++++++++++++++++++ .../stack-duplication-form.html | 43 +++++++++++ .../stack-duplication-form.js | 12 +++ app/portainer/services/api/stackService.js | 18 +++-- app/portainer/views/stacks/edit/stack.html | 34 +++------ .../views/stacks/edit/stackController.js | 65 ++++++++++------ 8 files changed, 205 insertions(+), 54 deletions(-) create mode 100644 app/portainer/components/stack-duplication-form/stack-duplication-form-controller.js create mode 100644 app/portainer/components/stack-duplication-form/stack-duplication-form.html create mode 100644 app/portainer/components/stack-duplication-form/stack-duplication-form.js diff --git a/api/http/handler/stacks/stack_migrate.go b/api/http/handler/stacks/stack_migrate.go index 8a0ec0c69..704394766 100644 --- a/api/http/handler/stacks/stack_migrate.go +++ b/api/http/handler/stacks/stack_migrate.go @@ -14,6 +14,7 @@ import ( type stackMigratePayload struct { EndpointID int SwarmID string + Name string } func (payload *stackMigratePayload) Validate(r *http.Request) error { @@ -89,11 +90,17 @@ func (handler *Handler) stackMigrate(w http.ResponseWriter, r *http.Request) *ht stack.SwarmID = payload.SwarmID } + oldName := stack.Name + if payload.Name != "" { + stack.Name = payload.Name + } + migrationError := handler.migrateStack(r, stack, targetEndpoint) if migrationError != nil { return migrationError } + stack.Name = oldName err = handler.deleteStack(stack, endpoint) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} diff --git a/api/swagger.yaml b/api/swagger.yaml index 1fda7d40f..ba5745801 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -4160,6 +4160,10 @@ definitions: type: "string" example: "jpofkc0i9uo9wtx1zesuk649w" description: "Swarm cluster identifier, must match the identifier of the cluster where the stack will be relocated" + Name: + type: "string" + example: "new-stack" + description: "If provided will rename the migrated stack" StackCreateRequest: type: "object" required: diff --git a/app/portainer/components/stack-duplication-form/stack-duplication-form-controller.js b/app/portainer/components/stack-duplication-form/stack-duplication-form-controller.js new file mode 100644 index 000000000..4e96696e2 --- /dev/null +++ b/app/portainer/components/stack-duplication-form/stack-duplication-form-controller.js @@ -0,0 +1,76 @@ +angular.module('portainer.app').controller('StackDuplicationFormController', [ + 'Notifications', + function StackDuplicationFormController(Notifications) { + var ctrl = this; + + ctrl.state = { + duplicationInProgress: false, + migrationInProgress: false + }; + + ctrl.formValues = { + endpoint: null, + newName: '' + }; + + ctrl.isFormValidForDuplication = isFormValidForDuplication; + ctrl.isFormValidForMigration = isFormValidForMigration; + ctrl.duplicateStack = duplicateStack; + ctrl.migrateStack = migrateStack; + ctrl.isMigrationButtonDisabled = isMigrationButtonDisabled; + + function isFormValidForMigration() { + return ctrl.formValues.endpoint && ctrl.formValues.endpoint.Id; + } + + function isFormValidForDuplication() { + return isFormValidForMigration() && ctrl.formValues.newName; + } + + function duplicateStack() { + if (!ctrl.formValues.newName) { + Notifications.error( + 'Failure', + null, + 'Stack name is required for duplication' + ); + return; + } + ctrl.state.duplicationInProgress = true; + ctrl.onDuplicate({ + endpointId: ctrl.formValues.endpoint.Id, + name: ctrl.formValues.newName ? ctrl.formValues.newName : undefined + }) + .finally(function() { + ctrl.state.duplicationInProgress = false; + }); + } + + function migrateStack() { + ctrl.state.migrationInProgress = true; + ctrl.onMigrate({ + endpointId: ctrl.formValues.endpoint.Id, + name: ctrl.formValues.newName ? ctrl.formValues.newName : undefined + }) + .finally(function() { + ctrl.state.migrationInProgress = false; + }); + } + + function isMigrationButtonDisabled() { + return ( + !ctrl.isFormValidForMigration() || + ctrl.state.duplicationInProgress || + ctrl.state.migrationInProgress || + isTargetEndpointAndCurrentEquals() + ); + } + + function isTargetEndpointAndCurrentEquals() { + return ( + ctrl.formValues.endpoint && + ctrl.formValues.endpoint.Id === ctrl.currentEndpointId + ); + } + } +]); diff --git a/app/portainer/components/stack-duplication-form/stack-duplication-form.html b/app/portainer/components/stack-duplication-form/stack-duplication-form.html new file mode 100644 index 000000000..6e270b7b0 --- /dev/null +++ b/app/portainer/components/stack-duplication-form/stack-duplication-form.html @@ -0,0 +1,43 @@ +
+
+ Stack duplication / migration +
+
+ +

+ This feature allows you to duplicate or migrate this stack. +

+ +
+
+ +
+ + + +
+
+
\ No newline at end of file diff --git a/app/portainer/components/stack-duplication-form/stack-duplication-form.js b/app/portainer/components/stack-duplication-form/stack-duplication-form.js new file mode 100644 index 000000000..7f6180c39 --- /dev/null +++ b/app/portainer/components/stack-duplication-form/stack-duplication-form.js @@ -0,0 +1,12 @@ +angular.module('portainer.app').component('stackDuplicationForm', { + templateUrl: + 'app/portainer/components/stack-duplication-form/stack-duplication-form.html', + controller: 'StackDuplicationFormController', + bindings: { + onDuplicate: '&', + onMigrate: '&', + endpoints: '<', + groups: '<', + currentEndpointId: '<' + } +}); diff --git a/app/portainer/services/api/stackService.js b/app/portainer/services/api/stackService.js index dafbc4379..37b7c10a9 100644 --- a/app/portainer/services/api/stackService.js +++ b/app/portainer/services/api/stackService.js @@ -4,6 +4,7 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic 'use strict'; var service = {}; + service.stack = function(id) { var deferred = $q.defer(); @@ -33,7 +34,7 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic return deferred.promise; }; - service.migrateSwarmStack = function(stack, targetEndpointId) { + service.migrateSwarmStack = function(stack, targetEndpointId, newName) { var deferred = $q.defer(); EndpointProvider.setEndpointID(targetEndpointId); @@ -45,8 +46,7 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic deferred.reject({ msg: 'Target endpoint is located in the same Swarm cluster as the current endpoint', err: null }); return; } - - return Stack.migrate({ id: stack.Id, endpointId: stack.EndpointId }, { EndpointID: targetEndpointId, SwarmID: swarm.Id }).$promise; + return Stack.migrate({ id: stack.Id, endpointId: stack.EndpointId }, { EndpointID: targetEndpointId, SwarmID: swarm.Id, Name: newName }).$promise; }) .then(function success() { deferred.resolve(); @@ -61,12 +61,12 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic return deferred.promise; }; - service.migrateComposeStack = function(stack, targetEndpointId) { + service.migrateComposeStack = function(stack, targetEndpointId, newName) { var deferred = $q.defer(); EndpointProvider.setEndpointID(targetEndpointId); - Stack.migrate({ id: stack.Id, endpointId: stack.EndpointId }, { EndpointID: targetEndpointId }).$promise + Stack.migrate({ id: stack.Id, endpointId: stack.EndpointId }, { EndpointID: targetEndpointId, Name: newName }).$promise .then(function success() { deferred.resolve(); }) @@ -258,8 +258,7 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic var deferred = $q.defer(); SwarmService.swarm() - .then(function success(data) { - var swarm = data; + .then(function success(swarm) { var payload = { Name: name, SwarmID: swarm.Id, @@ -321,5 +320,10 @@ function StackServiceFactory($q, Stack, ResourceControlService, FileUploadServic return deferred.promise; }; + service.duplicateStack = function duplicateStack(name, stackFileContent, env, endpointId, type) { + var action = type === 1 ? service.createSwarmStackFromFileContent : service.createComposeStackFromFileContent; + return action(name, stackFileContent, env, endpointId); + }; + return service; }]); diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html index 85defd1e2..7a0c1427e 100644 --- a/app/portainer/views/stacks/edit/stack.html +++ b/app/portainer/views/stacks/edit/stack.html @@ -46,31 +46,15 @@ - -
-
- Stack migration -
-
- -

- This feature allows you to migrate this stack to an alternate compatible endpoint. -

- -
- - -
-
-
- + + diff --git a/app/portainer/views/stacks/edit/stackController.js b/app/portainer/views/stacks/edit/stackController.js index 50a8651b2..55eba59c4 100644 --- a/app/portainer/views/stacks/edit/stackController.js +++ b/app/portainer/views/stacks/edit/stackController.js @@ -14,24 +14,47 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe Endpoint: null }; + $scope.duplicateStack = function duplicateStack(name, endpointId) { + var stack = $scope.stack; + var env = FormHelper.removeInvalidEnvVars(stack.Env); + EndpointProvider.setEndpointID(endpointId); + + return StackService.duplicateStack(name, $scope.stackFileContent, env, endpointId, stack.Type) + .then(onDuplicationSuccess) + .catch(notifyOnError); + + function onDuplicationSuccess() { + Notifications.success('Stack successfully duplicated'); + $state.go('portainer.stacks', {}, { reload: true }); + EndpointProvider.setEndpointID(stack.EndpointId); + + } + + function notifyOnError(err) { + Notifications.error('Failure', err, 'Unable to duplicate stack'); + } + }; + $scope.showEditor = function() { $scope.state.showEditorTab = true; }; - $scope.migrateStack = function() { - ModalService.confirm({ - title: 'Are you sure?', - message: 'This action will deploy a new instance of this stack on the target endpoint, please note that this does NOT relocate the content of any persistent volumes that may be attached to this stack.', - buttons: { - confirm: { - label: 'Migrate', - className: 'btn-danger' + $scope.migrateStack = function (name, endpointId) { + return $q(function (resolve) { + ModalService.confirm({ + title: 'Are you sure?', + message: 'This action will deploy a new instance of this stack on the target endpoint, please note that this does NOT relocate the content of any persistent volumes that may be attached to this stack.', + buttons: { + confirm: { + label: 'Migrate', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + if (!confirmed) { return resolve(); } + return resolve(migrateStack(name, endpointId)); } - }, - callback: function onConfirm(confirmed) { - if(!confirmed) { return; } - migrateStack(); - } + }); }); }; @@ -45,9 +68,9 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe ); }; - function migrateStack() { + function migrateStack(name, endpointId) { var stack = $scope.stack; - var targetEndpointId = $scope.formValues.Endpoint.Id; + var targetEndpointId = endpointId; var migrateRequest = StackService.migrateSwarmStack; if (stack.Type === 2) { @@ -58,13 +81,13 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe // The EndpointID property is not available for these stacks, we can pass // the current endpoint identifier as a part of the migrate request. It will be used if // the EndpointID property is not defined on the stack. - var endpointId = EndpointProvider.endpointID(); + var originalEndpointId = EndpointProvider.endpointID(); if (stack.EndpointId === 0) { - stack.EndpointId = endpointId; + stack.EndpointId = originalEndpointId; } $scope.state.migrationInProgress = true; - migrateRequest(stack, targetEndpointId) + return migrateRequest(stack, targetEndpointId, name) .then(function success() { Notifications.success('Stack successfully migrated', stack.Name); $state.go('portainer.stacks', {}, {reload: true}); @@ -134,7 +157,6 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe function loadStack(id) { var agentProxy = $scope.applicationState.endpoint.mode.agentProxy; - var endpointId = EndpointProvider.endpointID(); $q.all({ stack: StackService.stack(id), @@ -143,9 +165,7 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe }) .then(function success(data) { var stack = data.stack; - $scope.endpoints = data.endpoints.filter(function(endpoint) { - return endpoint.Id !== endpointId; - }); + $scope.endpoints = data.endpoints; $scope.groups = data.groups; $scope.stack = stack; @@ -256,6 +276,7 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe var stackName = $transition$.params().name; $scope.stackName = stackName; var external = $transition$.params().external; + $scope.currentEndpointId = EndpointProvider.endpointID(); if (external === 'true') { $scope.state.externalStack = true; From bad95987ec697e5945755adc7216b5017f85090a Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Mon, 1 Oct 2018 04:38:14 +0300 Subject: [PATCH 13/93] feat(backend): trigger startup snapshot job in a goroutine (#2309) * feat(backend): wrap init enpoint with goroutine * feat(backend): wrap job snapshot with goroutine * feat(snapshots): reset changes for main and job_endpoint * feat(snapshot): run first job.snapshot as a goroutine --- api/cron/scheduler.go | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/api/cron/scheduler.go b/api/cron/scheduler.go index 9f65b6d5a..42abee371 100644 --- a/api/cron/scheduler.go +++ b/api/cron/scheduler.go @@ -45,11 +45,7 @@ func (scheduler *JobScheduler) ScheduleEndpointSyncJob(endpointFilePath string, // 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 - } + go job.Snapshot() return scheduler.cron.AddJob("@every "+interval, job) } From 6e8a10d72ff4c833979ca76ee3c9d3c3b1a3dff2 Mon Sep 17 00:00:00 2001 From: Tolik Litovsky Date: Wed, 3 Oct 2018 14:18:03 +1300 Subject: [PATCH 14/93] fix(api): remove x-frame-options header (#2322) --- api/http/handler/file/handler.go | 1 - api/http/security/bouncer.go | 1 - 2 files changed, 2 deletions(-) diff --git a/api/http/handler/file/handler.go b/api/http/handler/file/handler.go index 464062be1..06a3c4737 100644 --- a/api/http/handler/file/handler.go +++ b/api/http/handler/file/handler.go @@ -34,7 +34,6 @@ func (handler *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { w.Header().Set("Cache-Control", "no-cache, no-store, must-revalidate") } - w.Header().Add("X-Frame-Options", "DENY") w.Header().Add("X-XSS-Protection", "1; mode=block") w.Header().Add("X-Content-Type-Options", "nosniff") handler.Handler.ServeHTTP(w, r) diff --git a/api/http/security/bouncer.go b/api/http/security/bouncer.go index 0b25bd389..de0c75523 100644 --- a/api/http/security/bouncer.go +++ b/api/http/security/bouncer.go @@ -114,7 +114,6 @@ func (bouncer *RequestBouncer) EndpointAccess(r *http.Request, endpoint *portain // mwSecureHeaders provides secure headers middleware for handlers. func mwSecureHeaders(next http.Handler) http.Handler { return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) { - w.Header().Add("X-Frame-Options", "DENY") w.Header().Add("X-XSS-Protection", "1; mode=block") w.Header().Add("X-Content-Type-Options", "nosniff") next.ServeHTTP(w, r) From b7c48fcbed0fc174e313ccc4cf60ff2a2eb0337c Mon Sep 17 00:00:00 2001 From: Brian Kabiro Date: Thu, 4 Oct 2018 01:57:07 +0300 Subject: [PATCH 15/93] feat(visualizer): sort tasks in alphabetical order on refresh (#2329) - sort the tasks on each node in alphabetical order to make it easier to track what has changed --- app/docker/views/swarm/visualizer/swarmvisualizer.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/docker/views/swarm/visualizer/swarmvisualizer.html b/app/docker/views/swarm/visualizer/swarmvisualizer.html index 4f9e7f358..70716f2e6 100644 --- a/app/docker/views/swarm/visualizer/swarmvisualizer.html +++ b/app/docker/views/swarm/visualizer/swarmvisualizer.html @@ -97,7 +97,7 @@
{{ node.Status }}
-
+
{{ task.ServiceName }}
Image: {{ task.Spec.ContainerSpec.Image | hideshasum }}
Status: {{ task.Status.State }}
From 575735a6f751502e856d881467ae362631848137 Mon Sep 17 00:00:00 2001 From: Ricardo Cardona Ramirez Date: Wed, 3 Oct 2018 18:04:38 -0500 Subject: [PATCH 16/93] feat(ux): sort networks alphabetically in network selection dropdowns (#2326) * Sort network lists --- .../containerNetworksDatatable.html | 2 +- app/docker/views/containers/create/createcontainer.html | 2 +- app/docker/views/services/create/createservice.html | 2 +- app/portainer/views/templates/templates.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html index 9da49860c..a79fdc698 100644 --- a/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html +++ b/app/docker/components/datatables/container-networks-datatable/containerNetworksDatatable.html @@ -13,7 +13,7 @@
diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html index e946afa17..c6d13fb6f 100644 --- a/app/docker/views/containers/create/createcontainer.html +++ b/app/docker/views/containers/create/createcontainer.html @@ -309,7 +309,7 @@
diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html index 40d830f1a..2003ff97f 100644 --- a/app/docker/views/services/create/createservice.html +++ b/app/docker/views/services/create/createservice.html @@ -354,7 +354,7 @@
diff --git a/app/portainer/views/templates/templates.html b/app/portainer/views/templates/templates.html index 14bed010d..3149b2070 100644 --- a/app/portainer/views/templates/templates.html +++ b/app/portainer/views/templates/templates.html @@ -111,7 +111,7 @@
-
From f6d9a4c7c120f19033bb90b33c61bb675afb5136 Mon Sep 17 00:00:00 2001 From: Brian Kabiro Date: Thu, 4 Oct 2018 02:07:31 +0300 Subject: [PATCH 17/93] feat(nodes): display node name when available (#2328) - check if the name of a node is available, otherwise default to the Hostname --- .../components/datatables/nodes-datatable/nodesDatatable.html | 4 ++-- app/docker/views/swarm/visualizer/swarmvisualizer.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html index 20f575f41..0a647868d 100644 --- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html +++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html @@ -68,8 +68,8 @@ - {{ item.Hostname }} - {{ item.Hostname }} + {{ item.Name || item.Hostname }} + {{ item.Name || item.Hostname }} {{ item.Role }} {{ item.CPUs / 1000000000 }} diff --git a/app/docker/views/swarm/visualizer/swarmvisualizer.html b/app/docker/views/swarm/visualizer/swarmvisualizer.html index 70716f2e6..612354e25 100644 --- a/app/docker/views/swarm/visualizer/swarmvisualizer.html +++ b/app/docker/views/swarm/visualizer/swarmvisualizer.html @@ -84,7 +84,7 @@
- {{ node.Hostname }} + {{ node.Name || node.Hostname }} From 342266219105a2c056b31e274bf6f1bd86e021e3 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 4 Oct 2018 13:28:39 +1300 Subject: [PATCH 18/93] fix(app): fix invalid state name (#2330) * fix(app): fix invalid state name * fix(app): update ui-sref --- app/portainer/__module.js | 4 ++-- .../datatables/stacks-datatable/stacksDatatable.html | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/portainer/__module.js b/app/portainer/__module.js index 828c7ef41..d04e12b6e 100644 --- a/app/portainer/__module.js +++ b/app/portainer/__module.js @@ -287,8 +287,8 @@ angular.module('portainer.app', []) }; var stackCreation = { - name: 'portainer.stacks.new', - url: '/new', + name: 'portainer.newstack', + url: '/newstack', views: { 'content@': { templateUrl: 'app/portainer/views/stacks/create/createstack.html', diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html index 6c8dbbb79..5b640ea17 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html @@ -11,7 +11,7 @@ ng-disabled="$ctrl.state.selectedItemCount === 0" ng-click="$ctrl.removeAction($ctrl.state.selectedItems)"> Remove -
From 275fcf558741aadcd056b54eb4639ffb8b9cf9db Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Mon, 8 Oct 2018 01:34:47 +0300 Subject: [PATCH 19/93] fix(volume-browser): move volume id to query params (#2338) --- app/agent/rest/browse.js | 10 +++++----- app/agent/services/volumeBrowserService.js | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/app/agent/rest/browse.js b/app/agent/rest/browse.js index b4e8d53e0..9496768eb 100644 --- a/app/agent/rest/browse.js +++ b/app/agent/rest/browse.js @@ -1,22 +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', { + return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/browse/:action', { endpointId: EndpointProvider.endpointID }, { ls: { - method: 'GET', isArray: true, params: { id: '@id', action: 'ls' } + method: 'GET', isArray: true, params: { action: 'ls' } }, get: { - method: 'GET', params: { id: '@id', action: 'get' }, + method: 'GET', params: { action: 'get' }, transformResponse: browseGetResponse }, delete: { - method: 'DELETE', params: { id: '@id', action: 'delete' } + method: 'DELETE', params: { action: 'delete' } }, rename: { - method: 'PUT', params: { id: '@id', action: 'rename' } + method: 'PUT', params: { action: 'rename' } } }); }]); diff --git a/app/agent/services/volumeBrowserService.js b/app/agent/services/volumeBrowserService.js index 22b020494..2a5c92f56 100644 --- a/app/agent/services/volumeBrowserService.js +++ b/app/agent/services/volumeBrowserService.js @@ -4,15 +4,15 @@ angular.module('portainer.agent') var service = {}; service.ls = function(volumeId, path) { - return Browse.ls({ 'id': volumeId, 'path': path }).$promise; + return Browse.ls({ volumeID: volumeId, path: path }).$promise; }; service.get = function(volumeId, path) { - return Browse.get({ 'id': volumeId, 'path': path }).$promise; + return Browse.get({ volumeID: volumeId, path: path }).$promise; }; service.delete = function(volumeId, path) { - return Browse.delete({ 'id': volumeId, 'path': path }).$promise; + return Browse.delete({ volumeID: volumeId, path: path }).$promise; }; service.rename = function(volumeId, path, newPath) { @@ -20,7 +20,7 @@ angular.module('portainer.agent') CurrentFilePath: path, NewFilePath: newPath }; - return Browse.rename({ 'id': volumeId }, payload).$promise; + return Browse.rename({ volumeID: volumeId }, payload).$promise; }; return service; From ca08b2fa2a14bcece593fe587535a80a724cb6a4 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Mon, 8 Oct 2018 01:44:08 +0300 Subject: [PATCH 20/93] feat(host): replace engine view with host view (#2255) * feat(engine-details): remove old panels * feat(engine-details): add basic engine-details-panel component * feat(engine-details): pass details to the different components * feat(engine-details): replace host-view with host-overview * feat(engine-details): add commaseperated filter * feat(engine-details): add host-view container component * feat(engine-details): add host-details component * feat(engine-details): build host details object * feat(engine-details): format engine version * feat(engine-details): get details for one node * feat(engine-details): pass is-agent from view * feat(engine-details): replace old node view with a new component * feat(engine-details): add swarm-node-details component * feat(engine-details): remove isSwarm binding * feat(engine-details): remove node-details and include in parent * feat(engine-details): add labels-table component * feat(engine-details): add update node service * feat(engine-details): add update label functionality * style(engine-details): remove whitespaces * feat(engine-details): remove old node page * feat(engine-details): pass is agent to host details * feat(host-details): hide missing info * feat(host-details): update node availability * style(host-details): remove obsolete event object * feat(host-details): fix labels not sending * feat(host-details): remove flags for hiding data * feat(host-details): create mock call to server for agent host info * style(host-details): fix spelling mistake in filter's name * feat(host-details): get info from agent * feat(host-details): hide engine labels when empty * feat(node-details): move labels table and save button * feat(host-info): add different urls for refresh * feat(host-details): show disk/devices info for agent * feat(host-view): add loading indicator to devices-panel * feat(host-details): add loading indicator to disks panel * feat(host-details): show devices/disks on standalone agent * refactor(host-details): remove default value * refactor(host-details): remove redundant commaSeperated filter * refactor(host-details): remove unused functions * style(host-details): remove whitespace --- app/agent/rest/host.js | 15 ++ app/agent/services/agentService.js | 50 ++-- app/docker/__module.js | 14 +- .../dockerSidebarContent.html | 2 +- .../host-overview/host-overview.html | 17 ++ .../components/host-overview/host-overview.js | 12 + .../devices-panel/devices-panel.html | 31 +++ .../devices-panel/devices-panel.js | 7 + .../disks-panel/disks-panel.html | 31 +++ .../disks-panel/disks-panel.js | 7 + .../engine-details-panel.html | 37 +++ .../engine-details-panel.js | 7 + .../host-details-panel.html | 34 +++ .../host-details-panel/host-details-panel.js | 8 + .../node-availability-select-controller.js | 11 + .../node-availability-select.html | 8 + .../node-availability-select.js | 10 + .../node-labels-table-controller.js | 23 ++ .../node-labels-table/node-labels-table.html | 35 +++ .../node-labels-table/node-labels-table.js | 9 + .../swarm-node-details-panel-controller.js | 96 +++++++ .../swarm-node-details-panel.html | 75 ++++++ .../swarm-node-details-panel.js | 9 + app/docker/services/nodeService.js | 64 +++-- app/docker/views/engine/engine.html | 118 --------- app/docker/views/engine/engineController.js | 22 -- app/docker/views/host/host-view-controller.js | 70 +++++ app/docker/views/host/host-view.html | 8 + app/docker/views/host/host-view.js | 4 + app/docker/views/nodes/edit/node.html | 243 ------------------ app/docker/views/nodes/edit/nodeController.js | 96 ------- .../node-details-view-controller.js | 75 ++++++ .../nodes/node-details/node-details-view.html | 13 + .../nodes/node-details/node-details-view.js | 4 + 34 files changed, 737 insertions(+), 528 deletions(-) create mode 100644 app/agent/rest/host.js create mode 100644 app/docker/components/host-overview/host-overview.html create mode 100644 app/docker/components/host-overview/host-overview.js create mode 100644 app/docker/components/host-view-panels/devices-panel/devices-panel.html create mode 100644 app/docker/components/host-view-panels/devices-panel/devices-panel.js create mode 100644 app/docker/components/host-view-panels/disks-panel/disks-panel.html create mode 100644 app/docker/components/host-view-panels/disks-panel/disks-panel.js create mode 100644 app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html create mode 100644 app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.js create mode 100644 app/docker/components/host-view-panels/host-details-panel/host-details-panel.html create mode 100644 app/docker/components/host-view-panels/host-details-panel/host-details-panel.js create mode 100644 app/docker/components/host-view-panels/node-availability-select/node-availability-select-controller.js create mode 100644 app/docker/components/host-view-panels/node-availability-select/node-availability-select.html create mode 100644 app/docker/components/host-view-panels/node-availability-select/node-availability-select.js create mode 100644 app/docker/components/host-view-panels/node-labels-table/node-labels-table-controller.js create mode 100644 app/docker/components/host-view-panels/node-labels-table/node-labels-table.html create mode 100644 app/docker/components/host-view-panels/node-labels-table/node-labels-table.js create mode 100644 app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel-controller.js create mode 100644 app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html create mode 100644 app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.js delete mode 100644 app/docker/views/engine/engine.html delete mode 100644 app/docker/views/engine/engineController.js create mode 100644 app/docker/views/host/host-view-controller.js create mode 100644 app/docker/views/host/host-view.html create mode 100644 app/docker/views/host/host-view.js delete mode 100644 app/docker/views/nodes/edit/node.html delete mode 100644 app/docker/views/nodes/edit/nodeController.js create mode 100644 app/docker/views/nodes/node-details/node-details-view-controller.js create mode 100644 app/docker/views/nodes/node-details/node-details-view.html create mode 100644 app/docker/views/nodes/node-details/node-details-view.js diff --git a/app/agent/rest/host.js b/app/agent/rest/host.js new file mode 100644 index 000000000..a717def30 --- /dev/null +++ b/app/agent/rest/host.js @@ -0,0 +1,15 @@ +angular.module('portainer.agent').factory('Host', [ + '$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', + function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { + 'use strict'; + return $resource( + API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/host/:action', + { + endpointId: EndpointProvider.endpointID + }, + { + info: { method: 'GET', params: { action: 'info' } } + } + ); + } +]); diff --git a/app/agent/services/agentService.js b/app/agent/services/agentService.js index 5f011d01c..7143e1e0f 100644 --- a/app/agent/services/agentService.js +++ b/app/agent/services/agentService.js @@ -1,24 +1,34 @@ -angular.module('portainer.agent') -.factory('AgentService', ['$q', 'Agent', function AgentServiceFactory($q, Agent) { - 'use strict'; - var service = {}; +angular.module('portainer.agent').factory('AgentService', [ + '$q', 'Agent','HttpRequestHelper', 'Host', + function AgentServiceFactory($q, Agent, HttpRequestHelper, Host) { + 'use strict'; + var service = {}; - service.agents = function() { - var deferred = $q.defer(); + service.agents = agents; + service.hostInfo = hostInfo; - Agent.query({}).$promise - .then(function success(data) { - var agents = data.map(function (item) { - return new AgentViewModel(item); - }); - deferred.resolve(agents); - }) - .catch(function error(err) { - deferred.reject({ msg: 'Unable to retrieve agents', err: err }); - }); + function hostInfo(nodeName) { + HttpRequestHelper.setPortainerAgentTargetHeader(nodeName); + return Host.info().$promise; + } - return deferred.promise; - }; + function agents() { + var deferred = $q.defer(); - return service; -}]); + Agent.query({}) + .$promise.then(function success(data) { + var agents = data.map(function(item) { + return new AgentViewModel(item); + }); + deferred.resolve(agents); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve agents', err: err }); + }); + + return deferred.promise; + } + + return service; + } +]); diff --git a/app/docker/__module.js b/app/docker/__module.js index ffd451fbd..23ce18433 100644 --- a/app/docker/__module.js +++ b/app/docker/__module.js @@ -129,13 +129,12 @@ angular.module('portainer.docker', ['portainer.app']) } }; - var engine = { - name: 'docker.engine', - url: '/engine', + var host = { + name: 'docker.host', + url: '/host', views: { 'content@': { - templateUrl: 'app/docker/views/engine/engine.html', - controller: 'EngineController' + component: 'hostView' } } }; @@ -239,8 +238,7 @@ angular.module('portainer.docker', ['portainer.app']) url: '/:id', views: { 'content@': { - templateUrl: 'app/docker/views/nodes/edit/node.html', - controller: 'NodeController' + component: 'nodeDetailsView' } } }; @@ -428,7 +426,7 @@ angular.module('portainer.docker', ['portainer.app']) $stateRegistryProvider.register(containerStats); $stateRegistryProvider.register(docker); $stateRegistryProvider.register(dashboard); - $stateRegistryProvider.register(engine); + $stateRegistryProvider.register(host); $stateRegistryProvider.register(events); $stateRegistryProvider.register(images); $stateRegistryProvider.register(image); diff --git a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html index 870c959ed..2e0eeb497 100644 --- a/app/docker/components/dockerSidebarContent/dockerSidebarContent.html +++ b/app/docker/components/dockerSidebarContent/dockerSidebarContent.html @@ -35,5 +35,5 @@ Swarm
  • - Engine + Host
    • diff --git a/app/docker/components/host-overview/host-overview.html b/app/docker/components/host-overview/host-overview.html new file mode 100644 index 000000000..baa43628e --- /dev/null +++ b/app/docker/components/host-overview/host-overview.html @@ -0,0 +1,17 @@ + + + + + + + Docker + + + + + + + + + + \ No newline at end of file diff --git a/app/docker/components/host-overview/host-overview.js b/app/docker/components/host-overview/host-overview.js new file mode 100644 index 000000000..add9515b4 --- /dev/null +++ b/app/docker/components/host-overview/host-overview.js @@ -0,0 +1,12 @@ +angular.module('portainer.docker').component('hostOverview', { + templateUrl: 'app/docker/components/host-overview/host-overview.html', + bindings: { + hostDetails: '<', + engineDetails: '<', + devices: '<', + disks: '<', + isAgent: '<', + refreshUrl: '@' + }, + transclude: true +}); diff --git a/app/docker/components/host-view-panels/devices-panel/devices-panel.html b/app/docker/components/host-view-panels/devices-panel/devices-panel.html new file mode 100644 index 000000000..5279f4ac1 --- /dev/null +++ b/app/docker/components/host-view-panels/devices-panel/devices-panel.html @@ -0,0 +1,31 @@ +
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    NameVendor
    {{device.Name}}{{device.Vendor}}
    Loading...
    + No device available. +
    +     +     +
    +
    \ No newline at end of file diff --git a/app/docker/components/host-view-panels/devices-panel/devices-panel.js b/app/docker/components/host-view-panels/devices-panel/devices-panel.js new file mode 100644 index 000000000..1bd32e1f6 --- /dev/null +++ b/app/docker/components/host-view-panels/devices-panel/devices-panel.js @@ -0,0 +1,7 @@ +angular.module('portainer.docker').component('devicesPanel', { + templateUrl: + 'app/docker/components/host-view-panels/devices-panel/devices-panel.html', + bindings: { + devices: '<' + } +}); diff --git a/app/docker/components/host-view-panels/disks-panel/disks-panel.html b/app/docker/components/host-view-panels/disks-panel/disks-panel.html new file mode 100644 index 000000000..632f07151 --- /dev/null +++ b/app/docker/components/host-view-panels/disks-panel/disks-panel.html @@ -0,0 +1,31 @@ +
    +
    + + + + + + + + + + + + + + + + + + + + + + +
    VendorSize
    {{disk.Vendor}}{{disk.Size | humansize}}
    Loading...
    + No disks available. +
    +     +     +
    +
    \ No newline at end of file diff --git a/app/docker/components/host-view-panels/disks-panel/disks-panel.js b/app/docker/components/host-view-panels/disks-panel/disks-panel.js new file mode 100644 index 000000000..ae96224ee --- /dev/null +++ b/app/docker/components/host-view-panels/disks-panel/disks-panel.js @@ -0,0 +1,7 @@ +angular.module('portainer.docker').component('disksPanel', { + templateUrl: + 'app/docker/components/host-view-panels/disks-panel/disks-panel.html', + bindings: { + disks: '<' + } +}); diff --git a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html new file mode 100644 index 000000000..4eebf6bcd --- /dev/null +++ b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html @@ -0,0 +1,37 @@ +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Version{{ $ctrl.engine.releaseVersion }} (API: {{ $ctrl.engine.apiVersion }})
    Root directory{{ $ctrl.engine.rootDirectory }}
    Storage Driver{{ $ctrl.engine.storageDriver }}
    Logging Driver{{ $ctrl.engine.loggingDriver }}
    Volume Plugins{{ $ctrl.engine.volumePlugins | arraytostr: ', ' }}
    Network Plugins{{ $ctrl.engine.networkPlugins | arraytostr: ', ' }}
    +     +     +
    +
    \ No newline at end of file diff --git a/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.js b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.js new file mode 100644 index 000000000..666dd5254 --- /dev/null +++ b/app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.js @@ -0,0 +1,7 @@ +angular.module('portainer.docker').component('engineDetailsPanel', { + templateUrl: + 'app/docker/components/host-view-panels/engine-details-panel/engine-details-panel.html', + bindings: { + engine: '<' + } +}); diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html new file mode 100644 index 000000000..2ea05f88f --- /dev/null +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html @@ -0,0 +1,34 @@ +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Hostname{{ $ctrl.host.name }}
    OS Information{{ $ctrl.host.os.type }} {{$ctrl.host.os.arch}} + {{$ctrl.host.os.name}}
    Kernel Version{{ $ctrl.host.kernelVersion }}
    Total CPU{{ $ctrl.host.totalCPU }}
    Total memory{{ $ctrl.host.totalMemory | humansize }}
    +     +     +
    +
    \ No newline at end of file diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js new file mode 100644 index 000000000..6865b5872 --- /dev/null +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js @@ -0,0 +1,8 @@ +angular.module('portainer.docker').component('hostDetailsPanel', { + templateUrl: + 'app/docker/components/host-view-panels/host-details-panel/host-details-panel.html', + bindings: { + host: '<', + isAgent: '<' + } +}); diff --git a/app/docker/components/host-view-panels/node-availability-select/node-availability-select-controller.js b/app/docker/components/host-view-panels/node-availability-select/node-availability-select-controller.js new file mode 100644 index 000000000..52df40cd6 --- /dev/null +++ b/app/docker/components/host-view-panels/node-availability-select/node-availability-select-controller.js @@ -0,0 +1,11 @@ +angular + .module('portainer.docker') + .controller('NodeAvailabilitySelectController', [ + function NodeAvailabilitySelectController() { + this.onChange = onChange; + + function onChange() { + this.onSave({ availability: this.availability }); + } + } + ]); diff --git a/app/docker/components/host-view-panels/node-availability-select/node-availability-select.html b/app/docker/components/host-view-panels/node-availability-select/node-availability-select.html new file mode 100644 index 000000000..94e086127 --- /dev/null +++ b/app/docker/components/host-view-panels/node-availability-select/node-availability-select.html @@ -0,0 +1,8 @@ +
    + +
    \ No newline at end of file diff --git a/app/docker/components/host-view-panels/node-availability-select/node-availability-select.js b/app/docker/components/host-view-panels/node-availability-select/node-availability-select.js new file mode 100644 index 000000000..b09730f37 --- /dev/null +++ b/app/docker/components/host-view-panels/node-availability-select/node-availability-select.js @@ -0,0 +1,10 @@ +angular.module('portainer.docker').component('nodeAvailabilitySelect', { + templateUrl: + 'app/docker/components/host-view-panels/node-availability-select/node-availability-select.html', + controller: 'NodeAvailabilitySelectController', + bindings: { + availability: '<', + originalValue: '<', + onSave: '&' + } +}); diff --git a/app/docker/components/host-view-panels/node-labels-table/node-labels-table-controller.js b/app/docker/components/host-view-panels/node-labels-table/node-labels-table-controller.js new file mode 100644 index 000000000..a9ad8ab58 --- /dev/null +++ b/app/docker/components/host-view-panels/node-labels-table/node-labels-table-controller.js @@ -0,0 +1,23 @@ +angular.module('portainer.docker').controller('NodeLabelsTableController', [ + function NodeLabelsTableController() { + var ctrl = this; + ctrl.removeLabel = removeLabel; + ctrl.updateLabel = updateLabel; + + function removeLabel(index) { + var label = ctrl.labels.splice(index, 1); + if (label !== null) { + ctrl.onChangedLabels({ labels: ctrl.labels }); + } + } + + function updateLabel(label) { + if ( + label.value !== label.originalValue || + label.key !== label.originalKey + ) { + ctrl.onChangedLabels({ labels: ctrl.labels }); + } + } + } +]); diff --git a/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html new file mode 100644 index 000000000..86eee9356 --- /dev/null +++ b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.html @@ -0,0 +1,35 @@ +
    + There are no labels for this node. +
    + + + + + + + + + + + + + + +
    LabelValue
    +
    + Name + +
    +     		+
    + Value + + + + +
    +
    \ No newline at end of file diff --git a/app/docker/components/host-view-panels/node-labels-table/node-labels-table.js b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.js new file mode 100644 index 000000000..5d6d6c320 --- /dev/null +++ b/app/docker/components/host-view-panels/node-labels-table/node-labels-table.js @@ -0,0 +1,9 @@ +angular.module('portainer.docker').component('nodeLabelsTable', { + templateUrl: + 'app/docker/components/host-view-panels/node-labels-table/node-labels-table.html', + controller: 'NodeLabelsTableController', + bindings: { + labels: '<', + onChangedLabels: '&' + } +}); diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel-controller.js b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel-controller.js new file mode 100644 index 000000000..65e376d99 --- /dev/null +++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel-controller.js @@ -0,0 +1,96 @@ +angular + .module('portainer.docker') + .controller('SwarmNodeDetailsPanelController', [ + 'NodeService', 'LabelHelper', 'Notifications', '$state', + function SwarmNodeDetailsPanelController(NodeService, LabelHelper, Notifications, $state) { + var ctrl = this; + ctrl.state = { + managerAddress: '', + hasChanges: false + }; + ctrl.$onChanges = $onChanges; + ctrl.addLabel = addLabel; + ctrl.updateNodeLabels = updateNodeLabels; + ctrl.updateNodeAvailability = updateNodeAvailability; + ctrl.saveChanges = saveChanges; + ctrl.cancelChanges = cancelChanges; + + var managerRole = 'manager'; + + function $onChanges() { + if (!ctrl.details) { + return; + } + if (ctrl.details.role === managerRole) { + ctrl.state.managerAddress = '(' + ctrl.details.managerAddress + ')'; + } + } + + function addLabel() { + ctrl.details.nodeLabels.push({ + key: '', + value: '', + originalValue: '', + originalKey: '' + }); + } + + function updateNodeLabels(labels) { + ctrl.details.nodeLabels = labels; + ctrl.state.hasChanges = true; + } + + function updateNodeAvailability(availability) { + ctrl.details.availability = availability; + ctrl.state.hasChanges = true; + } + + function saveChanges() { + var originalNode = ctrl.originalNode; + var config = { + Name: originalNode.Name, + Availability: ctrl.details.availability, + Role: originalNode.Role, + Labels: LabelHelper.fromKeyValueToLabelHash(ctrl.details.nodeLabels), + Id: originalNode.Id, + Version: originalNode.Version + }; + + NodeService.updateNode(config) + .then(onUpdateSuccess) + .catch(notifyOnError); + + function onUpdateSuccess() { + Notifications.success('Node successfully updated', 'Node updated'); + $state.go( + 'docker.nodes.node', + { id: originalNode.Id }, + { reload: true } + ); + } + + function notifyOnError(error) { + Notifications.error('Failure', error, 'Failed to update node'); + } + } + + function cancelChanges() { + cancelLabelChanges(); + ctrl.details.availability = ctrl.originalNode.Availability; + ctrl.state.hasChanges = false; + } + + function cancelLabelChanges() { + ctrl.details.nodeLabels = ctrl.details.nodeLabels + .filter(function(label) { + return label.originalValue || label.originalKey; + }) + .map(function(label) { + return Object.assign(label, { + value: label.originalValue, + key: label.originalKey + }); + }); + } + } + ]); diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html new file mode 100644 index 000000000..291025e13 --- /dev/null +++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html @@ -0,0 +1,75 @@ +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
    Node name{{ $ctrl.details.name }}
    Role{{ $ctrl.details.role }} {{ $ctrl.state.managerAddress }}
    Availability + + +
    Status{{ + $ctrl.details.status }}
    Engine Labels{{ $ctrl.details.engineLabels | arraytostr:', ' }}
    +
    + + label + +
    + Node Labels +
    + +
    + +
    + +     +     +
    +
    \ No newline at end of file diff --git a/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.js b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.js new file mode 100644 index 000000000..7eea3e708 --- /dev/null +++ b/app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.js @@ -0,0 +1,9 @@ +angular.module('portainer.docker').component('swarmNodeDetailsPanel', { + templateUrl: + 'app/docker/components/host-view-panels/swarm-node-details-panel/swarm-node-details-panel.html', + controller: 'SwarmNodeDetailsPanelController', + bindings: { + details: '<', + originalNode: '<' + } +}); diff --git a/app/docker/services/nodeService.js b/app/docker/services/nodeService.js index 706f26647..5ebfeeee4 100644 --- a/app/docker/services/nodeService.js +++ b/app/docker/services/nodeService.js @@ -1,24 +1,48 @@ -angular.module('portainer.docker') -.factory('NodeService', ['$q', 'Node', function NodeServiceFactory($q, Node) { - 'use strict'; - var service = {}; +angular.module('portainer.docker').factory('NodeService', [ + '$q', 'Node', + function NodeServiceFactory($q, Node) { + 'use strict'; + var service = {}; - service.nodes = function() { - var deferred = $q.defer(); + service.nodes = nodes; + service.node = node; + service.updateNode = updateNode; - Node.query({}).$promise - .then(function success(data) { - var nodes = data.map(function (item) { - return new NodeViewModel(item); - }); - deferred.resolve(nodes); - }) - .catch(function error(err) { - deferred.reject({ msg: 'Unable to retrieve nodes', err: err }); - }); + function node(id) { + var deferred = $q.defer(); + Node.get({ id: id }) + .$promise.then(function onNodeLoaded(rawNode) { + var node = new NodeViewModel(rawNode); + return deferred.resolve(node); + }) + .catch(function onFailed(err) { + deferred.reject({ msg: 'Unable to retrieve node', err: err }); + }); - return deferred.promise; - }; + return deferred.promise; + } - return service; -}]); + function nodes() { + var deferred = $q.defer(); + + Node.query({}) + .$promise.then(function success(data) { + var nodes = data.map(function(item) { + return new NodeViewModel(item); + }); + deferred.resolve(nodes); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve nodes', err: err }); + }); + + return deferred.promise; + } + + function updateNode(node) { + return Node.update({ id: node.Id, version: node.Version }, node).$promise; + } + + return service; + } +]); diff --git a/app/docker/views/engine/engine.html b/app/docker/views/engine/engine.html deleted file mode 100644 index 73b1248b2..000000000 --- a/app/docker/views/engine/engine.html +++ /dev/null @@ -1,118 +0,0 @@ - - - - - - - Docker - - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Version{{ version.Version }}
    API version{{ version.ApiVersion }}
    Go version{{ version.GoVersion }}
    OS type{{ version.Os }}
    OS{{ info.OperatingSystem }}
    Architecture{{ version.Arch }}
    Kernel version{{ version.KernelVersion }}
    -     -     -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Total CPU{{ info.NCPU }}
    Total memory{{ info.MemTotal|humansize }}
    Docker root directory{{ info.DockerRootDir }}
    Storage driver{{ info.Driver }}
    Logging driver{{ info.LoggingDriver }}
    Cgroup driver{{ info.CgroupDriver }}
    Execution driver{{ info.ExecutionDriver }}
    -     -     -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - -
    Volume{{ info.Plugins.Volume|arraytostr: ', '}}
    Network{{ info.Plugins.Network|arraytostr: ', '}}
    Authorization{{ info.Plugins.Authorization|arraytostr: ', '}}
    -     -     -
    -
    diff --git a/app/docker/views/engine/engineController.js b/app/docker/views/engine/engineController.js deleted file mode 100644 index f106273a5..000000000 --- a/app/docker/views/engine/engineController.js +++ /dev/null @@ -1,22 +0,0 @@ -angular.module('portainer.docker') -.controller('EngineController', ['$q', '$scope', 'SystemService', 'Notifications', -function ($q, $scope, SystemService, Notifications) { - - function initView() { - $q.all({ - version: SystemService.version(), - info: SystemService.info() - }) - .then(function success(data) { - $scope.version = data.version; - $scope.info = data.info; - }) - .catch(function error(err) { - $scope.info = {}; - $scope.version = {}; - Notifications.error('Failure', err, 'Unable to retrieve engine details'); - }); - } - - initView(); -}]); diff --git a/app/docker/views/host/host-view-controller.js b/app/docker/views/host/host-view-controller.js new file mode 100644 index 000000000..43bc49391 --- /dev/null +++ b/app/docker/views/host/host-view-controller.js @@ -0,0 +1,70 @@ +angular.module('portainer.docker').controller('HostViewController', [ + '$q', 'SystemService', 'Notifications', 'StateManager', 'AgentService', + function HostViewController($q, SystemService, Notifications, StateManager, AgentService) { + var ctrl = this; + this.$onInit = initView; + + ctrl.state = { + isAgent: false + }; + + this.engineDetails = {}; + this.hostDetails = {}; + + function initView() { + var applicationState = StateManager.getState(); + ctrl.state.isAgent = applicationState.endpoint.mode.agentProxy; + + $q.all({ + version: SystemService.version(), + info: SystemService.info() + }) + .then(function success(data) { + ctrl.engineDetails = buildEngineDetails(data); + ctrl.hostDetails = buildHostDetails(data.info); + + if (ctrl.state.isAgent) { + return AgentService.hostInfo(data.info.Hostname).then(function onHostInfoLoad(agentHostInfo) { + ctrl.devices = agentHostInfo.PCIDevices; + ctrl.disks = agentHostInfo.PhysicalDisks; + }); + } + }) + .catch(function error(err) { + Notifications.error( + 'Failure', + err, + 'Unable to retrieve engine details' + ); + }); + } + + function buildEngineDetails(data) { + var versionDetails = data.version; + var info = data.info; + return { + releaseVersion: versionDetails.Version, + apiVersion: versionDetails.ApiVersion, + rootDirectory: info.DockerRootDir, + storageDriver: info.Driver, + loggingDriver: info.LoggingDriver, + volumePlugins: info.Plugins.Volume, + networkPlugins: info.Plugins.Network + }; + } + + function buildHostDetails(info) { + return { + os: { + arch: info.Architecture, + type: info.OSType, + name: info.OperatingSystem + }, + name: info.Name, + kernelVersion: info.KernelVersion, + totalCPU: info.NCPU, + totalMemory: info.MemTotal + }; + } + } +]); diff --git a/app/docker/views/host/host-view.html b/app/docker/views/host/host-view.html new file mode 100644 index 000000000..419e96995 --- /dev/null +++ b/app/docker/views/host/host-view.html @@ -0,0 +1,8 @@ + \ No newline at end of file diff --git a/app/docker/views/host/host-view.js b/app/docker/views/host/host-view.js new file mode 100644 index 000000000..e321dccb4 --- /dev/null +++ b/app/docker/views/host/host-view.js @@ -0,0 +1,4 @@ +angular.module('portainer.docker').component('hostView', { + templateUrl: 'app/docker/views/host/host-view.html', + controller: 'HostViewController' +}); diff --git a/app/docker/views/nodes/edit/node.html b/app/docker/views/nodes/edit/node.html deleted file mode 100644 index b7d733206..000000000 --- a/app/docker/views/nodes/edit/node.html +++ /dev/null @@ -1,243 +0,0 @@ - - - - - - - - Swarm nodes > {{ node.Hostname }} - - - -
    -
    -
    - Loading... -
    - - - - -

    It looks like the node you wish to inspect does not exist.

    -     -     -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    Name - -
    Host name{{ node.Hostname }}
    Role{{ node.Role }}
    Availability -
    - -
    -
    Status{{ node.Status }}
    -     - -

    - View the Docker Swarm mode Node documentation here. -

    - -     -     -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - -
    Leader - Yes - No -
    Reachability{{ node.Reachability }}
    Manager address{{ node.ManagerAddr }}
    -     -     -
    -
    - -
    -
    - - - - - - - - - - - - - - - - - - - - - - -
    CPU{{ node.CPUs / 1000000000 }}
    Memory{{ node.Memory|humansize: 2 }}
    Platform{{ node.PlatformOS }} {{ node.PlatformArchitecture }}
    Docker Engine version{{ node.EngineVersion }}
    -     -     -
    -
    - -
    -
    - - - -

    There are no engine labels for this node.

    -     - - - - - - - - - - - - - - -
    LabelValue
    {{ engineLabel.key }}{{ engineLabel.value }}
    -     -     -
    -
    - -
    -
    - - -
    - - label - -
    -     - -

    There are no labels for this node.

    -     - - - - - - - - - - - - - - -
    LabelValue
    -
    - name - -
    -     		-
    - value - - - - -
    -
    -     - - - -     -
    -
    - -
    -
    - -
    -
    diff --git a/app/docker/views/nodes/edit/nodeController.js b/app/docker/views/nodes/edit/nodeController.js deleted file mode 100644 index 30f210b2a..000000000 --- a/app/docker/views/nodes/edit/nodeController.js +++ /dev/null @@ -1,96 +0,0 @@ -angular.module('portainer.docker') -.controller('NodeController', ['$scope', '$state', '$transition$', 'LabelHelper', 'Node', 'NodeHelper', 'Task', 'Notifications', -function ($scope, $state, $transition$, LabelHelper, Node, NodeHelper, Task, Notifications) { - - $scope.loading = true; - $scope.tasks = []; - - var originalNode = {}; - var editedKeys = []; - - $scope.updateNodeAttribute = function updateNodeAttribute(node, key) { - editedKeys.push(key); - }; - $scope.addLabel = function addLabel(node) { - node.Labels.push({ key: '', value: '', originalValue: '', originalKey: '' }); - $scope.updateNodeAttribute(node, 'Labels'); - }; - $scope.removeLabel = function removeLabel(node, index) { - var removedElement = node.Labels.splice(index, 1); - if (removedElement !== null) { - $scope.updateNodeAttribute(node, 'Labels'); - } - }; - $scope.updateLabel = function updateLabel(node, label) { - if (label.value !== label.originalValue || label.key !== label.originalKey) { - $scope.updateNodeAttribute(node, 'Labels'); - } - }; - - $scope.hasChanges = function(node, elements) { - if (!elements) { - elements = Object.keys(originalNode); - } - var hasChanges = false; - elements.forEach(function(key) { - hasChanges = hasChanges || ((editedKeys.indexOf(key) >= 0) && node[key] !== originalNode[key]); - }); - return hasChanges; - }; - - $scope.cancelChanges = function(node) { - editedKeys.forEach(function(key) { - node[key] = originalNode[key]; - }); - editedKeys = []; - }; - - $scope.updateNode = function updateNode(node) { - var config = NodeHelper.nodeToConfig(node.Model); - config.Name = node.Name; - config.Availability = node.Availability; - config.Role = node.Role; - config.Labels = LabelHelper.fromKeyValueToLabelHash(node.Labels); - - Node.update({ id: node.Id, version: node.Version }, config, function () { - Notifications.success('Node successfully updated', 'Node updated'); - $state.go('docker.nodes.node', {id: node.Id}, {reload: true}); - }, function (e) { - Notifications.error('Failure', e, 'Failed to update node'); - }); - }; - - function loadNodeAndTasks() { - $scope.loading = true; - if ($scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE') { - Node.get({ id: $transition$.params().id}, function(d) { - if (d.message) { - Notifications.error('Failure', e, 'Unable to inspect the node'); - } else { - var node = new NodeViewModel(d); - originalNode = angular.copy(node); - $scope.node = node; - getTasks(d); - } - $scope.loading = false; - }); - } else { - $scope.loading = false; - } - } - - function getTasks(node) { - if (node) { - Task.query({filters: {node: [node.ID]}}, function (tasks) { - $scope.tasks = tasks.map(function (task) { - return new TaskViewModel(task); - }); - }, function (e) { - Notifications.error('Failure', e, 'Unable to retrieve tasks associated to the node'); - }); - } - } - - loadNodeAndTasks(); - -}]); diff --git a/app/docker/views/nodes/node-details/node-details-view-controller.js b/app/docker/views/nodes/node-details/node-details-view-controller.js new file mode 100644 index 000000000..cde111986 --- /dev/null +++ b/app/docker/views/nodes/node-details/node-details-view-controller.js @@ -0,0 +1,75 @@ +angular.module('portainer.docker').controller('NodeDetailsViewController', [ + '$stateParams', 'NodeService', 'StateManager', 'AgentService', + function NodeDetailsViewController($stateParams, NodeService, StateManager, AgentService) { + var ctrl = this; + + ctrl.$onInit = initView; + + ctrl.state = { + isAgent: false + }; + + function initView() { + var applicationState = StateManager.getState(); + ctrl.state.isAgent = applicationState.endpoint.mode.agentProxy; + + var nodeId = $stateParams.id; + NodeService.node(nodeId).then(function(node) { + ctrl.originalNode = node; + ctrl.hostDetails = buildHostDetails(node); + ctrl.engineDetails = buildEngineDetails(node); + ctrl.nodeDetails = buildNodeDetails(node); + if (ctrl.state.isAgent) { + AgentService.hostInfo(node.Hostname).then(function onHostInfoLoad( + agentHostInfo + ) { + ctrl.devices = agentHostInfo.PCIDevices; + ctrl.disks = agentHostInfo.PhysicalDisks; + }); + } + }); + } + + function buildHostDetails(node) { + return { + os: { + arch: node.PlatformArchitecture, + type: node.PlatformOS + }, + name: node.Hostname, + totalCPU: node.CPUs / 1e9, + totalMemory: node.Memory + }; + } + + function buildEngineDetails(node) { + return { + releaseVersion: node.EngineVersion, + volumePlugins: transformPlugins(node.Plugins, 'Volume'), + networkPlugins: transformPlugins(node.Plugins, 'Network') + }; + } + + function buildNodeDetails(node) { + return { + name: node.Name, + role: node.Role, + managerAddress: node.ManagerAddr, + availability: node.Availability, + status: node.Status, + engineLabels: node.EngineLabels, + nodeLabels: node.Labels + }; + } + + function transformPlugins(pluginsList, type) { + return pluginsList + .filter(function(plugin) { + return plugin.Type === type; + }) + .map(function(plugin) { + return plugin.Name; + }); + } + } +]); diff --git a/app/docker/views/nodes/node-details/node-details-view.html b/app/docker/views/nodes/node-details/node-details-view.html new file mode 100644 index 000000000..13df99558 --- /dev/null +++ b/app/docker/views/nodes/node-details/node-details-view.html @@ -0,0 +1,13 @@ + + + \ No newline at end of file diff --git a/app/docker/views/nodes/node-details/node-details-view.js b/app/docker/views/nodes/node-details/node-details-view.js new file mode 100644 index 000000000..5b1c76e2b --- /dev/null +++ b/app/docker/views/nodes/node-details/node-details-view.js @@ -0,0 +1,4 @@ +angular.module('portainer.docker').component('nodeDetailsView', { + templateUrl: 'app/docker/views/nodes/node-details/node-details-view.html', + controller: 'NodeDetailsViewController' +}); From e948d606f403bca894d2cb2618678804a943a145 Mon Sep 17 00:00:00 2001 From: baron_l Date: Mon, 8 Oct 2018 22:28:26 +0200 Subject: [PATCH 21/93] fix(container-creation): set a default runtime value (#2325) * fix(containers): creating a container with default runtime let the docker daemon assume the correct value * refactor(containers): implementation simplification of default runtime value --- .../containers/create/createContainerController.js | 10 ++-------- .../views/containers/create/createcontainer.html | 10 +++++----- 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js index 83b153e44..ddddda3ad 100644 --- a/app/docker/views/containers/create/createContainerController.js +++ b/app/docker/views/containers/create/createContainerController.js @@ -544,14 +544,8 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai SystemService.info() .then(function success(data) { - var runtimes = data.Runtimes; - $scope.availableRuntimes = runtimes; - if ('runc' in runtimes) { - $scope.config.HostConfig.Runtime = 'runc'; - } - else if (Object.keys(runtimes).length !== 0) { - $scope.config.HostConfig.Runtime = Object.keys(runtimes)[0]; - } + $scope.availableRuntimes = Object.keys(data.Runtimes); + $scope.config.HostConfig.Runtime = ''; $scope.state.sliderMaxCpu = 32; if (data.NCPU) { $scope.state.sliderMaxCpu = data.NCPU; diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html index c6d13fb6f..a14c8f1d4 100644 --- a/app/docker/views/containers/create/createcontainer.html +++ b/app/docker/views/containers/create/createcontainer.html @@ -503,11 +503,11 @@
    - -
    - +
    From 5341ad33af24fb54f1c2fe947b7530a145ff2d16 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 11 Oct 2018 13:09:51 +1300 Subject: [PATCH 22/93] docs(swagger): update StackUpdateRequest model (#2360) --- api/swagger.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/api/swagger.yaml b/api/swagger.yaml index ba5745801..5a6e7ff87 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -4273,7 +4273,7 @@ definitions: Prune: type: "boolean" example: false - description: "Prune services that are no longer referenced" + description: "Prune services that are no longer referenced (only available for Swarm stacks)" StackFileInspectResponse: type: "object" properties: From c5aecfe6f3205db177b04a1fb3c3c9ee6ae405bf Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Fri, 12 Oct 2018 01:32:17 +0300 Subject: [PATCH 23/93] feat(host): Add host file browser with upload/download files (#2337) * feat(agent): add new host page * feat(agent): convert volume-browser to files-datatable * fix(agent): browse folders in file-datatable * feat(engine-details): replace engine view with host view * feat(engine-details): remove old panels * feat(engine-details): add basic engine-details-panel component * feat(engine-details): pass details to the different components * feat(engine-details): replace host-view with host-overview * feat(engine-details): add commaseperated filter * feat(engine-details): add host-view container component * feat(engine-details): add host-details component * feat(engine-details): build host details object * feat(engine-details): format engine version * feat(engine-details): get details for one node * feat(engine-details): pass is-agent from view * feat(engine-details): replace old node view with a new component * feat(engine-details): add swarm-node-details component * feat(engine-details): remove isSwarm binding * feat(engine-details): remove node-details and include in parent * feat(engine-details): add labels-table component * feat(engine-details): add update node service * feat(engine-details): add update label functionality * style(engine-details): remove whitespaces * feat(engine-details): remove old node page * feat(engine-details): pass is agent to host details * feat(host-details): hide missing info * feat(host-details): update node availability * style(host-details): remove obsolete event object * feat(host-details): fix labels not sending * feat(host-details): remove flags for hiding data * feat(host-details): create mock call to server for agent host info * style(host-details): fix spelling mistake in filter's name * feat(host-details): get info from agent * feat(host-details): hide engine labels when empty * feat(node-details): move labels table and save button * feat(host-info): add different urls for refresh * feat(host-details): show disk/devices info for agent * feat(host-view): add loading indicator to devices-panel * feat(host-details): add loading indicator to disks panel * feat(agent): fix browse volume * feat(agent): browse files * feat(agent): enable rename * feat(agent): download file * fix(agent): download file from root * feat(agent): delete file * style(agent): remove whitespaces * fix(agent): fix link on node browser * feat(agent): basic file uploader * feat(agent): add basic file upload * fix(volume-browser): move volume id to query params * feat(node-browser): moved uploader into browser * feat(node-browser): add upload spinner * feat(agent): browse files relative to root * feat(agent): browse standalone agent * feat(agent): move browse button from header * fix(agent): fix url of browser view * fix(agent): fix breadcrumb on title of host-browser * feat(agent): fix url on node-browser breadcrumb * refactor(agent): remove unused controller * refactor(docker): remove unused filter * refactor(docker): remove unused controllers * refactor(docker): remove isAgent binding --- .../file-uploader/file-uploader-controller.js | 23 +++ .../file-uploader/file-uploader.html | 6 + .../components/file-uploader/file-uploader.js | 7 + .../files-datatable.html} | 37 +++-- .../files-datatable/files-datatable.js | 22 +++ .../host-browser/host-browser-controller.js | 147 ++++++++++++++++++ .../components/host-browser/host-browser.html | 16 ++ .../components/host-browser/host-browser.js | 5 + .../volume-browser-datatable.js | 15 -- .../volume-browser/volumeBrowser.html | 10 +- app/agent/services/hostBrowserService.js | 44 ++++++ app/agent/services/volumeBrowserService.js | 50 +++--- app/docker/__module.js | 24 +++ .../docker-sidebar-content.js | 8 +- .../host-overview/host-overview.html | 8 +- .../components/host-overview/host-overview.js | 3 +- .../host-details-panel.html | 11 ++ .../host-details-panel/host-details-panel.js | 3 +- .../host-browser-view-controller.js | 21 +++ .../host-browser-view/host-browser-view.html | 14 ++ .../host-browser-view/host-browser-view.js | 4 + app/docker/views/host/host-view.html | 4 +- .../node-browser/node-browser-controller.js | 20 +++ .../nodes/node-browser/node-browser.html | 14 ++ .../views/nodes/node-browser/node-browser.js | 4 + .../nodes/node-details/node-details-view.html | 4 +- 26 files changed, 458 insertions(+), 66 deletions(-) create mode 100644 app/agent/components/file-uploader/file-uploader-controller.js create mode 100644 app/agent/components/file-uploader/file-uploader.html create mode 100644 app/agent/components/file-uploader/file-uploader.js rename app/agent/components/{volume-browser/volume-browser-datatable/volumeBrowserDatatable.html => files-datatable/files-datatable.html} (76%) create mode 100644 app/agent/components/files-datatable/files-datatable.js create mode 100644 app/agent/components/host-browser/host-browser-controller.js create mode 100644 app/agent/components/host-browser/host-browser.html create mode 100644 app/agent/components/host-browser/host-browser.js delete mode 100644 app/agent/components/volume-browser/volume-browser-datatable/volume-browser-datatable.js create mode 100644 app/agent/services/hostBrowserService.js create mode 100644 app/docker/views/host/host-browser-view/host-browser-view-controller.js create mode 100644 app/docker/views/host/host-browser-view/host-browser-view.html create mode 100644 app/docker/views/host/host-browser-view/host-browser-view.js create mode 100644 app/docker/views/nodes/node-browser/node-browser-controller.js create mode 100644 app/docker/views/nodes/node-browser/node-browser.html create mode 100644 app/docker/views/nodes/node-browser/node-browser.js diff --git a/app/agent/components/file-uploader/file-uploader-controller.js b/app/agent/components/file-uploader/file-uploader-controller.js new file mode 100644 index 000000000..e6516c67c --- /dev/null +++ b/app/agent/components/file-uploader/file-uploader-controller.js @@ -0,0 +1,23 @@ +angular.module('portainer.agent').controller('FileUploaderController', [ + '$q', + function FileUploaderController($q) { + var ctrl = this; + + ctrl.state = { + uploadInProgress: false + }; + + ctrl.onFileSelected = onFileSelected; + + function onFileSelected(file) { + if (!file) { + return; + } + + ctrl.state.uploadInProgress = true; + $q.when(ctrl.uploadFile(file)).finally(function toggleProgress() { + ctrl.state.uploadInProgress = false; + }); + } + } +]); diff --git a/app/agent/components/file-uploader/file-uploader.html b/app/agent/components/file-uploader/file-uploader.html new file mode 100644 index 000000000..e092ce5d6 --- /dev/null +++ b/app/agent/components/file-uploader/file-uploader.html @@ -0,0 +1,6 @@ + diff --git a/app/agent/components/file-uploader/file-uploader.js b/app/agent/components/file-uploader/file-uploader.js new file mode 100644 index 000000000..58ba7b04b --- /dev/null +++ b/app/agent/components/file-uploader/file-uploader.js @@ -0,0 +1,7 @@ +angular.module('portainer.agent').component('fileUploader', { + templateUrl: 'app/agent/components/file-uploader/file-uploader.html', + controller: 'FileUploaderController', + bindings: { + uploadFile: ' + + + + -
    -
    - {{ $ctrl.titleText }} -
    -
    - +
    @@ -41,23 +41,29 @@ - + @@ -65,13 +71,14 @@ {{ item.ModTime | getisodatefromtimestamp }} @@ -87,4 +94,4 @@ - + \ No newline at end of file diff --git a/app/agent/components/files-datatable/files-datatable.js b/app/agent/components/files-datatable/files-datatable.js new file mode 100644 index 000000000..4e90e1d00 --- /dev/null +++ b/app/agent/components/files-datatable/files-datatable.js @@ -0,0 +1,22 @@ +angular.module('portainer.agent').component('filesDatatable', { + templateUrl: 'app/agent/components/files-datatable/files-datatable.html', + controller: 'GenericDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + + isRoot: '<', + goToParent: '&', + browse: '&', + rename: '&', + download: '&', + delete: '&', + + isUploadAllowed: '<', + onFileSelectedForUpload: '<' + } +}); diff --git a/app/agent/components/host-browser/host-browser-controller.js b/app/agent/components/host-browser/host-browser-controller.js new file mode 100644 index 000000000..a50cb6b6e --- /dev/null +++ b/app/agent/components/host-browser/host-browser-controller.js @@ -0,0 +1,147 @@ +angular.module('portainer.agent').controller('HostBrowserController', [ + 'HostBrowserService', 'Notifications', 'FileSaver', 'ModalService', + function HostBrowserController(HostBrowserService, Notifications, FileSaver, ModalService) { + var ctrl = this; + var ROOT_PATH = '/host'; + ctrl.state = { + path: ROOT_PATH + }; + + ctrl.goToParent = goToParent; + ctrl.browse = browse; + ctrl.renameFile = renameFile; + ctrl.downloadFile = downloadFile; + ctrl.deleteFile = confirmDeleteFile; + ctrl.isRoot = isRoot; + ctrl.onFileSelectedForUpload = onFileSelectedForUpload; + ctrl.$onInit = $onInit; + ctrl.getRelativePath = getRelativePath; + + function getRelativePath(path) { + path = path || ctrl.state.path; + var rootPathRegex = new RegExp('^' + ROOT_PATH + '\/?'); + var relativePath = path.replace(rootPathRegex, '/'); + return relativePath; + } + + function goToParent() { + getFilesForPath(parentPath(this.state.path)); + } + + function isRoot() { + return ctrl.state.path === ROOT_PATH; + } + + function browse(folder) { + getFilesForPath(buildPath(ctrl.state.path, folder)); + } + + function getFilesForPath(path) { + HostBrowserService.ls(path) + .then(function onFilesLoaded(files) { + ctrl.state.path = path; + ctrl.files = files; + }) + .catch(function onLoadingFailed(err) { + Notifications.error('Failure', err, 'Unable to browse'); + }); + } + + function renameFile(name, newName) { + var filePath = buildPath(ctrl.state.path, name); + var newFilePath = buildPath(ctrl.state.path, newName); + + HostBrowserService.rename(filePath, newFilePath) + .then(function onRenameSuccess() { + Notifications.success('File successfully renamed', getRelativePath(newFilePath)); + return HostBrowserService.ls(ctrl.state.path); + }) + .then(function onFilesLoaded(files) { + ctrl.files = files; + }) + .catch(function notifyOnError(err) { + Notifications.error('Failure', err, 'Unable to rename file'); + }); + } + + function downloadFile(file) { + var filePath = buildPath(ctrl.state.path, file); + HostBrowserService.get(filePath) + .then(function onFileReceived(data) { + var downloadData = new Blob([data.file], { + type: 'text/plain;charset=utf-8' + }); + FileSaver.saveAs(downloadData, file); + }) + .catch(function notifyOnError(err) { + Notifications.error('Failure', err, 'Unable to download file'); + }); + } + + function confirmDeleteFile(name) { + var filePath = buildPath(ctrl.state.path, name); + + ModalService.confirmDeletion( + 'Are you sure that you want to delete ' + getRelativePath(filePath) + ' ?', + function onConfirm(confirmed) { + if (!confirmed) { + return; + } + return deleteFile(filePath); + } + ); + } + + function deleteFile(path) { + HostBrowserService.delete(path) + .then(function onDeleteSuccess() { + Notifications.success('File successfully deleted', getRelativePath(path)); + return HostBrowserService.ls(ctrl.state.path); + }) + .then(function onFilesLoaded(data) { + ctrl.files = data; + }) + .catch(function notifyOnError(err) { + Notifications.error('Failure', err, 'Unable to delete file'); + }); + } + + function $onInit() { + getFilesForPath(ROOT_PATH); + } + + function parentPath(path) { + if (path === ROOT_PATH) { + return ROOT_PATH; + } + + var split = _.split(path, '/'); + return _.join(_.slice(split, 0, split.length - 1), '/'); + } + + function buildPath(parent, file) { + if (parent.lastIndexOf('/') === parent.length - 1) { + return parent + file; + } + return parent + '/' + file; + } + + function onFileSelectedForUpload(file) { + HostBrowserService.upload(ctrl.state.path, file) + .then(function onFileUpload() { + onFileUploaded(); + }) + .catch(function onFileUpload(err) { + Notifications.error('Failure', err, 'Unable to upload file'); + }); + } + + function onFileUploaded() { + refreshList(); + } + + function refreshList() { + getFilesForPath(ctrl.state.path); + } + } +]); diff --git a/app/agent/components/host-browser/host-browser.html b/app/agent/components/host-browser/host-browser.html new file mode 100644 index 000000000..cf7b59306 --- /dev/null +++ b/app/agent/components/host-browser/host-browser.html @@ -0,0 +1,16 @@ + + + diff --git a/app/agent/components/host-browser/host-browser.js b/app/agent/components/host-browser/host-browser.js new file mode 100644 index 000000000..a136730ee --- /dev/null +++ b/app/agent/components/host-browser/host-browser.js @@ -0,0 +1,5 @@ +angular.module('portainer.agent').component('hostBrowser', { + controller: 'HostBrowserController', + templateUrl: 'app/agent/components/host-browser/host-browser.html', + bindings: {} +}); 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 deleted file mode 100644 index e3139974d..000000000 --- a/app/agent/components/volume-browser/volume-browser-datatable/volume-browser-datatable.js +++ /dev/null @@ -1,15 +0,0 @@ -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/volumeBrowser.html b/app/agent/components/volume-browser/volumeBrowser.html index 643d8c88b..3759f22d2 100644 --- a/app/agent/components/volume-browser/volumeBrowser.html +++ b/app/agent/components/volume-browser/volumeBrowser.html @@ -1,5 +1,11 @@ - + is-root="$ctrl.state.path === '/'" + go-to-parent="$ctrl.up()" + browse="$ctrl.browse(name)" + rename="$ctrl.rename(name, newName)" + download="$ctrl.download(name)" + delete="$ctrl.delete(name)" +> diff --git a/app/agent/services/hostBrowserService.js b/app/agent/services/hostBrowserService.js new file mode 100644 index 000000000..935d34be4 --- /dev/null +++ b/app/agent/services/hostBrowserService.js @@ -0,0 +1,44 @@ +angular.module('portainer.agent').factory('HostBrowserService', [ + 'Browse', 'Upload', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', '$q', + function HostBrowserServiceFactory(Browse, Upload, API_ENDPOINT_ENDPOINTS, EndpointProvider, $q) { + var service = {}; + + service.ls = ls; + service.get = get; + service.delete = deletePath; + service.rename = rename; + service.upload = upload; + + function ls(path) { + return Browse.ls({ path: path }).$promise; + } + + function get(path) { + return Browse.get({ path: path }).$promise; + } + + function deletePath(path) { + return Browse.delete({ path: path }).$promise; + } + + function rename(path, newPath) { + var payload = { + CurrentFilePath: path, + NewFilePath: newPath + }; + return Browse.rename({}, payload).$promise; + } + + function upload(path, file, onProgress) { + var deferred = $q.defer(); + var url = API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/docker/browse/put'; + Upload.upload({ + url: url, + data: { file: file, Path: path } + }).then(deferred.resolve, deferred.reject, onProgress); + return deferred.promise; + } + + return service; + } +]); diff --git a/app/agent/services/volumeBrowserService.js b/app/agent/services/volumeBrowserService.js index 2a5c92f56..1da020c38 100644 --- a/app/agent/services/volumeBrowserService.js +++ b/app/agent/services/volumeBrowserService.js @@ -1,27 +1,29 @@ -angular.module('portainer.agent') -.factory('VolumeBrowserService', ['$q', 'Browse', function VolumeBrowserServiceFactory($q, Browse) { - 'use strict'; - var service = {}; +angular.module('portainer.agent').factory('VolumeBrowserService', [ + '$q', 'Browse', + function VolumeBrowserServiceFactory($q, Browse) { + 'use strict'; + var service = {}; - service.ls = function(volumeId, path) { - return Browse.ls({ volumeID: volumeId, path: path }).$promise; - }; - - service.get = function(volumeId, path) { - return Browse.get({ volumeID: volumeId, path: path }).$promise; - }; - - service.delete = function(volumeId, path) { - return Browse.delete({ volumeID: volumeId, path: path }).$promise; - }; - - service.rename = function(volumeId, path, newPath) { - var payload = { - CurrentFilePath: path, - NewFilePath: newPath + service.ls = function(volumeId, path) { + return Browse.ls({ volumeID: volumeId, path: path }).$promise; }; - return Browse.rename({ volumeID: volumeId }, payload).$promise; - }; - return service; -}]); + service.get = function(volumeId, path) { + return Browse.get({ volumeID: volumeId, path: path }).$promise; + }; + + service.delete = function(volumeId, path) { + return Browse.delete({ volumeID: volumeId, path: path }).$promise; + }; + + service.rename = function(volumeId, path, newPath) { + var payload = { + CurrentFilePath: path, + NewFilePath: newPath + }; + return Browse.rename({ volumeID: volumeId }, payload).$promise; + }; + + return service; + } +]); diff --git a/app/docker/__module.js b/app/docker/__module.js index 23ce18433..4b4bdfc74 100644 --- a/app/docker/__module.js +++ b/app/docker/__module.js @@ -139,6 +139,16 @@ angular.module('portainer.docker', ['portainer.app']) } }; + var hostBrowser = { + name: 'docker.host.browser', + url: '/browser', + views: { + 'content@': { + component: 'hostBrowserView' + } + } + }; + var events = { name: 'docker.events', url: '/events', @@ -243,6 +253,16 @@ angular.module('portainer.docker', ['portainer.app']) } }; + var nodeBrowser = { + name: 'docker.nodes.node.browse', + url: '/browse', + views: { + 'content@': { + component: 'nodeBrowserView' + } + } + }; + var secrets = { name: 'docker.secrets', url: '/secrets', @@ -414,6 +434,8 @@ angular.module('portainer.docker', ['portainer.app']) } }; + + $stateRegistryProvider.register(configs); $stateRegistryProvider.register(config); $stateRegistryProvider.register(configCreation); @@ -427,6 +449,7 @@ angular.module('portainer.docker', ['portainer.app']) $stateRegistryProvider.register(docker); $stateRegistryProvider.register(dashboard); $stateRegistryProvider.register(host); + $stateRegistryProvider.register(hostBrowser); $stateRegistryProvider.register(events); $stateRegistryProvider.register(images); $stateRegistryProvider.register(image); @@ -437,6 +460,7 @@ angular.module('portainer.docker', ['portainer.app']) $stateRegistryProvider.register(networkCreation); $stateRegistryProvider.register(nodes); $stateRegistryProvider.register(node); + $stateRegistryProvider.register(nodeBrowser); $stateRegistryProvider.register(secrets); $stateRegistryProvider.register(secret); $stateRegistryProvider.register(secretCreation); diff --git a/app/docker/components/dockerSidebarContent/docker-sidebar-content.js b/app/docker/components/dockerSidebarContent/docker-sidebar-content.js index 325a3497d..5031a44a7 100644 --- a/app/docker/components/dockerSidebarContent/docker-sidebar-content.js +++ b/app/docker/components/dockerSidebarContent/docker-sidebar-content.js @@ -1,9 +1,9 @@ angular.module('portainer.docker').component('dockerSidebarContent', { templateUrl: 'app/docker/components/dockerSidebarContent/dockerSidebarContent.html', bindings: { - 'endpointApiVersion': '<', - 'swarmManagement': '<', - 'standaloneManagement': '<', - 'adminAccess': '<' + endpointApiVersion: '<', + swarmManagement: '<', + standaloneManagement: '<', + adminAccess: '<' } }); diff --git a/app/docker/components/host-overview/host-overview.html b/app/docker/components/host-overview/host-overview.html index baa43628e..81ac13c62 100644 --- a/app/docker/components/host-overview/host-overview.html +++ b/app/docker/components/host-overview/host-overview.html @@ -1,13 +1,17 @@ - + Docker - + diff --git a/app/docker/components/host-overview/host-overview.js b/app/docker/components/host-overview/host-overview.js index add9515b4..78883e4e8 100644 --- a/app/docker/components/host-overview/host-overview.js +++ b/app/docker/components/host-overview/host-overview.js @@ -6,7 +6,8 @@ angular.module('portainer.docker').component('hostOverview', { devices: '<', disks: '<', isAgent: '<', - refreshUrl: '@' + refreshUrl: '@', + browseUrl: '@' }, transclude: true }); diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html index 2ea05f88f..9bb9b7f85 100644 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html @@ -26,6 +26,17 @@ + + + +
    - Go to parent + Go + to parent
    - + - + - {{ item.Name }} + {{ item.Name }} - {{ item.Name }} + {{ + item.Name }} {{ item.Size | humansize }} - + Download Rename - + Delete Total memory {{ $ctrl.host.totalMemory | humansize }}
    + +
    diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js index 6865b5872..328832c42 100644 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js @@ -3,6 +3,7 @@ angular.module('portainer.docker').component('hostDetailsPanel', { 'app/docker/components/host-view-panels/host-details-panel/host-details-panel.html', bindings: { host: '<', - isAgent: '<' + isAgent: '<', + browseUrl: '@' } }); diff --git a/app/docker/views/host/host-browser-view/host-browser-view-controller.js b/app/docker/views/host/host-browser-view/host-browser-view-controller.js new file mode 100644 index 000000000..9638e966e --- /dev/null +++ b/app/docker/views/host/host-browser-view/host-browser-view-controller.js @@ -0,0 +1,21 @@ +angular + .module('portainer.docker') + .controller('HostBrowserViewController', [ + 'SystemService', 'HttpRequestHelper', + function HostBrowserViewController(SystemService, HttpRequestHelper) { + var ctrl = this; + + ctrl.$onInit = $onInit; + + function $onInit() { + loadInfo(); + } + + function loadInfo() { + SystemService.info().then(function onInfoLoaded(host) { + HttpRequestHelper.setPortainerAgentTargetHeader(host.Name); + ctrl.host = host; + }); + } + } + ]); diff --git a/app/docker/views/host/host-browser-view/host-browser-view.html b/app/docker/views/host/host-browser-view/host-browser-view.html new file mode 100644 index 000000000..2d87e4b2e --- /dev/null +++ b/app/docker/views/host/host-browser-view/host-browser-view.html @@ -0,0 +1,14 @@ + + + + Host > {{ $ctrl.host.Name }} > browse + + + +
    +
    + +
    +
    diff --git a/app/docker/views/host/host-browser-view/host-browser-view.js b/app/docker/views/host/host-browser-view/host-browser-view.js new file mode 100644 index 000000000..7ce93994a --- /dev/null +++ b/app/docker/views/host/host-browser-view/host-browser-view.js @@ -0,0 +1,4 @@ +angular.module('portainer.docker').component('hostBrowserView', { + templateUrl: 'app/docker/views/host/host-browser-view/host-browser-view.html', + controller: 'HostBrowserViewController' +}); diff --git a/app/docker/views/host/host-view.html b/app/docker/views/host/host-view.html index 419e96995..ada86fef8 100644 --- a/app/docker/views/host/host-view.html +++ b/app/docker/views/host/host-view.html @@ -1,8 +1,10 @@ \ No newline at end of file diff --git a/app/docker/views/nodes/node-browser/node-browser-controller.js b/app/docker/views/nodes/node-browser/node-browser-controller.js new file mode 100644 index 000000000..d846ac8f9 --- /dev/null +++ b/app/docker/views/nodes/node-browser/node-browser-controller.js @@ -0,0 +1,20 @@ +angular.module('portainer.docker').controller('NodeBrowserController', [ + 'NodeService', 'HttpRequestHelper', '$stateParams', + function NodeBrowserController(NodeService, HttpRequestHelper, $stateParams) { + var ctrl = this; + + ctrl.$onInit = $onInit; + + function $onInit() { + ctrl.nodeId = $stateParams.id; + loadNode(); + } + + function loadNode() { + NodeService.node(ctrl.nodeId).then(function onNodeLoaded(node) { + HttpRequestHelper.setPortainerAgentTargetHeader(node.Hostname); + ctrl.node = node; + }); + } + } +]); diff --git a/app/docker/views/nodes/node-browser/node-browser.html b/app/docker/views/nodes/node-browser/node-browser.html new file mode 100644 index 000000000..2edeae199 --- /dev/null +++ b/app/docker/views/nodes/node-browser/node-browser.html @@ -0,0 +1,14 @@ + + + + Swarm > {{ $ctrl.node.Hostname }} > browse + + + +
    +
    + +
    +
    diff --git a/app/docker/views/nodes/node-browser/node-browser.js b/app/docker/views/nodes/node-browser/node-browser.js new file mode 100644 index 000000000..3e7269384 --- /dev/null +++ b/app/docker/views/nodes/node-browser/node-browser.js @@ -0,0 +1,4 @@ +angular.module('portainer.docker').component('nodeBrowserView', { + templateUrl: 'app/docker/views/nodes/node-browser/node-browser.html', + controller: 'NodeBrowserController' +}); diff --git a/app/docker/views/nodes/node-details/node-details-view.html b/app/docker/views/nodes/node-details/node-details-view.html index 13df99558..17d0dc470 100644 --- a/app/docker/views/nodes/node-details/node-details-view.html +++ b/app/docker/views/nodes/node-details/node-details-view.html @@ -2,9 +2,11 @@ is-agent="$ctrl.state.isAgent" host-details="$ctrl.hostDetails" engine-details="$ctrl.engineDetails" - refresh-url="docker.nodes.node" disks="$ctrl.disks" devices="$ctrl.devices" + + refresh-url="docker.nodes.node" + browse-url="docker.nodes.node.browse" > Date: Sat, 13 Oct 2018 08:29:44 +0200 Subject: [PATCH 24/93] feat(ux): Redirect from init/admin to home when admin already exists (#2340) Fixes #1853 --- .../views/init/admin/initAdminController.js | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/app/portainer/views/init/admin/initAdminController.js b/app/portainer/views/init/admin/initAdminController.js index 569bb1491..d8f9585d0 100644 --- a/app/portainer/views/init/admin/initAdminController.js +++ b/app/portainer/views/init/admin/initAdminController.js @@ -41,4 +41,16 @@ function ($scope, $state, Notifications, Authentication, StateManager, UserServi }); }; + function createAdministratorFlow() { + UserService.administratorExists() + .then(function success(exists) { + if (exists) { + $state.go('portainer.home'); + } + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to verify administrator account existence'); + }); + } + createAdministratorFlow(); }]); From 719299d75bc322ee5a097da915a47828018c8314 Mon Sep 17 00:00:00 2001 From: Yassir Hannoun Date: Wed, 17 Oct 2018 23:00:45 +0200 Subject: [PATCH 25/93] =?UTF-8?q?fix(container-stat)=20:=20exclude=20cache?= =?UTF-8?q?=20from=20the=20Memory=20Usage=20chart=20to=20avoid=20misinterp?= =?UTF-8?q?ret=E2=80=A6=20(#2371)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/docker/models/container.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/docker/models/container.js b/app/docker/models/container.js index 015223ad8..627ebec86 100644 --- a/app/docker/models/container.js +++ b/app/docker/models/container.js @@ -64,7 +64,7 @@ function ContainerViewModel(data) { function ContainerStatsViewModel(data) { this.Date = data.read; - this.MemoryUsage = data.memory_stats.usage; + this.MemoryUsage = data.memory_stats.usage - data.memory_stats.stats.cache; this.PreviousCPUTotalUsage = data.precpu_stats.cpu_usage.total_usage; this.PreviousCPUSystemUsage = data.precpu_stats.system_cpu_usage; this.CurrentCPUTotalUsage = data.cpu_stats.cpu_usage.total_usage; From 65291c68e9411dd128e21e97150dde55229e7618 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 23 Oct 2018 00:03:30 +0300 Subject: [PATCH 26/93] feat(jobs): add the job execution API * feat(jobs): add job service interface * feat(jobs): create job execution api * style(jobs): remove comment * feat(jobs): add bindings * feat(jobs): validate payload different cases * refactor(jobs): rename endpointJob method * refactor(jobs): return original error * feat(jobs): pull image before creating container * feat(jobs): run jobs with sh * style(jobs): remove comment * refactor(jobs): change error names * feat(jobs): sync pull image * fix(jobs): close image reader after error check * style(jobs): remove comment and add docs * refactor(jobs): inline script command * fix(jobs): handle pul image error * refactor(jobs): handle image pull output * fix(docker): set http client timeout to 100s * fix(client): remove timeout from http client --- api/archive/tar.go | 4 +- api/cmd/portainer/main.go | 7 ++ api/docker/client.go | 2 - api/docker/jobservice.go | 103 +++++++++++++++++++ api/http/handler/endpoints/endpoint_job.go | 114 +++++++++++++++++++++ api/http/handler/endpoints/handler.go | 4 +- api/http/proxy/build.go | 2 +- api/http/server.go | 2 + api/portainer.go | 5 + 9 files changed, 237 insertions(+), 6 deletions(-) create mode 100644 api/docker/jobservice.go create mode 100644 api/http/handler/endpoints/endpoint_job.go diff --git a/api/archive/tar.go b/api/archive/tar.go index 4040a9ec7..3beccec8a 100644 --- a/api/archive/tar.go +++ b/api/archive/tar.go @@ -7,13 +7,13 @@ import ( // TarFileInBuffer will create a tar archive containing a single file named via fileName and using the content // specified in fileContent. Returns the archive as a byte array. -func TarFileInBuffer(fileContent []byte, fileName string) ([]byte, error) { +func TarFileInBuffer(fileContent []byte, fileName string, mode int64) ([]byte, error) { var buffer bytes.Buffer tarWriter := tar.NewWriter(&buffer) header := &tar.Header{ Name: fileName, - Mode: 0600, + Mode: mode, Size: int64(len(fileContent)), } diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index cecf986b7..7602b2a90 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -383,6 +383,10 @@ func initEndpoint(flags *portainer.CLIFlags, endpointService portainer.EndpointS return createUnsecuredEndpoint(*flags.EndpointURL, endpointService, snapshotter) } +func initJobService(dockerClientFactory *docker.ClientFactory) portainer.JobService { + return docker.NewJobService(dockerClientFactory) +} + func main() { flags := initCLI() @@ -408,6 +412,8 @@ func main() { clientFactory := initClientFactory(digitalSignatureService) + jobService := initJobService(clientFactory) + snapshotter := initSnapshotter(clientFactory) jobScheduler, err := initJobScheduler(store.EndpointService, snapshotter, flags) @@ -520,6 +526,7 @@ func main() { SSLCert: *flags.SSLCert, SSLKey: *flags.SSLKey, DockerClientFactory: clientFactory, + JobService: jobService, } log.Printf("Starting Portainer %s on %s", portainer.APIVersion, *flags.Addr) diff --git a/api/docker/client.go b/api/docker/client.go index af9f08c46..a0a65a11d 100644 --- a/api/docker/client.go +++ b/api/docker/client.go @@ -3,7 +3,6 @@ package docker import ( "net/http" "strings" - "time" "github.com/docker/docker/client" "github.com/portainer/portainer" @@ -97,7 +96,6 @@ func httpClient(endpoint *portainer.Endpoint) (*http.Client, error) { } return &http.Client{ - Timeout: time.Second * 10, Transport: transport, }, nil } diff --git a/api/docker/jobservice.go b/api/docker/jobservice.go new file mode 100644 index 000000000..ce6f64832 --- /dev/null +++ b/api/docker/jobservice.go @@ -0,0 +1,103 @@ +package docker + +import ( + "bytes" + "context" + "io" + "io/ioutil" + "strconv" + + "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/container" + "github.com/docker/docker/api/types/network" + "github.com/docker/docker/api/types/strslice" + "github.com/docker/docker/client" + "github.com/portainer/portainer" + "github.com/portainer/portainer/archive" +) + +// JobService represnts a service that handles jobs on the host +type JobService struct { + DockerClientFactory *ClientFactory +} + +// NewJobService returns a pointer to a new job service +func NewJobService(dockerClientFactory *ClientFactory) *JobService { + return &JobService{ + DockerClientFactory: dockerClientFactory, + } +} + +// Execute will execute a script on the endpoint host with the supplied image as a container +func (service *JobService) Execute(endpoint *portainer.Endpoint, image string, script []byte) error { + buffer, err := archive.TarFileInBuffer(script, "script.sh", 0700) + if err != nil { + return err + } + + cli, err := service.DockerClientFactory.CreateClient(endpoint) + if err != nil { + return err + } + defer cli.Close() + + err = pullImage(cli, image) + if err != nil { + return err + } + + containerConfig := &container.Config{ + AttachStdin: true, + AttachStdout: true, + AttachStderr: true, + Tty: true, + WorkingDir: "/tmp", + Image: image, + Labels: map[string]string{ + "io.portainer.job.endpoint": strconv.Itoa(int(endpoint.ID)), + }, + Cmd: strslice.StrSlice([]string{"sh", "/tmp/script.sh"}), + } + + hostConfig := &container.HostConfig{ + Binds: []string{"/:/host", "/etc:/etc:ro", "/usr:/usr:ro", "/run:/run:ro", "/sbin:/sbin:ro", "/var:/var:ro"}, + NetworkMode: "host", + Privileged: true, + } + + networkConfig := &network.NetworkingConfig{} + + body, err := cli.ContainerCreate(context.Background(), containerConfig, hostConfig, networkConfig, "") + if err != nil { + return err + } + + copyOptions := types.CopyToContainerOptions{} + err = cli.CopyToContainer(context.Background(), body.ID, "/tmp", bytes.NewReader(buffer), copyOptions) + if err != nil { + return err + } + + startOptions := types.ContainerStartOptions{} + err = cli.ContainerStart(context.Background(), body.ID, startOptions) + if err != nil { + return err + } + + return nil +} + +func pullImage(cli *client.Client, image string) error { + imageReadCloser, err := cli.ImagePull(context.Background(), image, types.ImagePullOptions{}) + if err != nil { + return err + } + + defer imageReadCloser.Close() + _, err = io.Copy(ioutil.Discard, imageReadCloser) + if err != nil { + return err + } + + return nil +} diff --git a/api/http/handler/endpoints/endpoint_job.go b/api/http/handler/endpoints/endpoint_job.go new file mode 100644 index 000000000..87be7b5a0 --- /dev/null +++ b/api/http/handler/endpoints/endpoint_job.go @@ -0,0 +1,114 @@ +package endpoints + +import ( + "errors" + "net/http" + + "github.com/asaskevich/govalidator" + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" +) + +type endpointJobFromFilePayload struct { + Image string + File []byte +} + +type endpointJobFromFileContentPayload struct { + Image string + FileContent string +} + +func (payload *endpointJobFromFilePayload) Validate(r *http.Request) error { + file, _, err := request.RetrieveMultiPartFormFile(r, "File") + if err != nil { + return portainer.Error("Invalid Script file. Ensure that the file is uploaded correctly") + } + payload.File = file + + image, err := request.RetrieveMultiPartFormValue(r, "Image", false) + if err != nil { + return portainer.Error("Invalid image name") + } + payload.Image = image + + return nil +} + +func (payload *endpointJobFromFileContentPayload) Validate(r *http.Request) error { + if govalidator.IsNull(payload.FileContent) { + return portainer.Error("Invalid script file content") + } + + if govalidator.IsNull(payload.Image) { + return portainer.Error("Invalid image name") + } + + return nil +} + +// POST request on /api/endpoints/:id/job?method +func (handler *Handler) endpointJob(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + endpointID, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid endpoint identifier route variable", err} + } + + method, err := request.RetrieveQueryParameter(r, "method", false) + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid query parameter: method", err} + } + + endpoint, err := handler.EndpointService.Endpoint(portainer.EndpointID(endpointID)) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find an endpoint with the specified identifier inside the database", err} + } else if err != nil { + 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} + } + + switch method { + case "file": + return handler.executeJobFromFile(w, r, endpoint) + case "string": + return handler.executeJobFromFileContent(w, r, endpoint) + } + + return &httperror.HandlerError{http.StatusBadRequest, "Invalid value for query parameter: method. Value must be one of: string or file", errors.New(request.ErrInvalidQueryParameter)} +} + +func (handler *Handler) executeJobFromFile(w http.ResponseWriter, r *http.Request, endpoint *portainer.Endpoint) *httperror.HandlerError { + payload := &endpointJobFromFilePayload{} + err := payload.Validate(r) + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} + } + + err = handler.JobService.Execute(endpoint, payload.Image, payload.File) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Failed executing job", err} + } + + return response.Empty(w) +} + +func (handler *Handler) executeJobFromFileContent(w http.ResponseWriter, r *http.Request, endpoint *portainer.Endpoint) *httperror.HandlerError { + var payload endpointJobFromFileContentPayload + err := request.DecodeAndValidateJSONPayload(r, &payload) + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} + } + + err = handler.JobService.Execute(endpoint, payload.Image, []byte(payload.FileContent)) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Failed executing job", err} + } + + return response.Empty(w) +} diff --git a/api/http/handler/endpoints/handler.go b/api/http/handler/endpoints/handler.go index 779cd9390..1ef8d1727 100644 --- a/api/http/handler/endpoints/handler.go +++ b/api/http/handler/endpoints/handler.go @@ -31,6 +31,7 @@ type Handler struct { FileService portainer.FileService ProxyManager *proxy.Manager Snapshotter portainer.Snapshotter + JobService portainer.JobService } // NewHandler creates a handler to manage endpoint operations. @@ -59,6 +60,7 @@ func NewHandler(bouncer *security.RequestBouncer, authorizeEndpointManagement bo bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.endpointExtensionAdd))).Methods(http.MethodPost) h.Handle("/endpoints/{id}/extensions/{extensionType}", bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.endpointExtensionRemove))).Methods(http.MethodDelete) - + h.Handle("/endpoints/{id}/job", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.endpointJob))).Methods(http.MethodPost) return h } diff --git a/api/http/proxy/build.go b/api/http/proxy/build.go index 0deab93b9..aaa486f07 100644 --- a/api/http/proxy/build.go +++ b/api/http/proxy/build.go @@ -43,7 +43,7 @@ func buildOperation(request *http.Request) error { dockerfileContent = []byte(req.Content) } - buffer, err := archive.TarFileInBuffer(dockerfileContent, "Dockerfile") + buffer, err := archive.TarFileInBuffer(dockerfileContent, "Dockerfile", 0600) if err != nil { return err } diff --git a/api/http/server.go b/api/http/server.go index 2258e86d3..bd5b9fe30 100644 --- a/api/http/server.go +++ b/api/http/server.go @@ -68,6 +68,7 @@ type Server struct { SSLCert string SSLKey string DockerClientFactory *docker.ClientFactory + JobService portainer.JobService } // Start starts the HTTP server @@ -109,6 +110,7 @@ func (server *Server) Start() error { endpointHandler.FileService = server.FileService endpointHandler.ProxyManager = proxyManager endpointHandler.Snapshotter = server.Snapshotter + endpointHandler.JobService = server.JobService var endpointGroupHandler = endpointgroups.NewHandler(requestBouncer) endpointGroupHandler.EndpointGroupService = server.EndpointGroupService diff --git a/api/portainer.go b/api/portainer.go index 2db839506..eb956a500 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -635,6 +635,11 @@ type ( Up(stack *Stack, endpoint *Endpoint) error Down(stack *Stack, endpoint *Endpoint) error } + + // JobService represtents a service that manages job execution on hosts + JobService interface { + Execute(endpoint *Endpoint, image string, script []byte) error + } ) const ( From 14d2bf4ebb9934bc8dc634a4e91bf5fd877f330d Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 23 Oct 2018 10:07:39 +1300 Subject: [PATCH 27/93] refactor(api): fix typo (#2391) * refactor(api): fix typo * refactor(api): remove newline --- api/docker/jobservice.go | 2 +- api/portainer.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/docker/jobservice.go b/api/docker/jobservice.go index ce6f64832..246124639 100644 --- a/api/docker/jobservice.go +++ b/api/docker/jobservice.go @@ -92,8 +92,8 @@ func pullImage(cli *client.Client, image string) error { if err != nil { return err } - defer imageReadCloser.Close() + _, err = io.Copy(ioutil.Discard, imageReadCloser) if err != nil { return err diff --git a/api/portainer.go b/api/portainer.go index eb956a500..1422d15bb 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -636,7 +636,7 @@ type ( Down(stack *Stack, endpoint *Endpoint) error } - // JobService represtents a service that manages job execution on hosts + // JobService represents a service to manage job execution on hosts JobService interface { Execute(endpoint *Endpoint, image string, script []byte) error } From 4f9a8180f978e95de784139bf48c7aa6b56e1f00 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 23 Oct 2018 11:59:43 +1300 Subject: [PATCH 28/93] docs(swagger): document the endpoint job execution (#2392) --- api/swagger.yaml | 79 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 79 insertions(+) diff --git a/api/swagger.yaml b/api/swagger.yaml index 5a6e7ff87..1c7f9ac38 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -495,6 +495,71 @@ paths: description: "Server error" schema: $ref: "#/definitions/GenericError" + /endpoints/{id}/job: + post: + tags: + - "endpoints" + summary: "Execute a job on the endpoint host" + description: | + Execute a job (script) on the underlying host of the endpoint. + **Access policy**: administrator + operationId: "EndpointJob" + consumes: + - "application/json" + produces: + - "application/json" + parameters: + - name: "id" + in: "path" + description: "Endpoint identifier" + required: true + type: "integer" + - name: "method" + in: "query" + description: "Job execution method. Possible values: file or string." + required: true + type: "string" + - in: "body" + name: "body" + description: "Job details. Required when method equals string." + required: true + schema: + $ref: "#/definitions/EndpointJobRequest" + - name: "Image" + in: "formData" + type: "string" + description: "Container image which will be used to execute the job. Required when method equals file." + - name: "file" + in: "formData" + type: "file" + description: "Job script file. Required when method equals file." + responses: + 200: + description: "Success" + schema: + $ref: "#/definitions/Endpoint" + 400: + description: "Invalid request" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Invalid request data format" + 403: + description: "Unauthorized" + schema: + $ref: "#/definitions/GenericError" + 404: + description: "Endpoint not found" + schema: + $ref: "#/definitions/GenericError" + examples: + application/json: + err: "Endpoint not found" + 500: + description: "Server error" + schema: + $ref: "#/definitions/GenericError" /endpoint_groups: get: tags: @@ -4164,6 +4229,20 @@ definitions: type: "string" example: "new-stack" description: "If provided will rename the migrated stack" + EndpointJobRequest: + type: "object" + required: + - "Image" + - "FileContent" + properties: + Image: + type: "string" + example: "ubuntu:latest" + description: "Container image which will be used to execute the job" + FileContent: + type: "string" + example: "ls -lah /host/tmp" + description: "Content of the job script" StackCreateRequest: type: "object" required: From b5dfaff29277e087fe58e165a63d90292dbdb9fd Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 23 Oct 2018 17:28:59 +1300 Subject: [PATCH 29/93] refactor(app): refactor unauthenticated state management (#2393) * refactor(app): refactor Authentication service * refactor(app): refactor unauthenticated state management --- app/app.js | 8 ++- app/config.js | 3 - app/portainer/services/authentication.js | 90 ++++++++++++++---------- 3 files changed, 59 insertions(+), 42 deletions(-) diff --git a/app/app.js b/app/app.js index a32633fe2..3c54bc3bf 100644 --- a/app/app.js +++ b/app/app.js @@ -37,9 +37,13 @@ function ($rootScope, $state, Authentication, authManager, StateManager, Endpoin function initAuthentication(authManager, Authentication, $rootScope, $state) { authManager.checkAuthOnRefresh(); - authManager.redirectWhenUnauthenticated(); Authentication.init(); - $rootScope.$on('tokenHasExpired', function() { + + // The unauthenticated event is broadcasted by the jwtInterceptor when + // hitting a 401. We're using this instead of the usual combination of + // authManager.redirectWhenUnauthenticated() + unauthenticatedRedirector + // to have more controls on which URL should trigger the unauthenticated state. + $rootScope.$on('unauthenticated', function () { $state.go('portainer.auth', {error: 'Your session has expired'}); }); } diff --git a/app/config.js b/app/config.js index 8e3366856..4cdd7fa8c 100644 --- a/app/config.js +++ b/app/config.js @@ -14,9 +14,6 @@ angular.module('portainer') jwtOptionsProvider.config({ tokenGetter: ['LocalStorage', function(LocalStorage) { return LocalStorage.getJWT(); - }], - unauthenticatedRedirector: ['$state', function($state) { - $state.go('portainer.auth', {error: 'Your session has expired'}); }] }); $httpProvider.interceptors.push('jwtInterceptor'); diff --git a/app/portainer/services/authentication.js b/app/portainer/services/authentication.js index e0fb48cc1..0e9f19a93 100644 --- a/app/portainer/services/authentication.js +++ b/app/portainer/services/authentication.js @@ -2,43 +2,59 @@ angular.module('portainer.app') .factory('Authentication', ['$q', 'Auth', 'jwtHelper', 'LocalStorage', 'StateManager', 'EndpointProvider', function AuthenticationFactory($q, Auth, jwtHelper, LocalStorage, StateManager, EndpointProvider) { 'use strict'; + var service = {}; var user = {}; - return { - init: function() { - var jwt = LocalStorage.getJWT(); - if (jwt) { - var tokenPayload = jwtHelper.decodeToken(jwt); - user.username = tokenPayload.username; - user.ID = tokenPayload.id; - user.role = tokenPayload.role; - } - }, - login: function(username, password) { - return $q(function (resolve, reject) { - Auth.login({username: username, password: password}).$promise - .then(function(data) { - LocalStorage.storeJWT(data.jwt); - var tokenPayload = jwtHelper.decodeToken(data.jwt); - user.username = username; - user.ID = tokenPayload.id; - user.role = tokenPayload.role; - resolve(); - }, function() { - reject(); - }); - }); - }, - logout: function() { - StateManager.clean(); - EndpointProvider.clean(); - LocalStorage.clean(); - }, - isAuthenticated: function() { - var jwt = LocalStorage.getJWT(); - return jwt && !jwtHelper.isTokenExpired(jwt); - }, - getUserDetails: function() { - return user; + + service.init = init; + service.login = login; + service.logout = logout; + service.isAuthenticated = isAuthenticated; + service.getUserDetails = getUserDetails; + + function init() { + var jwt = LocalStorage.getJWT(); + + if (jwt) { + var tokenPayload = jwtHelper.decodeToken(jwt); + user.username = tokenPayload.username; + user.ID = tokenPayload.id; + user.role = tokenPayload.role; } - }; + } + + function login(username, password) { + var deferred = $q.defer(); + + Auth.login({username: username, password: password}).$promise + .then(function success(data) { + LocalStorage.storeJWT(data.jwt); + var tokenPayload = jwtHelper.decodeToken(data.jwt); + user.username = username; + user.ID = tokenPayload.id; + user.role = tokenPayload.role; + deferred.resolve(); + }) + .catch(function error() { + deferred.reject(); + }); + + return deferred.promise; + } + + function logout() { + StateManager.clean(); + EndpointProvider.clean(); + LocalStorage.clean(); + } + + function isAuthenticated() { + var jwt = LocalStorage.getJWT(); + return jwt && !jwtHelper.isTokenExpired(jwt); + } + + function getUserDetails() { + return user; + } + + return service; }]); From cca378b2e805b1846d9d913bf1516bfbe75875e9 Mon Sep 17 00:00:00 2001 From: Yassir Hannoun Date: Tue, 23 Oct 2018 21:55:30 +0200 Subject: [PATCH 30/93] docs(README): fix semaphore badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b2e9e096..cee536856 100644 --- a/README.md +++ b/README.md @@ -6,7 +6,7 @@ [![Docker Pulls](https://img.shields.io/docker/pulls/portainer/portainer.svg)](https://hub.docker.com/r/portainer/portainer/) [![Microbadger](https://images.microbadger.com/badges/image/portainer/portainer.svg)](http://microbadger.com/images/portainer/portainer "Image size") [![Documentation Status](https://readthedocs.org/projects/portainer/badge/?version=stable)](http://portainer.readthedocs.io/en/stable/?badge=stable) -[![Build Status](https://semaphoreci.com/api/v1/portainer/portainer/branches/develop/badge.svg)](https://semaphoreci.com/portainer/portainer) +[![Build Status](https://semaphoreci.com/api/v1/portainer/portainer-ci/branches/develop/badge.svg)](https://semaphoreci.com/portainer/portainer-ci) [![Code Climate](https://codeclimate.com/github/portainer/portainer/badges/gpa.svg)](https://codeclimate.com/github/portainer/portainer) [![Slack](https://portainer.io/slack/badge.svg)](https://portainer.io/slack/) [![Gitter](https://badges.gitter.im/portainer/Lobby.svg)](https://gitter.im/portainer/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) From 9813099aa416311e7c6bdd7a037375e953c39ff5 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Fri, 26 Oct 2018 06:16:29 +0300 Subject: [PATCH 31/93] feat(app): toggle features based on agent API version (#2378) * feat(agent): get agent's version from ping * feat(agent): add version to api url * feat(agent): query agent with api version * feat(agent): rename agent api version name on state * feat(agent): disable feature based on agent's api version * style(agent): rename ping rest service + remove whitespaces * style(state): remove whitespace * style(agent): add whitespace * fix(agent): remove check for error status 403 * refactor(agent): rename ping file name * refactor(agent): move old services to v1 folder * refactor(agent): turn ping service to usual pattern * refactor(agent): change version to a global variable * refactor(agent): move ping to version2 * refactor(agent): restore ping to use root ping * fix(volumes): add volumeID to browse api path * feat(volume): add upload button to volume browser --- .../volume-browser/volume-browser.js | 3 +- .../volume-browser/volumeBrowser.html | 3 ++ .../volume-browser/volumeBrowserController.js | 20 ++++++++ app/agent/rest/agent.js | 8 ++-- app/agent/rest/browse.js | 8 ++-- app/agent/rest/host.js | 9 ++-- app/agent/rest/ping.js | 33 +++++++++++++ app/agent/rest/v1/agent.js | 10 ++++ app/agent/rest/v1/browse.js | 22 +++++++++ app/agent/services/agentService.js | 14 ++++-- app/agent/services/hostBrowserService.js | 16 +++++-- app/agent/services/pingService.js | 14 ++++++ app/agent/services/volumeBrowserService.js | 47 ++++++++++++++++--- .../host-overview/host-overview.html | 6 +-- .../components/host-overview/host-overview.js | 1 + .../host-details-panel.html | 2 +- .../host-details-panel/host-details-panel.js | 2 +- app/docker/views/host/host-view-controller.js | 6 ++- app/docker/views/host/host-view.html | 1 + .../node-details-view-controller.js | 16 ++++--- .../nodes/node-details/node-details-view.html | 1 + .../volumes/browse/browseVolumeController.js | 5 +- .../views/volumes/browse/browsevolume.html | 2 + app/portainer/services/stateManager.js | 16 ++++++- 24 files changed, 224 insertions(+), 41 deletions(-) create mode 100644 app/agent/rest/ping.js create mode 100644 app/agent/rest/v1/agent.js create mode 100644 app/agent/rest/v1/browse.js create mode 100644 app/agent/services/pingService.js diff --git a/app/agent/components/volume-browser/volume-browser.js b/app/agent/components/volume-browser/volume-browser.js index 964803da0..78e963604 100644 --- a/app/agent/components/volume-browser/volume-browser.js +++ b/app/agent/components/volume-browser/volume-browser.js @@ -3,6 +3,7 @@ angular.module('portainer.agent').component('volumeBrowser', { controller: 'VolumeBrowserController', bindings: { volumeId: '<', - nodeName: '<' + nodeName: '<', + isUploadEnabled: '<' } }); diff --git a/app/agent/components/volume-browser/volumeBrowser.html b/app/agent/components/volume-browser/volumeBrowser.html index 3759f22d2..97c8a4da6 100644 --- a/app/agent/components/volume-browser/volumeBrowser.html +++ b/app/agent/components/volume-browser/volumeBrowser.html @@ -8,4 +8,7 @@ rename="$ctrl.rename(name, newName)" download="$ctrl.download(name)" delete="$ctrl.delete(name)" + + is-upload-allowed="$ctrl.isUploadEnabled" + on-file-selected-for-upload="$ctrl.onFileSelectedForUpload" > diff --git a/app/agent/components/volume-browser/volumeBrowserController.js b/app/agent/components/volume-browser/volumeBrowserController.js index 2fa4426b9..8db735a3b 100644 --- a/app/agent/components/volume-browser/volumeBrowserController.js +++ b/app/agent/components/volume-browser/volumeBrowserController.js @@ -84,6 +84,16 @@ function (HttpRequestHelper, VolumeBrowserService, FileSaver, Blob, ModalService }); } + this.onFileSelectedForUpload = function onFileSelectedForUpload(file) { + VolumeBrowserService.upload(ctrl.state.path, file, ctrl.volumeId) + .then(function onFileUpload() { + onFileUploaded(); + }) + .catch(function onFileUpload(err) { + Notifications.error('Failure', err, 'Unable to upload file'); + }); + }; + function parentPath(path) { if (path.lastIndexOf('/') === 0) { return '/'; @@ -112,4 +122,14 @@ function (HttpRequestHelper, VolumeBrowserService, FileSaver, Blob, ModalService }); }; + function onFileUploaded() { + refreshList(); + } + + function refreshList() { + browse(ctrl.state.path); + } + + + }]); diff --git a/app/agent/rest/agent.js b/app/agent/rest/agent.js index a7800717c..522296c3a 100644 --- a/app/agent/rest/agent.js +++ b/app/agent/rest/agent.js @@ -1,8 +1,10 @@ angular.module('portainer.agent') -.factory('Agent', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { +.factory('Agent', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', 'StateManager', + function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) { 'use strict'; - return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/agents', { - endpointId: EndpointProvider.endpointID + return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/v:version/agents', { + endpointId: EndpointProvider.endpointID, + version: StateManager.getAgentApiVersion }, { query: { method: 'GET', isArray: true } diff --git a/app/agent/rest/browse.js b/app/agent/rest/browse.js index 9496768eb..e78cd3206 100644 --- a/app/agent/rest/browse.js +++ b/app/agent/rest/browse.js @@ -1,8 +1,10 @@ angular.module('portainer.agent') -.factory('Browse', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function BrowseFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { +.factory('Browse', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', 'StateManager', + function BrowseFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) { 'use strict'; - return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/browse/:action', { - endpointId: EndpointProvider.endpointID + return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/v:version/browse/:action', { + endpointId: EndpointProvider.endpointID, + version: StateManager.getAgentApiVersion }, { ls: { diff --git a/app/agent/rest/host.js b/app/agent/rest/host.js index a717def30..f184d2544 100644 --- a/app/agent/rest/host.js +++ b/app/agent/rest/host.js @@ -1,11 +1,12 @@ angular.module('portainer.agent').factory('Host', [ - '$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', - function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { + '$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', 'StateManager', + function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, StateManager) { 'use strict'; return $resource( - API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/host/:action', + API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/v:version/host/:action', { - endpointId: EndpointProvider.endpointID + endpointId: EndpointProvider.endpointID, + version: StateManager.getAgentApiVersion }, { info: { method: 'GET', params: { action: 'info' } } diff --git a/app/agent/rest/ping.js b/app/agent/rest/ping.js new file mode 100644 index 000000000..7eeb93f2e --- /dev/null +++ b/app/agent/rest/ping.js @@ -0,0 +1,33 @@ +angular.module('portainer.agent').factory('AgentPing', [ + '$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', '$q', + function AgentPingFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider, $q) { + 'use strict'; + return $resource( + API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/ping', + { + endpointId: EndpointProvider.endpointID + }, + { + ping: { + method: 'GET', + interceptor: { + response: function versionInterceptor(response) { + var instance = response.resource; + var version = + response.headers('Portainer-Agent-Api-Version') || 1; + instance.version = Number(version); + return instance; + }, + responseError: function versionResponseError(error) { + // 404 - agent is up - set version to 1 + if (error.status === 404) { + return { version: 1 }; + } + return $q.reject(error); + } + } + } + } + ); + } +]); diff --git a/app/agent/rest/v1/agent.js b/app/agent/rest/v1/agent.js new file mode 100644 index 000000000..a78755b35 --- /dev/null +++ b/app/agent/rest/v1/agent.js @@ -0,0 +1,10 @@ +angular.module('portainer.agent') +.factory('AgentVersion1', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function AgentFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { + 'use strict'; + return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/agents', { + endpointId: EndpointProvider.endpointID + }, + { + query: { method: 'GET', isArray: true } + }); +}]); diff --git a/app/agent/rest/v1/browse.js b/app/agent/rest/v1/browse.js new file mode 100644 index 000000000..d576433fa --- /dev/null +++ b/app/agent/rest/v1/browse.js @@ -0,0 +1,22 @@ +angular.module('portainer.agent') +.factory('BrowseVersion1', ['$resource', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', function BrowseFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { + 'use strict'; + return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/docker/browse/:volumeID/:action', { + endpointId: EndpointProvider.endpointID + }, + { + ls: { + method: 'GET', isArray: true, params: { action: 'ls' } + }, + get: { + method: 'GET', params: { action: 'get' }, + transformResponse: browseGetResponse + }, + delete: { + method: 'DELETE', params: { action: 'delete' } + }, + rename: { + method: 'PUT', params: { action: 'rename' } + } + }); +}]); diff --git a/app/agent/services/agentService.js b/app/agent/services/agentService.js index 7143e1e0f..17a2c3166 100644 --- a/app/agent/services/agentService.js +++ b/app/agent/services/agentService.js @@ -1,12 +1,17 @@ angular.module('portainer.agent').factory('AgentService', [ - '$q', 'Agent','HttpRequestHelper', 'Host', - function AgentServiceFactory($q, Agent, HttpRequestHelper, Host) { + '$q', 'Agent', 'AgentVersion1', 'HttpRequestHelper', 'Host', 'StateManager', + function AgentServiceFactory($q, Agent, AgentVersion1, HttpRequestHelper, Host, StateManager) { 'use strict'; var service = {}; service.agents = agents; service.hostInfo = hostInfo; + function getAgentApiVersion() { + var state = StateManager.getState(); + return state.endpoint.agentApiVersion; + } + function hostInfo(nodeName) { HttpRequestHelper.setPortainerAgentTargetHeader(nodeName); return Host.info().$promise; @@ -15,7 +20,10 @@ angular.module('portainer.agent').factory('AgentService', [ function agents() { var deferred = $q.defer(); - Agent.query({}) + var agentVersion = getAgentApiVersion(); + var service = agentVersion > 1 ? Agent : AgentVersion1; + + service.query({ version: agentVersion }) .$promise.then(function success(data) { var agents = data.map(function(item) { return new AgentViewModel(item); diff --git a/app/agent/services/hostBrowserService.js b/app/agent/services/hostBrowserService.js index 935d34be4..6f292c36a 100644 --- a/app/agent/services/hostBrowserService.js +++ b/app/agent/services/hostBrowserService.js @@ -1,6 +1,6 @@ angular.module('portainer.agent').factory('HostBrowserService', [ - 'Browse', 'Upload', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', '$q', - function HostBrowserServiceFactory(Browse, Upload, API_ENDPOINT_ENDPOINTS, EndpointProvider, $q) { + 'Browse', 'Upload', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', '$q', 'StateManager', + function HostBrowserServiceFactory(Browse, Upload, API_ENDPOINT_ENDPOINTS, EndpointProvider, $q, StateManager) { var service = {}; service.ls = ls; @@ -31,9 +31,17 @@ angular.module('portainer.agent').factory('HostBrowserService', [ function upload(path, file, onProgress) { var deferred = $q.defer(); - var url = API_ENDPOINT_ENDPOINTS + '/' + EndpointProvider.endpointID() + '/docker/browse/put'; + var agentVersion = StateManager.getAgentApiVersion(); + var url = + API_ENDPOINT_ENDPOINTS + + '/' + + EndpointProvider.endpointID() + + '/docker' + + (agentVersion > 1 ? '/v' + agentVersion : '') + + '/browse/put'; + Upload.upload({ - url: url, + url: url, data: { file: file, Path: path } }).then(deferred.resolve, deferred.reject, onProgress); return deferred.promise; diff --git a/app/agent/services/pingService.js b/app/agent/services/pingService.js new file mode 100644 index 000000000..765d47a5f --- /dev/null +++ b/app/agent/services/pingService.js @@ -0,0 +1,14 @@ +angular.module('portainer.agent').service('AgentPingService', [ + 'AgentPing', + function AgentPingService(AgentPing) { + var service = {}; + + service.ping = ping; + + function ping() { + return AgentPing.ping().$promise; + } + + return service; + } +]); diff --git a/app/agent/services/volumeBrowserService.js b/app/agent/services/volumeBrowserService.js index 1da020c38..a4ffdbf9d 100644 --- a/app/agent/services/volumeBrowserService.js +++ b/app/agent/services/volumeBrowserService.js @@ -1,27 +1,60 @@ angular.module('portainer.agent').factory('VolumeBrowserService', [ - '$q', 'Browse', - function VolumeBrowserServiceFactory($q, Browse) { + 'StateManager', 'Browse', 'BrowseVersion1', '$q', 'API_ENDPOINT_ENDPOINTS', 'EndpointProvider', 'Upload', + function VolumeBrowserServiceFactory(StateManager, Browse, BrowseVersion1, $q, API_ENDPOINT_ENDPOINTS, EndpointProvider, Upload) { 'use strict'; var service = {}; + function getAgentApiVersion() { + var state = StateManager.getState(); + return state.endpoint.agentApiVersion; + } + + function getBrowseService() { + var agentVersion = getAgentApiVersion(); + return agentVersion > 1 ? Browse : BrowseVersion1; + } + service.ls = function(volumeId, path) { - return Browse.ls({ volumeID: volumeId, path: path }).$promise; + return getBrowseService().ls({ volumeID: volumeId, path: path, version: getAgentApiVersion() }).$promise; }; service.get = function(volumeId, path) { - return Browse.get({ volumeID: volumeId, path: path }).$promise; + return getBrowseService().get({ volumeID: volumeId, path: path, version: getAgentApiVersion() }).$promise; }; service.delete = function(volumeId, path) { - return Browse.delete({ volumeID: volumeId, path: path }).$promise; + return getBrowseService().delete({ volumeID: volumeId, path: path, version: getAgentApiVersion() }).$promise; }; service.rename = function(volumeId, path, newPath) { var payload = { - CurrentFilePath: path, + CurrentFilePath: path, NewFilePath: newPath }; - return Browse.rename({ volumeID: volumeId }, payload).$promise; + return getBrowseService().rename({ volumeID: volumeId, version: getAgentApiVersion() }, payload).$promise; + }; + + service.upload = function upload(path, file, volumeId, onProgress) { + var deferred = $q.defer(); + var agentVersion = StateManager.getAgentApiVersion(); + if (agentVersion <2) { + deferred.reject('upload is not supported on this agent version'); + return; + } + var url = + API_ENDPOINT_ENDPOINTS + + '/' + + EndpointProvider.endpointID() + + '/docker' + + '/v' + agentVersion + + '/browse/put?volumeID=' + + volumeId; + + Upload.upload({ + url: url, + data: { file: file, Path: path } + }).then(deferred.resolve, deferred.reject, onProgress); + return deferred.promise; }; return service; diff --git a/app/docker/components/host-overview/host-overview.html b/app/docker/components/host-overview/host-overview.html index 81ac13c62..e38ccabb0 100644 --- a/app/docker/components/host-overview/host-overview.html +++ b/app/docker/components/host-overview/host-overview.html @@ -10,12 +10,12 @@ - - + + \ No newline at end of file diff --git a/app/docker/components/host-overview/host-overview.js b/app/docker/components/host-overview/host-overview.js index 78883e4e8..36ab4087a 100644 --- a/app/docker/components/host-overview/host-overview.js +++ b/app/docker/components/host-overview/host-overview.js @@ -6,6 +6,7 @@ angular.module('portainer.docker').component('hostOverview', { devices: '<', disks: '<', isAgent: '<', + agentApiVersion: '<', refreshUrl: '@', browseUrl: '@' }, diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html index 9bb9b7f85..8b46f466f 100644 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html @@ -26,7 +26,7 @@ Total memory {{ $ctrl.host.totalMemory | humansize }} - +
    diff --git a/app/portainer/services/stateManager.js b/app/portainer/services/stateManager.js index 787f67328..36c7dadb5 100644 --- a/app/portainer/services/stateManager.js +++ b/app/portainer/services/stateManager.js @@ -1,6 +1,6 @@ angular.module('portainer.app') -.factory('StateManager', ['$q', 'SystemService', 'InfoHelper', 'LocalStorage', 'SettingsService', 'StatusService', 'APPLICATION_CACHE_VALIDITY', -function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, SettingsService, StatusService, APPLICATION_CACHE_VALIDITY) { +.factory('StateManager', ['$q', 'SystemService', 'InfoHelper', 'LocalStorage', 'SettingsService', 'StatusService', 'APPLICATION_CACHE_VALIDITY', 'AgentPingService', +function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, SettingsService, StatusService, APPLICATION_CACHE_VALIDITY, AgentPingService) { 'use strict'; var manager = {}; @@ -157,6 +157,14 @@ function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, Settin state.endpoint.name = name; state.endpoint.apiVersion = endpointAPIVersion; state.endpoint.extensions = assignExtensions(extensions); + + if (endpointMode.agentProxy) { + return AgentPingService.ping().then(function onPingSuccess(data) { + state.endpoint.agentApiVersion = data.version; + }); + } + + }).then(function () { LocalStorage.storeEndpointState(state.endpoint); deferred.resolve(); }) @@ -170,5 +178,9 @@ function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, Settin return deferred.promise; }; + manager.getAgentApiVersion = function getAgentApiVersion() { + return state.endpoint.agentApiVersion; + }; + return manager; }]); From fe6ca042f37e912974916e027823fa180d6afee4 Mon Sep 17 00:00:00 2001 From: Ricardo Cardona Ramirez Date: Sat, 27 Oct 2018 21:39:09 -0500 Subject: [PATCH 32/93] feat(ux): Alphabetically sort configs and secrets in service details/creation (#2396) * fix(sorting): Alphabetically sort configs in service details select box * fix(sorting): Alphabetically sort configs and secrets for service creation --- app/docker/views/services/create/includes/config.html | 2 +- app/docker/views/services/create/includes/secret.html | 2 +- app/docker/views/services/edit/includes/configs.html | 2 +- app/docker/views/services/edit/includes/secrets.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/docker/views/services/create/includes/config.html b/app/docker/views/services/create/includes/config.html index 8083ae2f2..eac52f780 100644 --- a/app/docker/views/services/create/includes/config.html +++ b/app/docker/views/services/create/includes/config.html @@ -10,7 +10,7 @@
    config -
    diff --git a/app/docker/views/services/create/includes/secret.html b/app/docker/views/services/create/includes/secret.html index aca1f5264..aa6a42375 100644 --- a/app/docker/views/services/create/includes/secret.html +++ b/app/docker/views/services/create/includes/secret.html @@ -15,7 +15,7 @@
    secret -
    diff --git a/app/docker/views/services/edit/includes/configs.html b/app/docker/views/services/edit/includes/configs.html index db36d0edb..21e4805ba 100644 --- a/app/docker/views/services/edit/includes/configs.html +++ b/app/docker/views/services/edit/includes/configs.html @@ -5,7 +5,7 @@
    Add a config: - diff --git a/app/docker/views/services/edit/includes/secrets.html b/app/docker/views/services/edit/includes/secrets.html index 04444aa6d..b6e680881 100644 --- a/app/docker/views/services/edit/includes/secrets.html +++ b/app/docker/views/services/edit/includes/secrets.html @@ -5,7 +5,7 @@
    Add a secret: -
    From 07c1e1bc3e4e90ca3f12c2bfb7a18a7de4fc4be6 Mon Sep 17 00:00:00 2001 From: Yassir Hannoun Date: Sun, 28 Oct 2018 03:45:02 +0100 Subject: [PATCH 33/93] feat(container-stats): display cache in memory usage chart (#2383) --- app/docker/models/container.js | 1 + .../stats/containerStatsController.js | 3 +- app/portainer/services/chartService.js | 310 ++++++++++-------- 3 files changed, 180 insertions(+), 134 deletions(-) diff --git a/app/docker/models/container.js b/app/docker/models/container.js index 627ebec86..ee8837498 100644 --- a/app/docker/models/container.js +++ b/app/docker/models/container.js @@ -65,6 +65,7 @@ function ContainerViewModel(data) { function ContainerStatsViewModel(data) { this.Date = data.read; this.MemoryUsage = data.memory_stats.usage - data.memory_stats.stats.cache; + this.MemoryCache = data.memory_stats.stats.cache; this.PreviousCPUTotalUsage = data.precpu_stats.cpu_usage.total_usage; this.PreviousCPUSystemUsage = data.precpu_stats.system_cpu_usage; this.CurrentCPUTotalUsage = data.cpu_stats.cpu_usage.total_usage; diff --git a/app/docker/views/containers/stats/containerStatsController.js b/app/docker/views/containers/stats/containerStatsController.js index ed161c8d1..d14aeaca1 100644 --- a/app/docker/views/containers/stats/containerStatsController.js +++ b/app/docker/views/containers/stats/containerStatsController.js @@ -31,9 +31,8 @@ function ($q, $scope, $transition$, $document, $interval, ContainerService, Char function updateMemoryChart(stats, chart) { var label = moment(stats.Date).format('HH:mm:ss'); - var value = stats.MemoryUsage; - ChartService.UpdateMemoryChart(label, value, chart); + ChartService.UpdateMemoryChart(label, stats.MemoryUsage, stats.MemoryCache, chart); } function updateCPUChart(stats, chart) { diff --git a/app/portainer/services/chartService.js b/app/portainer/services/chartService.js index 4b10c9a83..818ed6e3d 100644 --- a/app/portainer/services/chartService.js +++ b/app/portainer/services/chartService.js @@ -1,14 +1,14 @@ angular.module('portainer.app') -.factory('ChartService', [function ChartService() { - 'use strict'; + .factory('ChartService', [function ChartService() { + 'use strict'; - // Max. number of items to display on a chart - var CHART_LIMIT = 600; + // Max. number of items to display on a chart + var CHART_LIMIT = 600; - var service = {}; + var service = {}; - function defaultChartOptions(pos, tooltipCallback, scalesCallback) { - return { + function defaultChartOptions(pos, tooltipCallback, scalesCallback, isStacked) { + return { animation: { duration: 0 }, responsiveAnimationDuration: 0, responsive: true, @@ -17,7 +17,7 @@ angular.module('portainer.app') intersect: false, position: pos, callbacks: { - label: function(tooltipItem, data) { + label: function (tooltipItem, data) { var datasetLabel = data.datasets[tooltipItem.datasetIndex].label; return tooltipCallback(datasetLabel, tooltipItem.yLabel); } @@ -26,142 +26,188 @@ angular.module('portainer.app') hover: { animationDuration: 0 }, scales: { yAxes: [{ - ticks: { - beginAtZero: true, - callback: scalesCallback - } + stacked: isStacked, + ticks: { + beginAtZero: true, + callback: scalesCallback + } }] } }; - } - - function CreateChart (context, label, tooltipCallback, scalesCallback) { - return new Chart(context, { - type: 'line', - data: { - labels: [], - datasets: [ - { - label: label, - data: [], - fill: true, - backgroundColor: 'rgba(151,187,205,0.4)', - borderColor: 'rgba(151,187,205,0.6)', - pointBackgroundColor: 'rgba(151,187,205,1)', - pointBorderColor: 'rgba(151,187,205,1)', - pointRadius: 2, - borderWidth: 2 - } - ] - }, - options: defaultChartOptions('nearest', tooltipCallback, scalesCallback) - }); - } - - service.CreateCPUChart = function(context) { - return CreateChart(context, 'CPU', percentageBasedTooltipLabel, percentageBasedAxisLabel); - }; - - service.CreateMemoryChart = function(context) { - return CreateChart(context, 'Memory', byteBasedTooltipLabel, byteBasedAxisLabel); - }; - - service.CreateNetworkChart = function(context) { - return new Chart(context, { - type: 'line', - data: { - labels: [], - datasets: [ - { - label: 'RX on eth0', - data: [], - fill: false, - backgroundColor: 'rgba(151,187,205,0.4)', - borderColor: 'rgba(151,187,205,0.6)', - pointBackgroundColor: 'rgba(151,187,205,1)', - pointBorderColor: 'rgba(151,187,205,1)', - pointRadius: 2, - borderWidth: 2 - }, - { - label: 'TX on eth0', - data: [], - fill: false, - backgroundColor: 'rgba(255,180,174,0.4)', - borderColor: 'rgba(255,180,174,0.6)', - pointBackgroundColor: 'rgba(255,180,174,1)', - pointBorderColor: 'rgba(255,180,174,1)', - pointRadius: 2, - borderWidth: 2 - } - ] - }, - options: defaultChartOptions('average', byteBasedTooltipLabel, byteBasedAxisLabel) - }); - }; - - function UpdateChart(label, value, chart) { - chart.data.labels.push(label); - chart.data.datasets[0].data.push(value); - - if (chart.data.datasets[0].data.length > CHART_LIMIT) { - chart.data.labels.pop(); - chart.data.datasets[0].data.pop(); } - chart.update(0); - } - - service.UpdateMemoryChart = UpdateChart; - service.UpdateCPUChart = UpdateChart; - - service.UpdateNetworkChart = function(label, rx, tx, chart) { - chart.data.labels.push(label); - chart.data.datasets[0].data.push(rx); - chart.data.datasets[1].data.push(tx); - - if (chart.data.datasets[0].data.length > CHART_LIMIT) { - chart.data.labels.pop(); - chart.data.datasets[0].data.pop(); - chart.data.datasets[1].data.pop(); + function CreateChart(context, label, tooltipCallback, scalesCallback) { + return new Chart(context, { + type: 'line', + data: { + labels: [], + datasets: [ + { + label: label, + data: [], + fill: true, + backgroundColor: 'rgba(151,187,205,0.4)', + borderColor: 'rgba(151,187,205,0.6)', + pointBackgroundColor: 'rgba(151,187,205,1)', + pointBorderColor: 'rgba(151,187,205,1)', + pointRadius: 2, + borderWidth: 2 + } + ] + }, + options: defaultChartOptions('nearest', tooltipCallback, scalesCallback) + }); } - chart.update(0); - }; - - function byteBasedTooltipLabel(label, value) { - var processedValue = 0; - if (value > 5) { - processedValue = filesize(value, {base: 10, round: 1}); - } else { - processedValue = value.toFixed(1) + 'B'; + function CreateMemoryChart(context, tooltipCallback, scalesCallback) { + return new Chart(context, { + type: 'line', + data: { + labels: [], + datasets: [ + { + label: 'Memory', + data: [], + fill: true, + backgroundColor: 'rgba(151,187,205,0.4)', + borderColor: 'rgba(151,187,205,0.6)', + pointBackgroundColor: 'rgba(151,187,205,1)', + pointBorderColor: 'rgba(151,187,205,1)', + pointRadius: 2, + borderWidth: 2 + }, + { + label: 'Cache', + data: [], + fill: true, + backgroundColor: 'rgba(255,180,174,0.4)', + borderColor: 'rgba(255,180,174,0.6)', + pointBackgroundColor: 'rgba(255,180,174,1)', + pointBorderColor: 'rgba(255,180,174,1)', + pointRadius: 2, + borderWidth: 2 + } + ] + }, + options: defaultChartOptions('nearest', tooltipCallback, scalesCallback, true) + }); } - return label + ': ' + processedValue; - } - function byteBasedAxisLabel(value) { - if (value > 5) { - return filesize(value, {base: 10, round: 1}); + service.CreateCPUChart = function (context) { + return CreateChart(context, 'CPU', percentageBasedTooltipLabel, percentageBasedAxisLabel); + }; + + service.CreateMemoryChart = function (context) { + return CreateMemoryChart(context, byteBasedTooltipLabel, byteBasedAxisLabel); + }; + + service.CreateNetworkChart = function (context) { + return new Chart(context, { + type: 'line', + data: { + labels: [], + datasets: [ + { + label: 'RX on eth0', + data: [], + fill: false, + backgroundColor: 'rgba(151,187,205,0.4)', + borderColor: 'rgba(151,187,205,0.6)', + pointBackgroundColor: 'rgba(151,187,205,1)', + pointBorderColor: 'rgba(151,187,205,1)', + pointRadius: 2, + borderWidth: 2 + }, + { + label: 'TX on eth0', + data: [], + fill: false, + backgroundColor: 'rgba(255,180,174,0.4)', + borderColor: 'rgba(255,180,174,0.6)', + pointBackgroundColor: 'rgba(255,180,174,1)', + pointBorderColor: 'rgba(255,180,174,1)', + pointRadius: 2, + borderWidth: 2 + } + ] + }, + options: defaultChartOptions('average', byteBasedTooltipLabel, byteBasedAxisLabel) + }); + }; + + function UpdateChart(label, value, chart) { + chart.data.labels.push(label); + chart.data.datasets[0].data.push(value); + + if (chart.data.datasets[0].data.length > CHART_LIMIT) { + chart.data.labels.pop(); + chart.data.datasets[0].data.pop(); + } + + chart.update(0); } - return value.toFixed(1) + 'B'; - } - function percentageBasedAxisLabel(value) { - if (value > 1) { - return Math.round(value) + '%'; + service.UpdateMemoryChart = function UpdateChart(label, memoryValue, cacheValue, chart) { + chart.data.labels.push(label); + chart.data.datasets[0].data.push(memoryValue); + chart.data.datasets[1].data.push(cacheValue); + + if (chart.data.datasets[0].data.length > CHART_LIMIT) { + chart.data.labels.pop(); + chart.data.datasets[0].data.pop(); + } + + chart.update(0); + }; + service.UpdateCPUChart = UpdateChart; + + service.UpdateNetworkChart = function (label, rx, tx, chart) { + chart.data.labels.push(label); + chart.data.datasets[0].data.push(rx); + chart.data.datasets[1].data.push(tx); + + if (chart.data.datasets[0].data.length > CHART_LIMIT) { + chart.data.labels.pop(); + chart.data.datasets[0].data.pop(); + chart.data.datasets[1].data.pop(); + } + + chart.update(0); + }; + + function byteBasedTooltipLabel(label, value) { + var processedValue = 0; + if (value > 5) { + processedValue = filesize(value, { base: 10, round: 1 }); + } else { + processedValue = value.toFixed(1) + 'B'; + } + return label + ': ' + processedValue; } - return value.toFixed(1) + '%'; - } - function percentageBasedTooltipLabel(label, value) { - var processedValue = 0; - if (value > 1) { - processedValue = Math.round(value); - } else { - processedValue = value.toFixed(1); + function byteBasedAxisLabel(value) { + if (value > 5) { + return filesize(value, { base: 10, round: 1 }); + } + return value.toFixed(1) + 'B'; } - return label + ': ' + processedValue + '%'; - } - return service; -}]); + function percentageBasedAxisLabel(value) { + if (value > 1) { + return Math.round(value) + '%'; + } + return value.toFixed(1) + '%'; + } + + function percentageBasedTooltipLabel(label, value) { + var processedValue = 0; + if (value > 1) { + processedValue = Math.round(value); + } else { + processedValue = value.toFixed(1); + } + return label + ': ' + processedValue + '%'; + } + + return service; + }]); From 7e6c647e93026de89593f3f5883721516444992f Mon Sep 17 00:00:00 2001 From: Damian Czaja Date: Sun, 28 Oct 2018 04:00:56 +0100 Subject: [PATCH 34/93] feat(container-creation): add the ability to override the logging driver (#2384) --- .../create/createContainerController.js | 39 ++++++++++++- .../containers/create/createcontainer.html | 57 ++++++++++++++++++- 2 files changed, 91 insertions(+), 5 deletions(-) diff --git a/app/docker/views/containers/create/createContainerController.js b/app/docker/views/containers/create/createContainerController.js index ddddda3ad..2498c4245 100644 --- a/app/docker/views/containers/create/createContainerController.js +++ b/app/docker/views/containers/create/createContainerController.js @@ -1,6 +1,6 @@ angular.module('portainer.docker') -.controller('CreateContainerController', ['$q', '$scope', '$state', '$timeout', '$transition$', '$filter', 'Container', 'ContainerHelper', 'Image', 'ImageHelper', 'Volume', 'NetworkService', 'ResourceControlService', 'Authentication', 'Notifications', 'ContainerService', 'ImageService', 'FormValidator', 'ModalService', 'RegistryService', 'SystemService', 'SettingsService', 'HttpRequestHelper', -function ($q, $scope, $state, $timeout, $transition$, $filter, Container, ContainerHelper, Image, ImageHelper, Volume, NetworkService, ResourceControlService, Authentication, Notifications, ContainerService, ImageService, FormValidator, ModalService, RegistryService, SystemService, SettingsService, HttpRequestHelper) { +.controller('CreateContainerController', ['$q', '$scope', '$state', '$timeout', '$transition$', '$filter', 'Container', 'ContainerHelper', 'Image', 'ImageHelper', 'Volume', 'NetworkService', 'ResourceControlService', 'Authentication', 'Notifications', 'ContainerService', 'ImageService', 'FormValidator', 'ModalService', 'RegistryService', 'SystemService', 'SettingsService', 'PluginService', 'HttpRequestHelper', +function ($q, $scope, $state, $timeout, $transition$, $filter, Container, ContainerHelper, Image, ImageHelper, Volume, NetworkService, ResourceControlService, Authentication, Notifications, ContainerService, ImageService, FormValidator, ModalService, RegistryService, SystemService, SettingsService, PluginService, HttpRequestHelper) { $scope.create = create; @@ -19,7 +19,9 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai MemoryLimit: 0, MemoryReservation: 0, NodeName: null, - capabilities: [] + capabilities: [], + LogDriverName: '', + LogDriverOpts: [] }; $scope.extraNetworks = {}; @@ -110,6 +112,14 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai $scope.config.HostConfig.Devices.splice(index, 1); }; + $scope.addLogDriverOpt = function() { + $scope.formValues.LogDriverOpts.push({ name: '', value: ''}); + }; + + $scope.removeLogDriverOpt = function(index) { + $scope.formValues.LogDriverOpts.splice(index, 1); + }; + $scope.fromContainerMultipleNetworks = false; function prepareImageConfig(config) { @@ -257,6 +267,23 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai } } + function prepareLogDriver(config) { + var logOpts = {}; + if ($scope.formValues.LogDriverName) { + config.HostConfig.LogConfig = { Type: $scope.formValues.LogDriverName }; + if ($scope.formValues.LogDriverName !== 'none') { + $scope.formValues.LogDriverOpts.forEach(function (opt) { + if (opt.name) { + logOpts[opt.name] = opt.value; + } + }); + if (Object.keys(logOpts).length !== 0 && logOpts.constructor === Object) { + config.HostConfig.LogConfig.Config = logOpts; + } + } + } + } + function prepareCapabilities(config) { var allowed = $scope.formValues.capabilities.filter(function(item) {return item.allowed === true;}); var notAllowed = $scope.formValues.capabilities.filter(function(item) {return item.allowed === false;}); @@ -278,6 +305,7 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai prepareLabels(config); prepareDevices(config); prepareResources(config); + prepareLogDriver(config); prepareCapabilities(config); return config; } @@ -568,6 +596,11 @@ function ($q, $scope, $state, $timeout, $transition$, $filter, Container, Contai Notifications.error('Failure', err, 'Unable to retrieve application settings'); }); + PluginService.loggingPlugins(apiVersion < 1.25) + .then(function success(loggingDrivers) { + $scope.availableLoggingDrivers = loggingDrivers; + }); + var userDetails = Authentication.getUserDetails(); $scope.isAdmin = userDetails.role === 1; } diff --git a/app/docker/views/containers/create/createcontainer.html b/app/docker/views/containers/create/createcontainer.html index a14c8f1d4..3f61e44fb 100644 --- a/app/docker/views/containers/create/createcontainer.html +++ b/app/docker/views/containers/create/createcontainer.html @@ -146,7 +146,7 @@
    + +
    + Logging +
    + +
    + +
    + +
    +
    +

    + Logging driver that will override the default docker daemon driver. Select Default logging driver if you don't want to override it. Supported logging drivers can be found in the Docker documentation. +

    +
    +
    + + +
    +
    + + + add logging driver option + +
    + +
    +
    +
    + option + +
    +
    + value + +
    + +
    +
    + +
    + + +
    From 6ab510e5cb93f996346879911f7cc5b2f856e89d Mon Sep 17 00:00:00 2001 From: Mark Stansberry Date: Sat, 27 Oct 2018 23:05:54 -0400 Subject: [PATCH 35/93] docs(api): update swagger related files to support swagger-codegen (#2404) * Linting updates to api/swagger.yaml * Security updates to api/swagger.yml * Add api/swagger_config.json for swagger-codegen * Add swagger_config.json packageVersion to match swagger.yml --- api/swagger.yaml | 138 ++++++++++++++++++++++++++++++++++++++-- api/swagger_config.json | 5 ++ 2 files changed, 138 insertions(+), 5 deletions(-) create mode 100644 api/swagger_config.json diff --git a/api/swagger.yaml b/api/swagger.yaml index 1c7f9ac38..6a97dbde0 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -153,6 +153,8 @@ paths: operationId: "DockerHubInspect" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -175,6 +177,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -211,6 +215,8 @@ paths: operationId: "EndpointList" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -233,6 +239,8 @@ paths: - "multipart/form-data" produces: - "application/json" + security: + - jwt: [] parameters: - name: "Name" in: "formData" @@ -265,7 +273,7 @@ paths: - name: "TLSSkipVerify" in: "formData" type: "string" - description: "Skip server verification when using TLS" (example: false) + description: "Skip server verification when using TLS (example: false)" - name: "TLSCACertFile" in: "formData" type: "file" @@ -324,6 +332,8 @@ paths: operationId: "EndpointInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -365,6 +375,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -413,6 +425,8 @@ paths: Remove an endpoint. **Access policy**: administrator operationId: "EndpointDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -460,6 +474,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -508,6 +524,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -573,6 +591,8 @@ paths: operationId: "EndpointGroupList" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -595,6 +615,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -629,6 +651,8 @@ paths: operationId: "EndpointGroupInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -670,6 +694,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -720,6 +746,8 @@ paths: Remove an endpoint group. **Access policy**: administrator operationId: "EndpointGroupDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -767,6 +795,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -815,6 +845,8 @@ paths: operationId: "RegistryList" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -837,6 +869,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -878,6 +912,8 @@ paths: operationId: "RegistryInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -919,6 +955,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -969,6 +1007,8 @@ paths: Remove a registry. **Access policy**: administrator operationId: "RegistryDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1009,6 +1049,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1057,6 +1099,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -1107,6 +1151,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1157,6 +1203,8 @@ paths: Remove a resource control. **Access policy**: restricted operationId: "ResourceControlDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1202,6 +1250,8 @@ paths: operationId: "SettingsInspect" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -1224,6 +1274,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -1258,6 +1310,8 @@ paths: operationId: "PublicSettingsInspect" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -1281,6 +1335,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -1313,6 +1369,8 @@ paths: operationId: "StatusInspect" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -1336,6 +1394,8 @@ paths: operationId: "StackList" produces: - "application/json" + security: + - jwt: [] parameters: - name: "filters" in: "query" @@ -1368,6 +1428,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "type" in: "query" @@ -1447,6 +1509,8 @@ paths: operationId: "StackInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1492,6 +1556,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1544,6 +1610,8 @@ paths: Remove a stack. **Access policy**: restricted operationId: "StackDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1594,6 +1662,8 @@ paths: operationId: "StackFileInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1639,6 +1709,8 @@ paths: operationId: "StackMigrate" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1693,6 +1765,8 @@ paths: operationId: "UserList" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -1716,6 +1790,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -1764,6 +1840,8 @@ paths: operationId: "UserInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1805,6 +1883,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1855,6 +1935,8 @@ paths: Remove a user. **Access policy**: administrator operationId: "UserDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1893,6 +1975,8 @@ paths: operationId: "UserMembershipsInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1936,6 +2020,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -1983,6 +2069,8 @@ paths: operationId: "UserAdminCheck" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 204: @@ -2012,6 +2100,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -2056,6 +2146,8 @@ paths: - multipart/form-data produces: - "application/json" + security: + - jwt: [] parameters: - in: "path" name: "certificate" @@ -2097,6 +2189,8 @@ paths: operationId: "TagList" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -2119,6 +2213,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -2158,6 +2254,8 @@ paths: Remove a tag. **Access policy**: administrator operationId: "TagDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -2190,6 +2288,8 @@ paths: operationId: "TeamList" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -2212,6 +2312,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -2260,6 +2362,8 @@ paths: operationId: "TeamInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -2308,6 +2412,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -2349,6 +2455,8 @@ paths: Remove a team. **Access policy**: administrator operationId: "TeamDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -2388,6 +2496,8 @@ paths: operationId: "TeamMembershipsInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -2429,6 +2539,8 @@ paths: operationId: "TeamMembershipList" produces: - "application/json" + security: + - jwt: [] parameters: [] responses: 200: @@ -2458,6 +2570,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -2508,6 +2622,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -2558,6 +2674,8 @@ paths: Remove a team membership. Access is only available to administrators leaders of the associated team. **Access policy**: restricted operationId: "TeamMembershipDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -2604,6 +2722,8 @@ paths: operationId: "TemplateList" produces: - "application/json" + security: + - jwt: [] parameters: responses: 200: @@ -2626,6 +2746,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - in: "body" name: "body" @@ -2667,6 +2789,8 @@ paths: operationId: "TemplateInspect" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -2715,6 +2839,8 @@ paths: - "application/json" produces: - "application/json" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -2763,6 +2889,8 @@ paths: Remove a template. **Access policy**: administrator operationId: "TemplateDelete" + security: + - jwt: [] parameters: - name: "id" in: "path" @@ -3848,9 +3976,9 @@ definitions: TemplateCreateRequest: type: "object" required: - - "type" - - "title" - - "description" + - "type" + - "title" + - "description" properties: type: type: "integer" @@ -4202,7 +4330,7 @@ definitions: TemplateRepository: type: "object" required: - - "URL" + - "URL" properties: URL: type: "string" diff --git a/api/swagger_config.json b/api/swagger_config.json new file mode 100644 index 000000000..957f1358e --- /dev/null +++ b/api/swagger_config.json @@ -0,0 +1,5 @@ +{ + "packageName": "portainer", + "packageVersion": "1.20-dev", + "projectName": "portainer" +} From 354fda31f1c34cdb3810bebc5211e1e33620e5cb Mon Sep 17 00:00:00 2001 From: baron_l Date: Sun, 28 Oct 2018 07:06:50 +0100 Subject: [PATCH 36/93] feat(jobs): add the ability to run a job on a target endpoint #2374 * feat(jobs): adding the ability to run scripts on endpoints fix(job): click on containerId in JobsDatatable redirects to container's logs refactor(job): remove the jobs datatable settings + texts changes on JobCreation view fix(jobs): jobs payloads are now following API rules and case feat(jobs): adding the capability to run scripts on hosts * feat(jobs): adding the ability to purge jobs containers * refactor(job): apply review changes * feat(job-creation): store image name in local storage * feat(host): disable job exec link in non-agent Swarm setup * feat(host): only display execute job in agent setups or standalone * feat(job): job execution overhaul * docs(swagger): update EndpointJob documentation --- api/docker/client.go | 13 +- api/docker/jobservice.go | 4 +- api/docker/snapshotter.go | 2 +- api/http/handler/endpoints/endpoint_job.go | 16 +- api/http/handler/webhooks/webhook_execute.go | 2 +- api/portainer.go | 2 +- api/swagger.yaml | 5 + app/docker/__module.js | 24 ++- .../host-jobs-datatable/jobsDatatable.html | 118 +++++++++++++++ .../host-jobs-datatable/jobsDatatable.js | 12 ++ .../jobsDatatableController.js | 140 ++++++++++++++++++ .../host-overview/host-overview.html | 19 ++- .../components/host-overview/host-overview.js | 5 +- .../host-details-panel.html | 13 +- .../host-details-panel/host-details-panel.js | 7 +- app/docker/rest/container.js | 3 + app/docker/services/containerService.js | 4 + .../host-browser-view-controller.js | 34 ++--- .../host/host-job/host-job-controller.js | 17 +++ app/docker/views/host/host-job/host-job.html | 16 ++ app/docker/views/host/host-job/host-job.js | 4 + app/docker/views/host/host-view-controller.js | 49 +++--- app/docker/views/host/host-view.html | 6 +- .../node-browser/node-browser-controller.js | 14 +- .../node-details-view-controller.js | 39 +++-- .../nodes/node-details/node-details-view.html | 6 +- .../nodes/node-job/node-job-controller.js | 20 +++ app/docker/views/nodes/node-job/node-job.html | 18 +++ app/docker/views/nodes/node-job/node-job.js | 4 + .../execute-job-form-controller.js | 69 +++++++++ .../execute-job-form/execute-job-form.html | 110 ++++++++++++++ .../execute-job-form/execute-job-form.js | 7 + app/portainer/rest/endpoint.js | 3 +- app/portainer/services/api/endpointService.js | 13 ++ app/portainer/services/fileUpload.js | 11 ++ app/portainer/services/localStorage.js | 6 + app/portainer/services/notifications.js | 4 +- 37 files changed, 739 insertions(+), 100 deletions(-) create mode 100644 app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html create mode 100644 app/docker/components/datatables/host-jobs-datatable/jobsDatatable.js create mode 100644 app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js create mode 100644 app/docker/views/host/host-job/host-job-controller.js create mode 100644 app/docker/views/host/host-job/host-job.html create mode 100644 app/docker/views/host/host-job/host-job.js create mode 100644 app/docker/views/nodes/node-job/node-job-controller.js create mode 100644 app/docker/views/nodes/node-job/node-job.html create mode 100644 app/docker/views/nodes/node-job/node-job.js create mode 100644 app/portainer/components/forms/execute-job-form/execute-job-form-controller.js create mode 100644 app/portainer/components/forms/execute-job-form/execute-job-form.html create mode 100644 app/portainer/components/forms/execute-job-form/execute-job-form.js diff --git a/api/docker/client.go b/api/docker/client.go index a0a65a11d..9c608a19b 100644 --- a/api/docker/client.go +++ b/api/docker/client.go @@ -26,12 +26,13 @@ func NewClientFactory(signatureService portainer.DigitalSignatureService) *Clien } // 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) { +// a specific endpoint configuration. The nodeName parameter can be used +// with an agent enabled endpoint to target a specific node in an agent cluster. +func (factory *ClientFactory) CreateClient(endpoint *portainer.Endpoint, nodeName string) (*client.Client, error) { if endpoint.Type == portainer.AzureEnvironment { return nil, unsupportedEnvironmentType } else if endpoint.Type == portainer.AgentOnDockerEnvironment { - return createAgentClient(endpoint, factory.signatureService) + return createAgentClient(endpoint, factory.signatureService, nodeName) } if strings.HasPrefix(endpoint.URL, "unix://") || strings.HasPrefix(endpoint.URL, "npipe://") { @@ -60,7 +61,7 @@ func createTCPClient(endpoint *portainer.Endpoint) (*client.Client, error) { ) } -func createAgentClient(endpoint *portainer.Endpoint, signatureService portainer.DigitalSignatureService) (*client.Client, error) { +func createAgentClient(endpoint *portainer.Endpoint, signatureService portainer.DigitalSignatureService, nodeName string) (*client.Client, error) { httpCli, err := httpClient(endpoint) if err != nil { return nil, err @@ -76,6 +77,10 @@ func createAgentClient(endpoint *portainer.Endpoint, signatureService portainer. portainer.PortainerAgentSignatureHeader: signature, } + if nodeName != "" { + headers[portainer.PortainerAgentTargetHeader] = nodeName + } + return client.NewClientWithOpts( client.WithHost(endpoint.URL), client.WithVersion(portainer.SupportedDockerAPIVersion), diff --git a/api/docker/jobservice.go b/api/docker/jobservice.go index 246124639..d2559d7d2 100644 --- a/api/docker/jobservice.go +++ b/api/docker/jobservice.go @@ -29,13 +29,13 @@ func NewJobService(dockerClientFactory *ClientFactory) *JobService { } // Execute will execute a script on the endpoint host with the supplied image as a container -func (service *JobService) Execute(endpoint *portainer.Endpoint, image string, script []byte) error { +func (service *JobService) Execute(endpoint *portainer.Endpoint, nodeName, image string, script []byte) error { buffer, err := archive.TarFileInBuffer(script, "script.sh", 0700) if err != nil { return err } - cli, err := service.DockerClientFactory.CreateClient(endpoint) + cli, err := service.DockerClientFactory.CreateClient(endpoint, nodeName) if err != nil { return err } diff --git a/api/docker/snapshotter.go b/api/docker/snapshotter.go index 34cb35def..ee095f6d5 100644 --- a/api/docker/snapshotter.go +++ b/api/docker/snapshotter.go @@ -18,7 +18,7 @@ func NewSnapshotter(clientFactory *ClientFactory) *Snapshotter { // CreateSnapshot creates a snapshot of a specific endpoint func (snapshotter *Snapshotter) CreateSnapshot(endpoint *portainer.Endpoint) (*portainer.Snapshot, error) { - cli, err := snapshotter.clientFactory.CreateClient(endpoint) + cli, err := snapshotter.clientFactory.CreateClient(endpoint, "") if err != nil { return nil, err } diff --git a/api/http/handler/endpoints/endpoint_job.go b/api/http/handler/endpoints/endpoint_job.go index 87be7b5a0..025f6ab3a 100644 --- a/api/http/handler/endpoints/endpoint_job.go +++ b/api/http/handler/endpoints/endpoint_job.go @@ -49,7 +49,7 @@ func (payload *endpointJobFromFileContentPayload) Validate(r *http.Request) erro return nil } -// POST request on /api/endpoints/:id/job?method +// POST request on /api/endpoints/:id/job?method&nodeName func (handler *Handler) endpointJob(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { endpointID, err := request.RetrieveNumericRouteVariableValue(r, "id") if err != nil { @@ -61,6 +61,8 @@ func (handler *Handler) endpointJob(w http.ResponseWriter, r *http.Request) *htt return &httperror.HandlerError{http.StatusBadRequest, "Invalid query parameter: method", err} } + nodeName, _ := request.RetrieveQueryParameter(r, "nodeName", true) + endpoint, err := handler.EndpointService.Endpoint(portainer.EndpointID(endpointID)) if err == portainer.ErrObjectNotFound { return &httperror.HandlerError{http.StatusNotFound, "Unable to find an endpoint with the specified identifier inside the database", err} @@ -75,22 +77,22 @@ func (handler *Handler) endpointJob(w http.ResponseWriter, r *http.Request) *htt switch method { case "file": - return handler.executeJobFromFile(w, r, endpoint) + return handler.executeJobFromFile(w, r, endpoint, nodeName) case "string": - return handler.executeJobFromFileContent(w, r, endpoint) + return handler.executeJobFromFileContent(w, r, endpoint, nodeName) } return &httperror.HandlerError{http.StatusBadRequest, "Invalid value for query parameter: method. Value must be one of: string or file", errors.New(request.ErrInvalidQueryParameter)} } -func (handler *Handler) executeJobFromFile(w http.ResponseWriter, r *http.Request, endpoint *portainer.Endpoint) *httperror.HandlerError { +func (handler *Handler) executeJobFromFile(w http.ResponseWriter, r *http.Request, endpoint *portainer.Endpoint, nodeName string) *httperror.HandlerError { payload := &endpointJobFromFilePayload{} err := payload.Validate(r) if err != nil { return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } - err = handler.JobService.Execute(endpoint, payload.Image, payload.File) + err = handler.JobService.Execute(endpoint, nodeName, payload.Image, payload.File) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Failed executing job", err} } @@ -98,14 +100,14 @@ func (handler *Handler) executeJobFromFile(w http.ResponseWriter, r *http.Reques return response.Empty(w) } -func (handler *Handler) executeJobFromFileContent(w http.ResponseWriter, r *http.Request, endpoint *portainer.Endpoint) *httperror.HandlerError { +func (handler *Handler) executeJobFromFileContent(w http.ResponseWriter, r *http.Request, endpoint *portainer.Endpoint, nodeName string) *httperror.HandlerError { var payload endpointJobFromFileContentPayload err := request.DecodeAndValidateJSONPayload(r, &payload) if err != nil { return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } - err = handler.JobService.Execute(endpoint, payload.Image, []byte(payload.FileContent)) + err = handler.JobService.Execute(endpoint, nodeName, payload.Image, []byte(payload.FileContent)) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Failed executing job", err} } diff --git a/api/http/handler/webhooks/webhook_execute.go b/api/http/handler/webhooks/webhook_execute.go index f43045899..9126942e7 100644 --- a/api/http/handler/webhooks/webhook_execute.go +++ b/api/http/handler/webhooks/webhook_execute.go @@ -49,7 +49,7 @@ func (handler *Handler) webhookExecute(w http.ResponseWriter, r *http.Request) * } func (handler *Handler) executeServiceWebhook(w http.ResponseWriter, endpoint *portainer.Endpoint, resourceID string) *httperror.HandlerError { - dockerClient, err := handler.DockerClientFactory.CreateClient(endpoint) + dockerClient, err := handler.DockerClientFactory.CreateClient(endpoint, "") if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Error creating docker client", err} } diff --git a/api/portainer.go b/api/portainer.go index 1422d15bb..c1cdbab4f 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -638,7 +638,7 @@ type ( // JobService represents a service to manage job execution on hosts JobService interface { - Execute(endpoint *Endpoint, image string, script []byte) error + Execute(endpoint *Endpoint, nodeName, image string, script []byte) error } ) diff --git a/api/swagger.yaml b/api/swagger.yaml index 6a97dbde0..51d8a9f68 100644 --- a/api/swagger.yaml +++ b/api/swagger.yaml @@ -537,6 +537,11 @@ paths: description: "Job execution method. Possible values: file or string." required: true type: "string" + - name: "nodeName" + in: "query" + description: "Optional. Hostname of a node when targeting a Portainer agent cluster." + required: true + type: "string" - in: "body" name: "body" description: "Job details. Required when method equals string." diff --git a/app/docker/__module.js b/app/docker/__module.js index 4b4bdfc74..9bd99a7cd 100644 --- a/app/docker/__module.js +++ b/app/docker/__module.js @@ -149,6 +149,16 @@ angular.module('portainer.docker', ['portainer.app']) } }; + var hostJob = { + name: 'docker.host.job', + url: '/job', + views: { + 'content@': { + component: 'hostJobView' + } + } + }; + var events = { name: 'docker.events', url: '/events', @@ -263,6 +273,16 @@ angular.module('portainer.docker', ['portainer.app']) } }; + var nodeJob = { + name: 'docker.nodes.node.job', + url: '/job', + views: { + 'content@': { + component: 'nodeJobView' + } + } + }; + var secrets = { name: 'docker.secrets', url: '/secrets', @@ -434,7 +454,7 @@ angular.module('portainer.docker', ['portainer.app']) } }; - + $stateRegistryProvider.register(configs); $stateRegistryProvider.register(config); @@ -450,6 +470,7 @@ angular.module('portainer.docker', ['portainer.app']) $stateRegistryProvider.register(dashboard); $stateRegistryProvider.register(host); $stateRegistryProvider.register(hostBrowser); + $stateRegistryProvider.register(hostJob); $stateRegistryProvider.register(events); $stateRegistryProvider.register(images); $stateRegistryProvider.register(image); @@ -461,6 +482,7 @@ angular.module('portainer.docker', ['portainer.app']) $stateRegistryProvider.register(nodes); $stateRegistryProvider.register(node); $stateRegistryProvider.register(nodeBrowser); + $stateRegistryProvider.register(nodeJob); $stateRegistryProvider.register(secrets); $stateRegistryProvider.register(secret); $stateRegistryProvider.register(secretCreation); diff --git a/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html new file mode 100644 index 000000000..38f58e6a9 --- /dev/null +++ b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html @@ -0,0 +1,118 @@ +
    +
    +
    + + +
    +
    + + {{ $ctrl.titleText }} +
    +
    +
    + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + +
    + + Id + + + + + + State + + + +
    + Filter + + Filter + +
    +
    +
    +
    + Filter by state +
    +
    +
    + + +
    +
    +
    + Close +
    +
    +
    +     		+ + + + Created + +
    + + {{ item.Id | truncate: 32}} + + {{ item.Status }} + + {{ item.Status }} + + {{item.Created | getisodatefromtimestamp}} +
    Loading...
    No jobs available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    +
    +
    diff --git a/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.js b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.js new file mode 100644 index 000000000..8c599cae3 --- /dev/null +++ b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.js @@ -0,0 +1,12 @@ +angular.module('portainer.docker').component('jobsDatatable', { + templateUrl: 'app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html', + controller: 'JobsDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<' + } +}); \ No newline at end of file diff --git a/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js b/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js new file mode 100644 index 000000000..1a02da763 --- /dev/null +++ b/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js @@ -0,0 +1,140 @@ +angular.module('portainer.docker') + .controller('JobsDatatableController', ['$q', '$state', 'PaginationService', 'DatatableService', 'ContainerService', 'ModalService', 'Notifications', + function ($q, $state, PaginationService, DatatableService, ContainerService, ModalService, Notifications) { + var ctrl = this; + + this.state = { + orderBy: this.orderBy, + paginatedItemLimit: PaginationService.getPaginationLimit(this.tableKey), + displayTextFilter: false + }; + + this.filters = { + state: { + open: false, + enabled: false, + values: [] + } + }; + + this.changeOrderBy = function (orderField) { + this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; + this.state.orderBy = orderField; + DatatableService.setDataTableOrder(this.tableKey, orderField, this.state.reverseOrder); + }; + + this.changePaginationLimit = function () { + PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); + }; + + this.applyFilters = function (value) { + var container = value; + var filters = ctrl.filters; + for (var i = 0; i < filters.state.values.length; i++) { + var filter = filters.state.values[i]; + if (container.Status === filter.label && filter.display) { + return true; + } + } + return false; + }; + + this.onStateFilterChange = function () { + var filters = this.filters.state.values; + var filtered = false; + for (var i = 0; i < filters.length; i++) { + var filter = filters[i]; + if (!filter.display) { + filtered = true; + } + } + this.filters.state.enabled = filtered; + DatatableService.setDataTableFilters(this.tableKey, this.filters); + }; + + this.prepareTableFromDataset = function () { + var availableStateFilters = []; + for (var i = 0; i < this.dataset.length; i++) { + var item = this.dataset[i]; + availableStateFilters.push({ + label: item.Status, + display: true + }); + } + this.filters.state.values = _.uniqBy(availableStateFilters, 'label'); + }; + + this.updateStoredFilters = function (storedFilters) { + var datasetFilters = this.filters.state.values; + + for (var i = 0; i < datasetFilters.length; i++) { + var filter = datasetFilters[i]; + existingFilter = _.find(storedFilters, ['label', filter.label]); + if (existingFilter && !existingFilter.display) { + filter.display = existingFilter.display; + this.filters.state.enabled = true; + } + } + }; + + function confirmPurgeJobs() { + return showConfirmationModal(); + + function showConfirmationModal() { + var deferred = $q.defer(); + + ModalService.confirm({ + title: 'Are you sure ?', + message: 'Clearing job history will remove all stopped jobs containers.', + buttons: { + confirm: { + label: 'Purge', + className: 'btn-danger' + } + }, + callback: function onConfirm(confirmed) { + deferred.resolve(confirmed); + } + }); + + return deferred.promise; + } + } + + this.purgeAction = function () { + confirmPurgeJobs().then(function success(confirmed) { + if (!confirmed) { + return $q.when(); + } + ContainerService.prune({ label: ['io.portainer.job.endpoint'] }).then(function success() { + Notifications.success('Success', 'Job hisotry cleared'); + $state.reload(); + }).catch(function error(err) { + Notifications.error('Failure', err.message, 'Unable to clear job history'); + }); + }); + }; + + this.$onInit = function () { + setDefaults(this); + this.prepareTableFromDataset(); + + var storedOrder = DatatableService.getDataTableOrder(this.tableKey); + if (storedOrder !== null) { + this.state.reverseOrder = storedOrder.reverse; + this.state.orderBy = storedOrder.orderBy; + } + + var storedFilters = DatatableService.getDataTableFilters(this.tableKey); + if (storedFilters !== null) { + this.updateStoredFilters(storedFilters.state.values); + } + this.filters.state.open = false; + }; + + function setDefaults(ctrl) { + ctrl.showTextFilter = ctrl.showTextFilter ? ctrl.showTextFilter : false; + ctrl.state.reverseOrder = ctrl.reverseOrder ? ctrl.reverseOrder : false; + } + } + ]); diff --git a/app/docker/components/host-overview/host-overview.html b/app/docker/components/host-overview/host-overview.html index e38ccabb0..6ca96d1b3 100644 --- a/app/docker/components/host-overview/host-overview.html +++ b/app/docker/components/host-overview/host-overview.html @@ -8,14 +8,25 @@ Docker - + browse-url="{{$ctrl.browseUrl}}" + is-job-enabled="$ctrl.isJobEnabled" + job-url="{{$ctrl.jobUrl}}" +> + + - \ No newline at end of file + diff --git a/app/docker/components/host-overview/host-overview.js b/app/docker/components/host-overview/host-overview.js index 36ab4087a..2d5af5f5b 100644 --- a/app/docker/components/host-overview/host-overview.js +++ b/app/docker/components/host-overview/host-overview.js @@ -8,7 +8,10 @@ angular.module('portainer.docker').component('hostOverview', { isAgent: '<', agentApiVersion: '<', refreshUrl: '@', - browseUrl: '@' + browseUrl: '@', + jobUrl: '@', + isJobEnabled: '<', + jobs: '<' }, transclude: true }); diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html index 8b46f466f..9b5b006d7 100644 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.html @@ -26,20 +26,19 @@ Total memory {{ $ctrl.host.totalMemory | humansize }} - + - + -
    -
    \ No newline at end of file +
    diff --git a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js index 1a946c7c0..8f1b55270 100644 --- a/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js +++ b/app/docker/components/host-view-panels/host-details-panel/host-details-panel.js @@ -1,9 +1,10 @@ angular.module('portainer.docker').component('hostDetailsPanel', { - templateUrl: - 'app/docker/components/host-view-panels/host-details-panel/host-details-panel.html', + templateUrl: 'app/docker/components/host-view-panels/host-details-panel/host-details-panel.html', bindings: { host: '<', + isJobEnabled: '<', isBrowseEnabled: '<', - browseUrl: '@' + browseUrl: '@', + jobUrl: '@' } }); diff --git a/app/docker/rest/container.js b/app/docker/rest/container.js index d46d9e474..e6a25f7bb 100644 --- a/app/docker/rest/container.js +++ b/app/docker/rest/container.js @@ -68,6 +68,9 @@ function ContainerFactory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { }, update: { method: 'POST', params: { id: '@id', action: 'update'} + }, + prune: { + method: 'POST', params: { action: 'prune', filters: '@filters' } } }); }]); diff --git a/app/docker/services/containerService.js b/app/docker/services/containerService.js index ce81cd8c5..f7c2cb085 100644 --- a/app/docker/services/containerService.js +++ b/app/docker/services/containerService.js @@ -186,5 +186,9 @@ function ContainerServiceFactory($q, Container, ResourceControlService, LogHelpe return Container.inspect({ id: id }).$promise; }; + service.prune = function(filters) { + return Container.prune({ filters: filters }).$promise; + }; + return service; }]); diff --git a/app/docker/views/host/host-browser-view/host-browser-view-controller.js b/app/docker/views/host/host-browser-view/host-browser-view-controller.js index 9638e966e..3f45fcc48 100644 --- a/app/docker/views/host/host-browser-view/host-browser-view-controller.js +++ b/app/docker/views/host/host-browser-view/host-browser-view-controller.js @@ -1,21 +1,17 @@ -angular - .module('portainer.docker') - .controller('HostBrowserViewController', [ - 'SystemService', 'HttpRequestHelper', - function HostBrowserViewController(SystemService, HttpRequestHelper) { - var ctrl = this; +angular.module('portainer.docker').controller('HostBrowserViewController', [ + 'SystemService', 'Notifications', + function HostBrowserViewController(SystemService, Notifications) { + var ctrl = this; + ctrl.$onInit = $onInit; - ctrl.$onInit = $onInit; - - function $onInit() { - loadInfo(); - } - - function loadInfo() { - SystemService.info().then(function onInfoLoaded(host) { - HttpRequestHelper.setPortainerAgentTargetHeader(host.Name); - ctrl.host = host; - }); - } + function $onInit() { + SystemService.info() + .then(function onInfoLoaded(host) { + ctrl.host = host; + }) + .catch(function onError(err) { + Notifications.error('Unable to retrieve host information', err); + }); } - ]); + } +]); diff --git a/app/docker/views/host/host-job/host-job-controller.js b/app/docker/views/host/host-job/host-job-controller.js new file mode 100644 index 000000000..811509f7b --- /dev/null +++ b/app/docker/views/host/host-job/host-job-controller.js @@ -0,0 +1,17 @@ +angular.module('portainer.docker').controller('HostJobController', [ + 'SystemService', 'Notifications', + function HostJobController(SystemService, Notifications) { + var ctrl = this; + ctrl.$onInit = $onInit; + + function $onInit() { + SystemService.info() + .then(function onInfoLoaded(host) { + ctrl.host = host; + }) + .catch(function onError(err) { + Notifications.error('Unable to retrieve host information', err); + }); + } + } +]); diff --git a/app/docker/views/host/host-job/host-job.html b/app/docker/views/host/host-job/host-job.html new file mode 100644 index 000000000..adfbd970b --- /dev/null +++ b/app/docker/views/host/host-job/host-job.html @@ -0,0 +1,16 @@ + + + + Host > {{ $ctrl.host.Name }} > execute job + + + +
    +
    + + + + + +
    +
    diff --git a/app/docker/views/host/host-job/host-job.js b/app/docker/views/host/host-job/host-job.js new file mode 100644 index 000000000..c23070c46 --- /dev/null +++ b/app/docker/views/host/host-job/host-job.js @@ -0,0 +1,4 @@ +angular.module('portainer.docker').component('hostJobView', { + templateUrl: 'app/docker/views/host/host-job/host-job.html', + controller: 'HostJobController' +}); diff --git a/app/docker/views/host/host-view-controller.js b/app/docker/views/host/host-view-controller.js index 008eb87a3..fedeff8c2 100644 --- a/app/docker/views/host/host-view-controller.js +++ b/app/docker/views/host/host-view-controller.js @@ -1,13 +1,15 @@ angular.module('portainer.docker').controller('HostViewController', [ - '$q', 'SystemService', 'Notifications', 'StateManager', 'AgentService', - function HostViewController($q, SystemService, Notifications, StateManager, AgentService) { + '$q', 'SystemService', 'Notifications', 'StateManager', 'AgentService', 'ContainerService', 'Authentication', + function HostViewController($q, SystemService, Notifications, StateManager, AgentService, ContainerService, Authentication) { var ctrl = this; + this.$onInit = initView; ctrl.state = { - isAgent: false + isAgent: false, + isAdmin : false }; - + this.engineDetails = {}; this.hostDetails = {}; this.devices = null; @@ -16,31 +18,34 @@ angular.module('portainer.docker').controller('HostViewController', [ function initView() { var applicationState = StateManager.getState(); ctrl.state.isAgent = applicationState.endpoint.mode.agentProxy; + ctrl.state.isAdmin = Authentication.getUserDetails().role === 1; var agentApiVersion = applicationState.endpoint.agentApiVersion; ctrl.state.agentApiVersion = agentApiVersion; $q.all({ version: SystemService.version(), - info: SystemService.info() + info: SystemService.info(), + jobs: ctrl.state.isAdmin ? ContainerService.containers(true, { label: ['io.portainer.job.endpoint'] }) : [] }) - .then(function success(data) { - ctrl.engineDetails = buildEngineDetails(data); - ctrl.hostDetails = buildHostDetails(data.info); + .then(function success(data) { + ctrl.engineDetails = buildEngineDetails(data); + ctrl.hostDetails = buildHostDetails(data.info); + ctrl.jobs = data.jobs; - if (ctrl.state.isAgent && agentApiVersion > 1) { - return AgentService.hostInfo(data.info.Hostname).then(function onHostInfoLoad(agentHostInfo) { - ctrl.devices = agentHostInfo.PCIDevices; - ctrl.disks = agentHostInfo.PhysicalDisks; - }); - } - }) - .catch(function error(err) { - Notifications.error( - 'Failure', - err, - 'Unable to retrieve engine details' - ); - }); + if (ctrl.state.isAgent && agentApiVersion > 1) { + return AgentService.hostInfo(data.info.Hostname).then(function onHostInfoLoad(agentHostInfo) { + ctrl.devices = agentHostInfo.PCIDevices; + ctrl.disks = agentHostInfo.PhysicalDisks; + }); + } + }) + .catch(function error(err) { + Notifications.error( + 'Failure', + err, + 'Unable to retrieve engine details' + ); + }); } function buildEngineDetails(data) { diff --git a/app/docker/views/host/host-view.html b/app/docker/views/host/host-view.html index 7d76b025e..35a4f513e 100644 --- a/app/docker/views/host/host-view.html +++ b/app/docker/views/host/host-view.html @@ -5,7 +5,9 @@ agent-api-version="$ctrl.state.agentApiVersion" disks="$ctrl.disks" devices="$ctrl.devices" - refresh-url="docker.host" browse-url="docker.host.browser" -> \ No newline at end of file + is-job-enabled="$ctrl.state.isAdmin" + job-url="docker.host.job" + jobs="$ctrl.jobs" +> diff --git a/app/docker/views/nodes/node-browser/node-browser-controller.js b/app/docker/views/nodes/node-browser/node-browser-controller.js index d846ac8f9..5c55c3e1b 100644 --- a/app/docker/views/nodes/node-browser/node-browser-controller.js +++ b/app/docker/views/nodes/node-browser/node-browser-controller.js @@ -1,19 +1,19 @@ angular.module('portainer.docker').controller('NodeBrowserController', [ - 'NodeService', 'HttpRequestHelper', '$stateParams', - function NodeBrowserController(NodeService, HttpRequestHelper, $stateParams) { + '$stateParams', 'NodeService', 'HttpRequestHelper', 'Notifications', + function NodeBrowserController($stateParams, NodeService, HttpRequestHelper, Notifications) { var ctrl = this; - ctrl.$onInit = $onInit; function $onInit() { ctrl.nodeId = $stateParams.id; - loadNode(); - } - function loadNode() { - NodeService.node(ctrl.nodeId).then(function onNodeLoaded(node) { + NodeService.node(ctrl.nodeId) + .then(function onNodeLoaded(node) { HttpRequestHelper.setPortainerAgentTargetHeader(node.Hostname); ctrl.node = node; + }) + .catch(function onError(err) { + Notifications.error('Unable to retrieve host information', err); }); } } diff --git a/app/docker/views/nodes/node-details/node-details-view-controller.js b/app/docker/views/nodes/node-details/node-details-view-controller.js index 9be1770f0..25abc6285 100644 --- a/app/docker/views/nodes/node-details/node-details-view-controller.js +++ b/app/docker/views/nodes/node-details/node-details-view-controller.js @@ -1,35 +1,46 @@ angular.module('portainer.docker').controller('NodeDetailsViewController', [ - '$stateParams', 'NodeService', 'StateManager', 'AgentService', - function NodeDetailsViewController($stateParams, NodeService, StateManager, AgentService) { + '$q', '$stateParams', 'NodeService', 'StateManager', 'AgentService', 'ContainerService', 'Authentication', + function NodeDetailsViewController($q, $stateParams, NodeService, StateManager, AgentService, ContainerService, Authentication) { var ctrl = this; ctrl.$onInit = initView; ctrl.state = { - isAgent: false + isAgent: false, + isAdmin: false }; function initView() { var applicationState = StateManager.getState(); ctrl.state.isAgent = applicationState.endpoint.mode.agentProxy; + ctrl.state.isAdmin = Authentication.getUserDetails().role === 1; + + var fetchJobs = ctrl.state.isAdmin && ctrl.state.isAgent; var nodeId = $stateParams.id; - NodeService.node(nodeId).then(function(node) { + $q.all({ + node: NodeService.node(nodeId), + jobs: fetchJobs ? ContainerService.containers(true, { label: ['io.portainer.job.endpoint'] }) : [] + }) + .then(function (data) { + var node = data.node; ctrl.originalNode = node; ctrl.hostDetails = buildHostDetails(node); ctrl.engineDetails = buildEngineDetails(node); ctrl.nodeDetails = buildNodeDetails(node); + ctrl.jobs = data.jobs; if (ctrl.state.isAgent) { var agentApiVersion = applicationState.endpoint.agentApiVersion; ctrl.state.agentApiVersion = agentApiVersion; if (agentApiVersion < 2) { return; } + AgentService.hostInfo(node.Hostname) - .then(function onHostInfoLoad(agentHostInfo) { - ctrl.devices = agentHostInfo.PCIDevices; - ctrl.disks = agentHostInfo.PhysicalDisks; - }); + .then(function onHostInfoLoad(agentHostInfo) { + ctrl.devices = agentHostInfo.PCIDevices; + ctrl.disks = agentHostInfo.PhysicalDisks; + }); } }); } @@ -68,12 +79,12 @@ angular.module('portainer.docker').controller('NodeDetailsViewController', [ function transformPlugins(pluginsList, type) { return pluginsList - .filter(function(plugin) { - return plugin.Type === type; - }) - .map(function(plugin) { - return plugin.Name; - }); + .filter(function(plugin) { + return plugin.Type === type; + }) + .map(function(plugin) { + return plugin.Name; + }); } } ]); diff --git a/app/docker/views/nodes/node-details/node-details-view.html b/app/docker/views/nodes/node-details/node-details-view.html index 3f7679972..6544e1aac 100644 --- a/app/docker/views/nodes/node-details/node-details-view.html +++ b/app/docker/views/nodes/node-details/node-details-view.html @@ -5,12 +5,14 @@ engine-details="$ctrl.engineDetails" disks="$ctrl.disks" devices="$ctrl.devices" - refresh-url="docker.nodes.node" browse-url="docker.nodes.node.browse" + is-job-enabled="$ctrl.state.isAdmin && $ctrl.state.isAgent" + job-url="docker.nodes.node.job" + jobs="$ctrl.jobs" > - \ No newline at end of file + diff --git a/app/docker/views/nodes/node-job/node-job-controller.js b/app/docker/views/nodes/node-job/node-job-controller.js new file mode 100644 index 000000000..9f1173d09 --- /dev/null +++ b/app/docker/views/nodes/node-job/node-job-controller.js @@ -0,0 +1,20 @@ +angular.module('portainer.docker').controller('NodeJobController', [ + '$stateParams', 'NodeService', 'HttpRequestHelper', 'Notifications', + function NodeJobController($stateParams, NodeService, HttpRequestHelper, Notifications) { + var ctrl = this; + ctrl.$onInit = $onInit; + + function $onInit() { + ctrl.nodeId = $stateParams.id; + + NodeService.node(ctrl.nodeId) + .then(function onNodeLoaded(node) { + HttpRequestHelper.setPortainerAgentTargetHeader(node.Hostname); + ctrl.node = node; + }) + .catch(function onError(err) { + Notifications.error('Unable to retrieve host information', err); + }); + } + } +]); diff --git a/app/docker/views/nodes/node-job/node-job.html b/app/docker/views/nodes/node-job/node-job.html new file mode 100644 index 000000000..90ae92d14 --- /dev/null +++ b/app/docker/views/nodes/node-job/node-job.html @@ -0,0 +1,18 @@ + + + + Swarm > {{ $ctrl.node.Hostname }} > execute job + + + +
    +
    + + + + + +
    +
    diff --git a/app/docker/views/nodes/node-job/node-job.js b/app/docker/views/nodes/node-job/node-job.js new file mode 100644 index 000000000..0b25f9b2c --- /dev/null +++ b/app/docker/views/nodes/node-job/node-job.js @@ -0,0 +1,4 @@ +angular.module('portainer.docker').component('nodeJobView', { + templateUrl: 'app/docker/views/nodes/node-job/node-job.html', + controller: 'NodeJobController' +}); diff --git a/app/portainer/components/forms/execute-job-form/execute-job-form-controller.js b/app/portainer/components/forms/execute-job-form/execute-job-form-controller.js new file mode 100644 index 000000000..8e3b3d196 --- /dev/null +++ b/app/portainer/components/forms/execute-job-form/execute-job-form-controller.js @@ -0,0 +1,69 @@ +angular.module('portainer.app') +.controller('JobFormController', ['$state', 'LocalStorage', 'EndpointService', 'EndpointProvider', 'Notifications', +function ($state, LocalStorage, EndpointService, EndpointProvider, Notifications) { + var ctrl = this; + + ctrl.$onInit = onInit; + ctrl.editorUpdate = editorUpdate; + ctrl.executeJob = executeJob; + + ctrl.state = { + Method: 'editor', + formValidationError: '', + actionInProgress: false + }; + + ctrl.formValues = { + Image: 'ubuntu:latest', + JobFileContent: '', + JobFile: null + }; + + function onInit() { + var storedImage = LocalStorage.getJobImage(); + if (storedImage) { + ctrl.formValues.Image = storedImage; + } + } + + function editorUpdate(cm) { + ctrl.formValues.JobFileContent = cm.getValue(); + } + + function createJob(image, method) { + var endpointId = EndpointProvider.endpointID(); + var nodeName = ctrl.nodeName; + + if (method === 'editor') { + var jobFileContent = ctrl.formValues.JobFileContent; + return EndpointService.executeJobFromFileContent(image, jobFileContent, endpointId, nodeName); + } + + var jobFile = ctrl.formValues.JobFile; + return EndpointService.executeJobFromFileUpload(image, jobFile, endpointId, nodeName); + } + + function executeJob() { + var method = ctrl.state.Method; + if (method === 'editor' && ctrl.formValues.JobFileContent === '') { + ctrl.state.formValidationError = 'Script file content must not be empty'; + return; + } + + var image = ctrl.formValues.Image; + LocalStorage.storeJobImage(image); + + ctrl.state.actionInProgress = true; + createJob(image, method) + .then(function success() { + Notifications.success('Job successfully created'); + $state.go('^'); + }) + .catch(function error(err) { + Notifications.error('Job execution failure', err); + }) + .finally(function final() { + ctrl.state.actionInProgress = false; + }); + } +}]); diff --git a/app/portainer/components/forms/execute-job-form/execute-job-form.html b/app/portainer/components/forms/execute-job-form/execute-job-form.html new file mode 100644 index 000000000..19230f46d --- /dev/null +++ b/app/portainer/components/forms/execute-job-form/execute-job-form.html @@ -0,0 +1,110 @@ +
    + +
    + +
    + +
    +
    +
    +
    +
    +

    This field is required.

    +
    +
    +
    + +
    + + This job will run inside a privileged container on the host. You can access the host filesystem under the + /host folder. + +
    + +
    + Job creation +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +
    + Web editor +
    +
    +
    + + +
    +
    +
    + + +
    +
    + Upload +
    +
    + + You can upload a script file from your computer. + +
    +
    +
    + + + {{ $ctrl.formValues.JobFile.name }} + + +
    +
    +
    + + +
    + Actions +
    +
    +
    + + + {{ $ctrl.state.formValidationError }} + +
    +
    + +
    diff --git a/app/portainer/components/forms/execute-job-form/execute-job-form.js b/app/portainer/components/forms/execute-job-form/execute-job-form.js new file mode 100644 index 000000000..9dbbf5a52 --- /dev/null +++ b/app/portainer/components/forms/execute-job-form/execute-job-form.js @@ -0,0 +1,7 @@ +angular.module('portainer.app').component('executeJobForm', { + templateUrl: 'app/portainer/components/forms/execute-job-form/execute-job-form.html', + controller: 'JobFormController', + bindings: { + nodeName: '<' + } +}); diff --git a/app/portainer/rest/endpoint.js b/app/portainer/rest/endpoint.js index 455a27448..7b50372e9 100644 --- a/app/portainer/rest/endpoint.js +++ b/app/portainer/rest/endpoint.js @@ -7,6 +7,7 @@ angular.module('portainer.app') update: { method: 'PUT', params: { id: '@id' } }, updateAccess: { method: 'PUT', params: { id: '@id', action: 'access' } }, remove: { method: 'DELETE', params: { id: '@id'} }, - snapshot: { method: 'POST', params: { id: 'snapshot' }} + snapshot: { method: 'POST', params: { id: 'snapshot' }}, + executeJob: { method: 'POST', ignoreLoadingBar: true, params: { id: '@id', action: 'job' } } }); }]); diff --git a/app/portainer/services/api/endpointService.js b/app/portainer/services/api/endpointService.js index aa3d57bb6..fa17052e5 100644 --- a/app/portainer/services/api/endpointService.js +++ b/app/portainer/services/api/endpointService.js @@ -100,5 +100,18 @@ function EndpointServiceFactory($q, Endpoints, FileUploadService) { return deferred.promise; }; + service.executeJobFromFileUpload = function (image, jobFile, endpointId, nodeName) { + return FileUploadService.executeEndpointJob(image, jobFile, endpointId, nodeName); + }; + + service.executeJobFromFileContent = function (image, jobFileContent, endpointId, nodeName) { + var payload = { + Image: image, + FileContent: jobFileContent + }; + + return Endpoints.executeJob({ id: endpointId, method: 'string', nodeName: nodeName }, payload).$promise; + }; + return service; }]); diff --git a/app/portainer/services/fileUpload.js b/app/portainer/services/fileUpload.js index fdbf9ff54..2d43cc44e 100644 --- a/app/portainer/services/fileUpload.js +++ b/app/portainer/services/fileUpload.js @@ -64,6 +64,17 @@ angular.module('portainer.app') }); }; + service.executeEndpointJob = function (imageName, file, endpointId, nodeName) { + return Upload.upload({ + url: 'api/endpoints/' + endpointId + '/job?method=file&nodeName=' + nodeName, + data: { + File: file, + Image: imageName + }, + ignoreLoadingBar: true + }); + }; + service.createEndpoint = function(name, type, URL, PublicURL, groupID, tags, TLS, TLSSkipVerify, TLSSkipClientVerify, TLSCAFile, TLSCertFile, TLSKeyFile) { return Upload.upload({ url: 'api/endpoints', diff --git a/app/portainer/services/localStorage.js b/app/portainer/services/localStorage.js index b104b4076..a676b33a4 100644 --- a/app/portainer/services/localStorage.js +++ b/app/portainer/services/localStorage.js @@ -89,6 +89,12 @@ angular.module('portainer.app') getColumnVisibilitySettings: function(key) { return localStorageService.get('col_visibility_' + key); }, + storeJobImage: function(data) { + localStorageService.set('job_image', data); + }, + getJobImage: function() { + return localStorageService.get('job_image'); + }, clean: function() { localStorageService.clearAll(); } diff --git a/app/portainer/services/notifications.js b/app/portainer/services/notifications.js index 85de16def..d1cd8eb80 100644 --- a/app/portainer/services/notifications.js +++ b/app/portainer/services/notifications.js @@ -13,7 +13,9 @@ angular.module('portainer.app') service.error = function(title, e, fallbackText) { var msg = fallbackText; - if (e.data && e.data.message) { + if (e.data && e.data.details) { + msg = e.data.details; + } else if (e.data && e.data.message) { msg = e.data.message; } else if (e.message) { msg = e.message; From a61654a35d87d0b0311569e745f808a9cf5d4e2c Mon Sep 17 00:00:00 2001 From: baron_l Date: Sun, 28 Oct 2018 10:27:06 +0100 Subject: [PATCH 37/93] feat(endpoints): add the ability to browse offline endpoints (#2253) * feat(back): saved data in snapshot * feat(endpoints): adding interceptors to retrieve saved data on offline endpoints * feat(endpoints): offline dashboard working - need tests on offline views * refactor(endpoints): interceptors cleaning and saving/loading offline endpoints data in/from localstorage * feat(endpoints): browsing offline endpoints * feat(endpoints): removing all the link in offline mode - sidebar not working when switching between off and on modes w/ stateManager logic * feat(endpoints): endpoint status detection in real time * fix(endpoints): offline swarm endpoint are not accessible anymore * fix(endpoints): refactor message + disable offline browsing for an endpoint when no snapshot is available for it * fix(endpoints): adding timeout and enabling loading bar for offline requests * fix(endpoints): trying to access a down endpoint wont remove sidebar items if it fails * feat(endpoints): disable checkboxes on offline views for offline mode * feat(endpoints): updating endpoint status when detecting a change * refactor(host): moved offline status panel from engine view to new host view * fix(endpoints): missing endpoint update on ping from home view * fix(api): rework EndpointUpdate operation * refactor(offline): moved endpoint status to EndpointProvider and refactor the status-changed detection * fix(offline): moved status detection to callback on views -> prevent displaying the offline message when endpoint is back online on view change * fix(offline): offline message is now displayed online when browsing an offline endpoint * fix(offline): sidebar updates correctly on endpoint status change * fix(offline): offline panel not displayed and hidden on online mode * refactor(offline): rework of OfflineMode management * refactor(offline): extract information-panel for offlineMode into a component * refactor(offline): remove redundant binding of informationPanel + endpointStatusInterceptor patter as service * refactor(interceptors): moved interceptors pattern to service pattern * feat(stacks): prevent inspection of a stack in offline mode * feat(host): hide devices/disk panels in offline mode * feat(host): disable browse action in offline mode * refactor(home): remove comments --- api/docker/snapshot.go | 32 +++++ api/http/handler/endpoints/endpoint_update.go | 135 +++++++++++------- api/portainer.go | 33 +++-- app/config.js | 2 + .../containersDatatable.html | 18 ++- .../containersDatatable.js | 3 +- .../containersDatatableController.js | 1 - .../images-datatable/imagesDatatable.html | 9 +- .../images-datatable/imagesDatatable.js | 3 +- .../networks-datatable/networksDatatable.html | 9 +- .../networks-datatable/networksDatatable.js | 3 +- .../volumes-datatable/volumesDatatable.html | 11 +- .../volumes-datatable/volumesDatatable.js | 3 +- .../docker-sidebar-content.js | 3 +- .../dockerSidebarContent.html | 4 +- .../host-overview/host-overview.html | 12 +- .../components/host-overview/host-overview.js | 1 + .../interceptors/containersInterceptor.js | 21 +++ app/docker/interceptors/imagesInterceptor.js | 21 +++ app/docker/interceptors/infoInterceptor.js | 21 +++ .../interceptors/networksInterceptor.js | 21 +++ app/docker/interceptors/versionInterceptor.js | 21 +++ app/docker/interceptors/volumesInterceptor.js | 21 +++ app/docker/rest/container.js | 6 +- app/docker/rest/image.js | 6 +- app/docker/rest/network.js | 6 +- app/docker/rest/system.js | 8 +- app/docker/rest/systemEndpoint.js | 13 ++ app/docker/rest/volume.js | 5 +- app/docker/services/systemService.js | 6 +- app/docker/views/containers/containers.html | 3 +- .../views/containers/containersController.js | 7 +- app/docker/views/dashboard/dashboard.html | 2 +- .../views/dashboard/dashboardController.js | 3 + app/docker/views/host/host-view-controller.js | 8 +- app/docker/views/host/host-view.html | 3 +- app/docker/views/images/images.html | 5 +- app/docker/views/images/imagesController.js | 7 +- app/docker/views/networks/networks.html | 3 +- .../views/networks/networksController.js | 7 +- app/docker/views/volumes/volumes.html | 3 +- app/docker/views/volumes/volumesController.js | 7 +- .../stacks-datatable/stacksDatatable.html | 9 +- .../stacks-datatable/stacksDatatable.js | 3 +- .../informationPanelOffline.html | 8 ++ .../informationPanelOffline.js | 4 + .../information-panel/information-panel.js | 2 +- .../information-panel/informationPanel.html | 2 +- .../interceptors/endpointStatusInterceptor.js | 41 ++++++ app/portainer/services/endpointProvider.js | 50 +++++++ app/portainer/services/extensionManager.js | 7 +- app/portainer/services/localStorage.js | 12 ++ app/portainer/services/stateManager.js | 18 +-- app/portainer/views/home/homeController.js | 106 ++++++++++---- app/portainer/views/main/mainController.js | 5 +- app/portainer/views/sidebar/sidebar.html | 1 + .../views/sidebar/sidebarController.js | 59 ++++---- app/portainer/views/stacks/stacks.html | 3 +- .../views/stacks/stacksController.js | 3 + 59 files changed, 637 insertions(+), 212 deletions(-) create mode 100644 app/docker/interceptors/containersInterceptor.js create mode 100644 app/docker/interceptors/imagesInterceptor.js create mode 100644 app/docker/interceptors/infoInterceptor.js create mode 100644 app/docker/interceptors/networksInterceptor.js create mode 100644 app/docker/interceptors/versionInterceptor.js create mode 100644 app/docker/interceptors/volumesInterceptor.js create mode 100644 app/docker/rest/systemEndpoint.js create mode 100644 app/portainer/components/information-panel-offline/informationPanelOffline.html create mode 100644 app/portainer/components/information-panel-offline/informationPanelOffline.js create mode 100644 app/portainer/interceptors/endpointStatusInterceptor.js diff --git a/api/docker/snapshot.go b/api/docker/snapshot.go index d8c481fb7..342465b1f 100644 --- a/api/docker/snapshot.go +++ b/api/docker/snapshot.go @@ -52,6 +52,16 @@ func snapshot(cli *client.Client) (*portainer.Snapshot, error) { return nil, err } + err = snapshotNetworks(snapshot, cli) + if err != nil { + return nil, err + } + + err = snapshotVersion(snapshot, cli) + if err != nil { + return nil, err + } + snapshot.Time = time.Now().Unix() return snapshot, nil } @@ -66,6 +76,7 @@ func snapshotInfo(snapshot *portainer.Snapshot, cli *client.Client) error { snapshot.DockerVersion = info.ServerVersion snapshot.TotalCPU = info.NCPU snapshot.TotalMemory = info.MemTotal + snapshot.SnapshotRaw.Info = info return nil } @@ -132,6 +143,7 @@ func snapshotContainers(snapshot *portainer.Snapshot, cli *client.Client) error snapshot.RunningContainerCount = runningContainers snapshot.StoppedContainerCount = stoppedContainers snapshot.StackCount += len(stacks) + snapshot.SnapshotRaw.Containers = containers return nil } @@ -142,6 +154,7 @@ func snapshotImages(snapshot *portainer.Snapshot, cli *client.Client) error { } snapshot.ImageCount = len(images) + snapshot.SnapshotRaw.Images = images return nil } @@ -152,5 +165,24 @@ func snapshotVolumes(snapshot *portainer.Snapshot, cli *client.Client) error { } snapshot.VolumeCount = len(volumes.Volumes) + snapshot.SnapshotRaw.Volumes = volumes + return nil +} + +func snapshotNetworks(snapshot *portainer.Snapshot, cli *client.Client) error { + networks, err := cli.NetworkList(context.Background(), types.NetworkListOptions{}) + if err != nil { + return err + } + snapshot.SnapshotRaw.Networks = networks + return nil +} + +func snapshotVersion(snapshot *portainer.Snapshot, cli *client.Client) error { + version, err := cli.ServerVersion(context.Background()) + if err != nil { + return err + } + snapshot.SnapshotRaw.Version = version return nil } diff --git a/api/http/handler/endpoints/endpoint_update.go b/api/http/handler/endpoints/endpoint_update.go index 5244cdc98..405f6ce38 100644 --- a/api/http/handler/endpoints/endpoint_update.go +++ b/api/http/handler/endpoints/endpoint_update.go @@ -12,16 +12,17 @@ import ( ) type endpointUpdatePayload struct { - Name string - URL string - PublicURL string - GroupID int - TLS bool - TLSSkipVerify bool - TLSSkipClientVerify bool - AzureApplicationID string - AzureTenantID string - AzureAuthenticationKey string + Name *string + URL *string + PublicURL *string + GroupID *int + TLS *bool + TLSSkipVerify *bool + TLSSkipClientVerify *bool + Status *int + AzureApplicationID *string + AzureTenantID *string + AzureAuthenticationKey *string Tags []string } @@ -53,36 +54,49 @@ func (handler *Handler) endpointUpdate(w http.ResponseWriter, r *http.Request) * return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find an endpoint with the specified identifier inside the database", err} } - if payload.Name != "" { - endpoint.Name = payload.Name + if payload.Name != nil { + endpoint.Name = *payload.Name } - if payload.URL != "" { - endpoint.URL = payload.URL + if payload.URL != nil { + endpoint.URL = *payload.URL } - if payload.PublicURL != "" { - endpoint.PublicURL = payload.PublicURL + if payload.PublicURL != nil { + endpoint.PublicURL = *payload.PublicURL } - if payload.GroupID != 0 { - endpoint.GroupID = portainer.EndpointGroupID(payload.GroupID) + if payload.GroupID != nil { + endpoint.GroupID = portainer.EndpointGroupID(*payload.GroupID) } if payload.Tags != nil { endpoint.Tags = payload.Tags } + if payload.Status != nil { + switch *payload.Status { + case 1: + endpoint.Status = portainer.EndpointStatusUp + break + case 2: + endpoint.Status = portainer.EndpointStatusDown + break + default: + break + } + } + if endpoint.Type == portainer.AzureEnvironment { credentials := endpoint.AzureCredentials - if payload.AzureApplicationID != "" { - credentials.ApplicationID = payload.AzureApplicationID + if payload.AzureApplicationID != nil { + credentials.ApplicationID = *payload.AzureApplicationID } - if payload.AzureTenantID != "" { - credentials.TenantID = payload.AzureTenantID + if payload.AzureTenantID != nil { + credentials.TenantID = *payload.AzureTenantID } - if payload.AzureAuthenticationKey != "" { - credentials.AuthenticationKey = payload.AzureAuthenticationKey + if payload.AzureAuthenticationKey != nil { + credentials.AuthenticationKey = *payload.AzureAuthenticationKey } httpClient := client.NewHTTPClient() @@ -93,44 +107,55 @@ func (handler *Handler) endpointUpdate(w http.ResponseWriter, r *http.Request) * endpoint.AzureCredentials = credentials } - folder := strconv.Itoa(endpointID) - if payload.TLS { - endpoint.TLSConfig.TLS = true - endpoint.TLSConfig.TLSSkipVerify = payload.TLSSkipVerify - if !payload.TLSSkipVerify { - caCertPath, _ := handler.FileService.GetPathForTLSFile(folder, portainer.TLSFileCA) - endpoint.TLSConfig.TLSCACertPath = caCertPath - } else { - endpoint.TLSConfig.TLSCACertPath = "" - handler.FileService.DeleteTLSFile(folder, portainer.TLSFileCA) - } + if payload.TLS != nil { + folder := strconv.Itoa(endpointID) + + if *payload.TLS { + endpoint.TLSConfig.TLS = true + if payload.TLSSkipVerify != nil { + endpoint.TLSConfig.TLSSkipVerify = *payload.TLSSkipVerify + + if !*payload.TLSSkipVerify { + caCertPath, _ := handler.FileService.GetPathForTLSFile(folder, portainer.TLSFileCA) + endpoint.TLSConfig.TLSCACertPath = caCertPath + } else { + endpoint.TLSConfig.TLSCACertPath = "" + handler.FileService.DeleteTLSFile(folder, portainer.TLSFileCA) + } + } + + if payload.TLSSkipClientVerify != nil { + if !*payload.TLSSkipClientVerify { + certPath, _ := handler.FileService.GetPathForTLSFile(folder, portainer.TLSFileCert) + endpoint.TLSConfig.TLSCertPath = certPath + keyPath, _ := handler.FileService.GetPathForTLSFile(folder, portainer.TLSFileKey) + endpoint.TLSConfig.TLSKeyPath = keyPath + } else { + endpoint.TLSConfig.TLSCertPath = "" + handler.FileService.DeleteTLSFile(folder, portainer.TLSFileCert) + endpoint.TLSConfig.TLSKeyPath = "" + handler.FileService.DeleteTLSFile(folder, portainer.TLSFileKey) + } + } - if !payload.TLSSkipClientVerify { - certPath, _ := handler.FileService.GetPathForTLSFile(folder, portainer.TLSFileCert) - endpoint.TLSConfig.TLSCertPath = certPath - keyPath, _ := handler.FileService.GetPathForTLSFile(folder, portainer.TLSFileKey) - endpoint.TLSConfig.TLSKeyPath = keyPath } else { + endpoint.TLSConfig.TLS = false + endpoint.TLSConfig.TLSSkipVerify = false + endpoint.TLSConfig.TLSCACertPath = "" endpoint.TLSConfig.TLSCertPath = "" - handler.FileService.DeleteTLSFile(folder, portainer.TLSFileCert) endpoint.TLSConfig.TLSKeyPath = "" - handler.FileService.DeleteTLSFile(folder, portainer.TLSFileKey) - } - } else { - endpoint.TLSConfig.TLS = false - endpoint.TLSConfig.TLSSkipVerify = false - endpoint.TLSConfig.TLSCACertPath = "" - endpoint.TLSConfig.TLSCertPath = "" - endpoint.TLSConfig.TLSKeyPath = "" - err = handler.FileService.DeleteTLSFiles(folder) - if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove TLS files from disk", err} + err = handler.FileService.DeleteTLSFiles(folder) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove TLS files from disk", err} + } } } - _, err = handler.ProxyManager.CreateAndRegisterProxy(endpoint) - if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Unable to register HTTP proxy for the endpoint", err} + if payload.URL != nil || payload.TLS != nil || endpoint.Type == portainer.AzureEnvironment { + _, err = handler.ProxyManager.CreateAndRegisterProxy(endpoint) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to register HTTP proxy for the endpoint", err} + } } err = handler.EndpointService.UpdateEndpoint(endpoint.ID, endpoint) diff --git a/api/portainer.go b/api/portainer.go index c1cdbab4f..2c866f3da 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -245,17 +245,28 @@ type ( // 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"` + 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"` + SnapshotRaw SnapshotRaw `json:"SnapshotRaw"` + } + + // SnapshotRaw represents all the information related to a snapshot as returned by the Docker API + SnapshotRaw struct { + Containers interface{} `json:"Containers"` + Volumes interface{} `json:"Volumes"` + Networks interface{} `json:"Networks"` + Images interface{} `json:"Images"` + Info interface{} `json:"Info"` + Version interface{} `json:"Version"` } // EndpointGroupID represents an endpoint group identifier diff --git a/app/config.js b/app/config.js index 4cdd7fa8c..cd21e1f08 100644 --- a/app/config.js +++ b/app/config.js @@ -17,6 +17,7 @@ angular.module('portainer') }] }); $httpProvider.interceptors.push('jwtInterceptor'); + $httpProvider.interceptors.push('EndpointStatusInterceptor'); $httpProvider.defaults.headers.post['Content-Type'] = 'application/json'; $httpProvider.defaults.headers.put['Content-Type'] = 'application/json'; $httpProvider.defaults.headers.patch['Content-Type'] = 'application/json'; @@ -48,6 +49,7 @@ angular.module('portainer') cfpLoadingBarProvider.includeSpinner = false; cfpLoadingBarProvider.parentSelector = '#loadingbar-placeholder'; + cfpLoadingBarProvider.latencyThreshold = 600; $urlRouterProvider.otherwise('/auth'); }]); diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.html b/app/docker/components/datatables/containers-datatable/containersDatatable.html index 19cd2a0c0..5b30f1473 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatable.html +++ b/app/docker/components/datatables/containers-datatable/containersDatatable.html @@ -99,7 +99,7 @@
    - - + @@ -210,17 +210,18 @@ - + - {{ item | containername | truncate: $ctrl.settings.containerNameTruncateSize }} + {{ item | containername | truncate: $ctrl.settings.containerNameTruncateSize }} + {{ item | containername | truncate: $ctrl.settings.containerNameTruncateSize }} {{ item.Status }} {{ item.Status }} - +
    @@ -228,8 +229,13 @@
    + + {{ item.StackName ? item.StackName : '-' }} - {{ item.Image | trimshasum }} + + {{ item.Image | trimshasum }} + {{ item.Image | trimshasum }} + {{item.Created | getisodatefromtimestamp}} diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.js b/app/docker/components/datatables/containers-datatable/containersDatatable.js index 18a693511..478f17367 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatable.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatable.js @@ -10,6 +10,7 @@ angular.module('portainer.docker').component('containersDatatable', { reverseOrder: '<', showOwnershipColumn: '<', showHostColumn: '<', - showAddAction: '<' + showAddAction: '<', + offlineMode: '<' } }); diff --git a/app/docker/components/datatables/containers-datatable/containersDatatableController.js b/app/docker/components/datatables/containers-datatable/containersDatatableController.js index 7151e5d64..2fd6ffe1e 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatableController.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatableController.js @@ -204,7 +204,6 @@ function (PaginationService, DatatableService, EndpointProvider) { this.$onInit = function() { setDefaults(this); this.prepareTableFromDataset(); - var storedOrder = DatatableService.getDataTableOrder(this.tableKey); if (storedOrder !== null) { this.state.reverseOrder = storedOrder.reverse; diff --git a/app/docker/components/datatables/images-datatable/imagesDatatable.html b/app/docker/components/datatables/images-datatable/imagesDatatable.html index 87cba5507..a509ebd75 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatable.html +++ b/app/docker/components/datatables/images-datatable/imagesDatatable.html @@ -6,7 +6,7 @@ {{ $ctrl.titleText }}
    -
    +
    -
    +
    -
    +
    - + 1) { diff --git a/app/docker/views/host/host-view.html b/app/docker/views/host/host-view.html index 35a4f513e..61597ecca 100644 --- a/app/docker/views/host/host-view.html +++ b/app/docker/views/host/host-view.html @@ -7,7 +7,8 @@ devices="$ctrl.devices" refresh-url="docker.host" browse-url="docker.host.browser" - is-job-enabled="$ctrl.state.isAdmin" + offline-mode="$ctrl.state.offlineMode" + is-job-enabled="$ctrl.state.isAdmin && !$ctrl.state.offlineMode" job-url="docker.host.job" jobs="$ctrl.jobs" > diff --git a/app/docker/views/images/images.html b/app/docker/views/images/images.html index 3c8df020a..8637e4e25 100644 --- a/app/docker/views/images/images.html +++ b/app/docker/views/images/images.html @@ -7,7 +7,7 @@ Images -
    +
    @@ -51,7 +51,7 @@
    - +
    diff --git a/app/docker/views/images/imagesController.js b/app/docker/views/images/imagesController.js index f495f4185..0504ceaea 100644 --- a/app/docker/views/images/imagesController.js +++ b/app/docker/views/images/imagesController.js @@ -1,6 +1,6 @@ angular.module('portainer.docker') -.controller('ImagesController', ['$scope', '$state', 'ImageService', 'Notifications', 'ModalService', 'HttpRequestHelper', 'FileSaver', 'Blob', -function ($scope, $state, ImageService, Notifications, ModalService, HttpRequestHelper, FileSaver, Blob) { +.controller('ImagesController', ['$scope', '$state', 'ImageService', 'Notifications', 'ModalService', 'HttpRequestHelper', 'FileSaver', 'Blob', 'EndpointProvider', +function ($scope, $state, ImageService, Notifications, ModalService, HttpRequestHelper, FileSaver, Blob, EndpointProvider) { $scope.state = { actionInProgress: false, exportInProgress: false @@ -113,10 +113,13 @@ function ($scope, $state, ImageService, Notifications, ModalService, HttpRequest }); }; + $scope.offlineMode = false; + function initView() { ImageService.images(true) .then(function success(data) { $scope.images = data; + $scope.offlineMode = EndpointProvider.offlineMode(); }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to retrieve images'); diff --git a/app/docker/views/networks/networks.html b/app/docker/views/networks/networks.html index ff0f6edd6..c547d54ba 100644 --- a/app/docker/views/networks/networks.html +++ b/app/docker/views/networks/networks.html @@ -6,7 +6,7 @@ Networks - +
    diff --git a/app/docker/views/networks/networksController.js b/app/docker/views/networks/networksController.js index c730dc337..77c7647d9 100644 --- a/app/docker/views/networks/networksController.js +++ b/app/docker/views/networks/networksController.js @@ -1,6 +1,6 @@ angular.module('portainer.docker') -.controller('NetworksController', ['$scope', '$state', 'NetworkService', 'Notifications', 'HttpRequestHelper', -function ($scope, $state, NetworkService, Notifications, HttpRequestHelper) { +.controller('NetworksController', ['$scope', '$state', 'NetworkService', 'Notifications', 'HttpRequestHelper', 'EndpointProvider', +function ($scope, $state, NetworkService, Notifications, HttpRequestHelper, EndpointProvider) { $scope.removeAction = function (selectedItems) { var actionCount = selectedItems.length; @@ -24,10 +24,13 @@ function ($scope, $state, NetworkService, Notifications, HttpRequestHelper) { }); }; + $scope.offlineMode = false; + function initView() { NetworkService.networks(true, true, true) .then(function success(data) { $scope.networks = data; + $scope.offlineMode = EndpointProvider.offlineMode(); }) .catch(function error(err) { $scope.networks = []; diff --git a/app/docker/views/volumes/volumes.html b/app/docker/views/volumes/volumes.html index 072394f45..958246e49 100644 --- a/app/docker/views/volumes/volumes.html +++ b/app/docker/views/volumes/volumes.html @@ -6,7 +6,7 @@ Volumes - +
    diff --git a/app/docker/views/volumes/volumesController.js b/app/docker/views/volumes/volumesController.js index 362c54b4b..3ab620266 100644 --- a/app/docker/views/volumes/volumesController.js +++ b/app/docker/views/volumes/volumesController.js @@ -1,6 +1,6 @@ angular.module('portainer.docker') -.controller('VolumesController', ['$q', '$scope', '$state', 'VolumeService', 'ServiceService', 'VolumeHelper', 'Notifications', 'HttpRequestHelper', -function ($q, $scope, $state, VolumeService, ServiceService, VolumeHelper, Notifications, HttpRequestHelper) { +.controller('VolumesController', ['$q', '$scope', '$state', 'VolumeService', 'ServiceService', 'VolumeHelper', 'Notifications', 'HttpRequestHelper', 'EndpointProvider', +function ($q, $scope, $state, VolumeService, ServiceService, VolumeHelper, Notifications, HttpRequestHelper, EndpointProvider) { $scope.removeAction = function (selectedItems) { var actionCount = selectedItems.length; @@ -24,6 +24,8 @@ function ($q, $scope, $state, VolumeService, ServiceService, VolumeHelper, Notif }); }; + $scope.offlineMode = false; + function initView() { var endpointProvider = $scope.applicationState.endpoint.mode.provider; var endpointRole = $scope.applicationState.endpoint.mode.role; @@ -35,6 +37,7 @@ function ($q, $scope, $state, VolumeService, ServiceService, VolumeHelper, Notif }) .then(function success(data) { var services = data.services; + $scope.offlineMode = EndpointProvider.offlineMode(); $scope.volumes = data.attached.map(function(volume) { volume.dangling = false; return volume; diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html index 5b640ea17..b91a8e1da 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html @@ -6,7 +6,7 @@ {{ $ctrl.titleText }}
    -
    +
    diff --git a/app/portainer/interceptors/endpointStatusInterceptor.js b/app/portainer/interceptors/endpointStatusInterceptor.js new file mode 100644 index 000000000..46ca7a42b --- /dev/null +++ b/app/portainer/interceptors/endpointStatusInterceptor.js @@ -0,0 +1,41 @@ +angular.module('portainer.app') + .factory('EndpointStatusInterceptor', ['$q', '$injector', 'EndpointProvider', function ($q, $injector, EndpointProvider) { + 'use strict'; + var interceptor = {}; + + interceptor.response = responseInterceptor; + interceptor.responseError = responseErrorInterceptor; + + function canBeOffline(url) { + return (_.startsWith(url, 'api/') && ( + _.includes(url, '/containers') || + _.includes(url, '/images') || + _.includes(url, '/volumes') || + _.includes(url, '/networks') || + _.includes(url, '/info') || + _.includes(url, '/version') + )); + } + + function responseInterceptor(response) { + var EndpointService = $injector.get('EndpointService'); + var url = response.config.url; + if (response.status === 200 && canBeOffline(url) && EndpointProvider.offlineMode()) { + EndpointProvider.setOfflineMode(false); + EndpointService.updateEndpoint(EndpointProvider.endpointID(), {Status: EndpointProvider.endpointStatusFromOfflineMode(false)}); + } + return response || $q.when(response); + } + + function responseErrorInterceptor(rejection) { + var EndpointService = $injector.get('EndpointService'); + var url = rejection.config.url; + if ((rejection.status === 502 || rejection.status === -1) && canBeOffline(url) && !EndpointProvider.offlineMode()) { + EndpointProvider.setOfflineMode(true); + EndpointService.updateEndpoint(EndpointProvider.endpointID(), {Status: EndpointProvider.endpointStatusFromOfflineMode(true)}); + } + return $q.reject(rejection); + } + + return interceptor; + }]); \ No newline at end of file diff --git a/app/portainer/services/endpointProvider.js b/app/portainer/services/endpointProvider.js index 21d635d64..ebd89497e 100644 --- a/app/portainer/services/endpointProvider.js +++ b/app/portainer/services/endpointProvider.js @@ -7,19 +7,31 @@ angular.module('portainer.app') service.initialize = function() { var endpointID = LocalStorage.getEndpointID(); var endpointPublicURL = LocalStorage.getEndpointPublicURL(); + var offlineMode = LocalStorage.getOfflineMode(); + if (endpointID) { endpoint.ID = endpointID; } if (endpointPublicURL) { endpoint.PublicURL = endpointPublicURL; } + if (offlineMode) { + endpoint.OfflineMode = offlineMode; + } }; service.clean = function() { endpoint = {}; }; + service.endpoint = function() { + return endpoint; + }; + service.endpointID = function() { + if (endpoint.ID === undefined) { + endpoint.ID = LocalStorage.getEndpointID(); + } return endpoint.ID; }; @@ -29,6 +41,9 @@ angular.module('portainer.app') }; service.endpointPublicURL = function() { + if (endpoint.PublicURL === undefined) { + endpoint.PublicURL = LocalStorage.getEndpointPublicURL(); + } return endpoint.PublicURL; }; @@ -37,5 +52,40 @@ angular.module('portainer.app') LocalStorage.storeEndpointPublicURL(publicURL); }; + service.endpoints = function() { + return LocalStorage.getEndpoints(); + }; + + service.setEndpoints = function(data) { + LocalStorage.storeEndpoints(data); + }; + + service.offlineMode = function() { + return endpoint.OfflineMode; + }; + + service.endpointStatusFromOfflineMode = function(isOffline) { + return isOffline ? 2 : 1; + }; + + service.setOfflineMode = function(isOffline) { + endpoint.OfflineMode = isOffline; + LocalStorage.storeOfflineMode(isOffline); + }; + + service.setOfflineModeFromStatus = function(status) { + var isOffline = status !== 1; + endpoint.OfflineMode = isOffline; + LocalStorage.storeOfflineMode(isOffline); + }; + + service.currentEndpoint = function() { + var endpointId = endpoint.ID; + var endpoints = LocalStorage.getEndpoints(); + return _.find(endpoints, function (item) { + return item.Id === endpointId; + }); + }; + return service; }]); diff --git a/app/portainer/services/extensionManager.js b/app/portainer/services/extensionManager.js index b0cde467e..e9f622746 100644 --- a/app/portainer/services/extensionManager.js +++ b/app/portainer/services/extensionManager.js @@ -4,9 +4,14 @@ function ExtensionManagerFactory($q, PluginService, SystemService, ExtensionServ 'use strict'; var service = {}; - service.initEndpointExtensions = function() { + service.initEndpointExtensions = function(endpoint) { var deferred = $q.defer(); + if (endpoint.Status !== 1) { + deferred.resolve([]); + return deferred.promise; + } + SystemService.version() .then(function success(data) { var endpointAPIVersion = parseFloat(data.ApiVersion); diff --git a/app/portainer/services/localStorage.js b/app/portainer/services/localStorage.js index a676b33a4..2988ebd9d 100644 --- a/app/portainer/services/localStorage.js +++ b/app/portainer/services/localStorage.js @@ -14,6 +14,18 @@ angular.module('portainer.app') getEndpointPublicURL: function() { return localStorageService.get('ENDPOINT_PUBLIC_URL'); }, + storeOfflineMode: function(isOffline) { + localStorageService.set('ENDPOINT_OFFLINE_MODE', isOffline); + }, + getOfflineMode: function() { + return localStorageService.get('ENDPOINT_OFFLINE_MODE'); + }, + storeEndpoints: function(data) { + localStorageService.set('ENDPOINTS_DATA', data); + }, + getEndpoints: function() { + return localStorageService.get('ENDPOINTS_DATA'); + }, storeEndpointState: function(state) { localStorageService.set('ENDPOINT_STATE', state); }, diff --git a/app/portainer/services/stateManager.js b/app/portainer/services/stateManager.js index 36c7dadb5..987022476 100644 --- a/app/portainer/services/stateManager.js +++ b/app/portainer/services/stateManager.js @@ -135,11 +135,11 @@ function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, Settin return extensions; } - manager.updateEndpointState = function(name, type, extensions) { + manager.updateEndpointState = function(endpoint, extensions) { var deferred = $q.defer(); - if (type === 3) { - state.endpoint.name = name; + if (endpoint.Type === 3) { + state.endpoint.name = endpoint.Name; state.endpoint.mode = { provider: 'AZURE' }; LocalStorage.storeEndpointState(state.endpoint); deferred.resolve(); @@ -147,23 +147,23 @@ function StateManagerFactory($q, SystemService, InfoHelper, LocalStorage, Settin } $q.all({ - version: SystemService.version(), - info: SystemService.info() + version: endpoint.Status === 1 ? SystemService.version() : $q.when(endpoint.Snapshots[0].SnapshotRaw.Version), + info: endpoint.Status === 1 ? SystemService.info() : $q.when(endpoint.Snapshots[0].SnapshotRaw.Info) }) .then(function success(data) { - var endpointMode = InfoHelper.determineEndpointMode(data.info, type); + var endpointMode = InfoHelper.determineEndpointMode(data.info, endpoint.Type); var endpointAPIVersion = parseFloat(data.version.ApiVersion); state.endpoint.mode = endpointMode; - state.endpoint.name = name; + state.endpoint.name = endpoint.Name; state.endpoint.apiVersion = endpointAPIVersion; state.endpoint.extensions = assignExtensions(extensions); - if (endpointMode.agentProxy) { + if (endpointMode.agentProxy && endpoint.Status === 1) { return AgentPingService.ping().then(function onPingSuccess(data) { state.endpoint.agentApiVersion = data.version; }); } - + }).then(function () { LocalStorage.storeEndpointState(state.endpoint); deferred.resolve(); diff --git a/app/portainer/views/home/homeController.js b/app/portainer/views/home/homeController.js index f666e49d7..083c75625 100644 --- a/app/portainer/views/home/homeController.js +++ b/app/portainer/views/home/homeController.js @@ -1,44 +1,71 @@ angular.module('portainer.app') -.controller('HomeController', ['$q', '$scope', '$state', 'Authentication', 'EndpointService', 'EndpointHelper', 'GroupService', 'Notifications', 'EndpointProvider', 'StateManager', 'ExtensionManager', 'ModalService', 'MotdService', -function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, GroupService, Notifications, EndpointProvider, StateManager, ExtensionManager, ModalService, MotdService) { +.controller('HomeController', ['$q', '$scope', '$state', 'Authentication', 'EndpointService', 'EndpointHelper', 'GroupService', 'Notifications', 'EndpointProvider', 'StateManager', 'ExtensionManager', 'ModalService', 'MotdService', 'SystemService', +function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, GroupService, Notifications, EndpointProvider, StateManager, ExtensionManager, ModalService, MotdService, SystemService) { - $scope.goToDashboard = function(endpoint) { - EndpointProvider.setEndpointID(endpoint.Id); - EndpointProvider.setEndpointPublicURL(endpoint.PublicURL); - if (endpoint.Type === 3) { - switchToAzureEndpoint(endpoint); - } else { - switchToDockerEndpoint(endpoint); - } + $scope.goToEdit = function(id) { + $state.go('portainer.endpoints.endpoint', { id: id }); }; - $scope.dismissImportantInformation = function(hash) { + $scope.goToDashboard = function (endpoint) { + if (endpoint.Type === 3) { + return switchToAzureEndpoint(endpoint); + } + + checkEndpointStatus(endpoint) + .then(function sucess() { + return switchToDockerEndpoint(endpoint); + }).catch(function error(err) { + Notifications.error('Failure', err, 'Unable to verify endpoint status'); + }); + }; + + $scope.dismissImportantInformation = function (hash) { StateManager.dismissImportantInformation(hash); }; - $scope.dismissInformationPanel = function(id) { + $scope.dismissInformationPanel = function (id) { StateManager.dismissInformationPanel(id); }; - function triggerSnapshot() { - EndpointService.snapshot() - .then(function success() { - Notifications.success('Success', 'Endpoints updated'); - $state.reload(); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'An error occured during endpoint snapshot'); - }); - } - - $scope.triggerSnapshot = function() { + $scope.triggerSnapshot = function () { ModalService.confirmEndpointSnapshot(function (result) { - if(!result) { return; } + if (!result) { + return; + } triggerSnapshot(); }); }; + function checkEndpointStatus(endpoint) { + var deferred = $q.defer(); + + var status = 1; + SystemService.ping(endpoint.Id) + .then(function sucess() { + status = 1; + }).catch(function error() { + status = 2; + }).finally(function () { + if (endpoint.Status === status) { + deferred.resolve(endpoint); + return deferred.promise; + } + + EndpointService.updateEndpoint(endpoint.Id, { Status: status }) + .then(function sucess() { + deferred.resolve(endpoint); + }).catch(function error(err) { + deferred.reject({msg: 'Unable to update endpoint status', err: err}); + }); + }); + + return deferred.promise; + } + function switchToAzureEndpoint(endpoint) { + EndpointProvider.setEndpointID(endpoint.Id); + EndpointProvider.setEndpointPublicURL(endpoint.PublicURL); + EndpointProvider.setOfflineModeFromStatus(endpoint.Status); StateManager.updateEndpointState(endpoint.Name, endpoint.Type, []) .then(function success() { $state.go('azure.dashboard'); @@ -49,10 +76,21 @@ function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, G } function switchToDockerEndpoint(endpoint) { - ExtensionManager.initEndpointExtensions(endpoint.Id) + if (endpoint.Status === 2 && endpoint.Snapshots[0] && endpoint.Snapshots[0].Swarm === true) { + Notifications.error('Failure', '', 'Endpoint is unreachable. Connect to another swarm manager.'); + return; + } else if (endpoint.Status === 2 && !endpoint.Snapshots[0]) { + Notifications.error('Failure', '', 'Endpoint is unreachable and there is no snapshot available for offline browsing.'); + return; + } + + EndpointProvider.setEndpointID(endpoint.Id); + EndpointProvider.setEndpointPublicURL(endpoint.PublicURL); + EndpointProvider.setOfflineModeFromStatus(endpoint.Status); + ExtensionManager.initEndpointExtensions(endpoint) .then(function success(data) { var extensions = data; - return StateManager.updateEndpointState(endpoint.Name, endpoint.Type, extensions); + return StateManager.updateEndpointState(endpoint, extensions); }) .then(function success() { $state.go('docker.dashboard'); @@ -62,10 +100,15 @@ function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, G }); } - $scope.goToEdit = goToEdit; - - function goToEdit(id) { - $state.go('portainer.endpoints.endpoint', { id: id }); + function triggerSnapshot() { + EndpointService.snapshot() + .then(function success() { + Notifications.success('Success', 'Endpoints updated'); + $state.reload(); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'An error occured during endpoint snapshot'); + }); } function initView() { @@ -85,6 +128,7 @@ function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, G var groups = data.groups; EndpointHelper.mapGroupNameToEndpoint(endpoints, groups); $scope.endpoints = endpoints; + EndpointProvider.setEndpoints(endpoints); }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to retrieve endpoint information'); diff --git a/app/portainer/views/main/mainController.js b/app/portainer/views/main/mainController.js index 3eb3e9cde..d6c76f982 100644 --- a/app/portainer/views/main/mainController.js +++ b/app/portainer/views/main/mainController.js @@ -1,6 +1,6 @@ angular.module('portainer.app') -.controller('MainController', ['$scope', '$cookieStore', 'StateManager', -function ($scope, $cookieStore, StateManager) { +.controller('MainController', ['$scope', '$cookieStore', 'StateManager', 'EndpointProvider', +function ($scope, $cookieStore, StateManager, EndpointProvider) { /** * Sidebar Toggle & Cookie Control @@ -11,6 +11,7 @@ function ($scope, $cookieStore, StateManager) { }; $scope.applicationState = StateManager.getState(); + $scope.endpointState = EndpointProvider.endpoint(); $scope.$watch($scope.getWidth, function(newValue) { if (newValue >= mobileView) { diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index d105549c5..af042c575 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -22,6 +22,7 @@ swarm-management="applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE' && applicationState.endpoint.mode.role === 'MANAGER'" standalone-management="applicationState.endpoint.mode.provider === 'DOCKER_STANDALONE' || applicationState.endpoint.mode.provider === 'VMWARE_VIC'" admin-access="!applicationState.application.authentication || isAdmin" + offline-mode="endpointState.OfflineMode" >
  • Extensions diff --git a/app/portainer/views/sidebar/sidebarController.js b/app/portainer/views/sidebar/sidebarController.js index 7d685ac29..fe24ec5b3 100644 --- a/app/portainer/views/sidebar/sidebarController.js +++ b/app/portainer/views/sidebar/sidebarController.js @@ -1,36 +1,37 @@ angular.module('portainer.app') -.controller('SidebarController', ['$q', '$scope', 'StateManager', 'Notifications', 'Authentication', 'UserService', -function ($q, $scope, StateManager, Notifications, Authentication, UserService) { + .controller('SidebarController', ['$q', '$scope', 'StateManager', 'Notifications', 'Authentication', 'UserService', + function ($q, $scope, StateManager, Notifications, Authentication, UserService) { - function checkPermissions(memberships) { - var isLeader = false; - angular.forEach(memberships, function(membership) { - if (membership.Role === 1) { - isLeader = true; + function checkPermissions(memberships) { + var isLeader = false; + angular.forEach(memberships, function (membership) { + if (membership.Role === 1) { + isLeader = true; + } + }); + $scope.isTeamLeader = isLeader; } - }); - $scope.isTeamLeader = isLeader; - } - function initView() { - $scope.uiVersion = StateManager.getState().application.version; - $scope.logo = StateManager.getState().application.logo; + function initView() { + $scope.uiVersion = StateManager.getState().application.version; + $scope.logo = StateManager.getState().application.logo; - var authenticationEnabled = $scope.applicationState.application.authentication; - if (authenticationEnabled) { - var userDetails = Authentication.getUserDetails(); - var isAdmin = userDetails.role === 1; - $scope.isAdmin = isAdmin; + var authenticationEnabled = $scope.applicationState.application.authentication; + if (authenticationEnabled) { + var userDetails = Authentication.getUserDetails(); + var isAdmin = userDetails.role === 1; + $scope.isAdmin = isAdmin; - $q.when(!isAdmin ? UserService.userMemberships(userDetails.ID) : []) - .then(function success(data) { - checkPermissions(data); - }) - .catch(function error(err) { - Notifications.error('Failure', err, 'Unable to retrieve user memberships'); - }); + $q.when(!isAdmin ? UserService.userMemberships(userDetails.ID) : []) + .then(function success(data) { + checkPermissions(data); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve user memberships'); + }); + } + } + + initView(); } - } - - initView(); -}]); + ]); \ No newline at end of file diff --git a/app/portainer/views/stacks/stacks.html b/app/portainer/views/stacks/stacks.html index d188581d4..e6ac1824b 100644 --- a/app/portainer/views/stacks/stacks.html +++ b/app/portainer/views/stacks/stacks.html @@ -6,7 +6,7 @@ Stacks - +
    diff --git a/app/portainer/views/stacks/stacksController.js b/app/portainer/views/stacks/stacksController.js index 52482ec0c..3c331a8f6 100644 --- a/app/portainer/views/stacks/stacksController.js +++ b/app/portainer/views/stacks/stacksController.js @@ -33,6 +33,8 @@ function ($scope, $state, Notifications, StackService, ModalService, EndpointPro }); } + $scope.offlineMode = false; + function initView() { var endpointMode = $scope.applicationState.endpoint.mode; var endpointId = EndpointProvider.endpointID(); @@ -45,6 +47,7 @@ function ($scope, $state, Notifications, StackService, ModalService, EndpointPro .then(function success(data) { var stacks = data; $scope.stacks = stacks; + $scope.offlineMode = EndpointProvider.offlineMode(); }) .catch(function error(err) { $scope.stacks = []; From 8df64031e865da8978e2dfe1f7aa1bc744e0f61f Mon Sep 17 00:00:00 2001 From: pc Date: Mon, 29 Oct 2018 12:49:35 +0800 Subject: [PATCH 38/93] feat(log-viewer): change line count default to 100 and add a since parameter (#2377) * chore(log-viewer): add the ability to use`since` parameter #1942 https://github.com/portainer/portainer/issues/1942#issuecomment-430246378 * chore(log-viewer): change lineCount to 100 #1942 https://github.com/portainer/portainer/issues/1942#issuecomment-430246378 * fix(log-viewer): js syntax typo for `;` and `'` forget to lint the code, reported by codeclimate * fix(log-viewer): use mementjs to format timestamp 1. use moment lib instead of define a function in filter.js(not the right place for this function, removed) 2. set sinceTimestamp init value to `24 hours ago`, as we just need to focus on the relative latest logs after the log-viewer loading, not all the logs(to speedup the process) 3. use moment().unix() to convert the `sinceTimestamp` to local unix timestamp(not utc) * chore(log-viewer): add the ability to select the datetime for `since` * chore(log-viewer): add the ability to fetch logs from specific time --- app/docker/components/log-viewer/log-viewer.js | 1 + app/docker/components/log-viewer/logViewer.html | 11 +++++++++++ .../components/log-viewer/logViewerController.js | 6 ++++++ app/docker/services/containerService.js | 3 ++- app/docker/services/serviceService.js | 3 ++- app/docker/services/taskService.js | 3 ++- .../views/containers/logs/containerLogsController.js | 7 ++++--- app/docker/views/containers/logs/containerlogs.html | 2 +- .../views/services/logs/serviceLogsController.js | 7 ++++--- app/docker/views/services/logs/servicelogs.html | 2 +- app/docker/views/tasks/logs/taskLogsController.js | 7 ++++--- app/docker/views/tasks/logs/tasklogs.html | 2 +- 12 files changed, 39 insertions(+), 15 deletions(-) diff --git a/app/docker/components/log-viewer/log-viewer.js b/app/docker/components/log-viewer/log-viewer.js index 070567b9e..b0864aea4 100644 --- a/app/docker/components/log-viewer/log-viewer.js +++ b/app/docker/components/log-viewer/log-viewer.js @@ -5,6 +5,7 @@ angular.module('portainer.docker').component('logViewer', { data: '=', displayTimestamps: '=', logCollectionChange: '<', + sinceTimestamp: '=', lineCount: '=' } }); diff --git a/app/docker/components/log-viewer/logViewer.html b/app/docker/components/log-viewer/logViewer.html index 9e1f95c02..44c1c5d7e 100644 --- a/app/docker/components/log-viewer/logViewer.html +++ b/app/docker/components/log-viewer/logViewer.html @@ -35,6 +35,17 @@
    • +
    + +
    + +
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    + + + diff --git a/app/portainer/components/datatables/schedules-datatable/schedulesDatatable.js b/app/portainer/components/datatables/schedules-datatable/schedulesDatatable.js new file mode 100644 index 000000000..13a9bd34f --- /dev/null +++ b/app/portainer/components/datatables/schedules-datatable/schedulesDatatable.js @@ -0,0 +1,13 @@ +angular.module('portainer.app').component('schedulesDatatable', { + templateUrl: 'app/portainer/components/datatables/schedules-datatable/schedulesDatatable.html', + controller: 'SchedulesDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + removeAction: '<' + } +}); diff --git a/app/portainer/components/datatables/schedules-datatable/schedulesDatatableController.js b/app/portainer/components/datatables/schedules-datatable/schedulesDatatableController.js new file mode 100644 index 000000000..bac777070 --- /dev/null +++ b/app/portainer/components/datatables/schedules-datatable/schedulesDatatableController.js @@ -0,0 +1,58 @@ +angular.module('portainer.app') +.controller('SchedulesDatatableController', ['PaginationService', 'DatatableService', +function (PaginationService, DatatableService) { + + this.state = { + selectAll: false, + orderBy: this.orderBy, + paginatedItemLimit: PaginationService.getPaginationLimit(this.tableKey), + displayTextFilter: false, + selectedItemCount: 0, + selectedItems: [] + }; + + this.changeOrderBy = function(orderField) { + this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; + this.state.orderBy = orderField; + DatatableService.setDataTableOrder(this.tableKey, orderField, this.state.reverseOrder); + }; + + this.selectItem = function(item) { + if (item.Checked) { + this.state.selectedItemCount++; + this.state.selectedItems.push(item); + } else { + this.state.selectedItems.splice(this.state.selectedItems.indexOf(item), 1); + this.state.selectedItemCount--; + } + }; + + this.selectAll = function() { + for (var i = 0; i < this.state.filteredDataSet.length; i++) { + var item = this.state.filteredDataSet[i]; + if (item.JobType ===1 && item.Checked !== this.state.selectAll) { + item.Checked = this.state.selectAll; + this.selectItem(item); + } + } + }; + + this.changePaginationLimit = function() { + PaginationService.setPaginationLimit(this.tableKey, this.state.paginatedItemLimit); + }; + + this.$onInit = function() { + setDefaults(this); + + var storedOrder = DatatableService.getDataTableOrder(this.tableKey); + if (storedOrder !== null) { + this.state.reverseOrder = storedOrder.reverse; + this.state.orderBy = storedOrder.orderBy; + } + }; + + function setDefaults(ctrl) { + ctrl.showTextFilter = ctrl.showTextFilter ? ctrl.showTextFilter : false; + ctrl.state.reverseOrder = ctrl.reverseOrder ? ctrl.reverseOrder : false; + } +}]); diff --git a/app/portainer/components/forms/schedule-form/schedule-form.js b/app/portainer/components/forms/schedule-form/schedule-form.js new file mode 100644 index 000000000..27b14790f --- /dev/null +++ b/app/portainer/components/forms/schedule-form/schedule-form.js @@ -0,0 +1,35 @@ +angular.module('portainer.app').component('scheduleForm', { + templateUrl: 'app/portainer/components/forms/schedule-form/scheduleForm.html', + controller: function() { + var ctrl = this; + + ctrl.state = { + formValidationError: '' + }; + + this.action = function() { + ctrl.state.formValidationError = ''; + + if (ctrl.model.Job.Method === 'editor' && ctrl.model.Job.FileContent === '') { + ctrl.state.formValidationError = 'Script file content must not be empty'; + return; + } + + ctrl.formAction(); + }; + + this.editorUpdate = function(cm) { + ctrl.model.Job.FileContent = cm.getValue(); + }; + }, + bindings: { + model: '=', + endpoints: '<', + groups: '<', + addLabelAction: '<', + removeLabelAction: '<', + formAction: '<', + formActionLabel: '@', + actionInProgress: '<' + } +}); diff --git a/app/portainer/components/forms/schedule-form/scheduleForm.html b/app/portainer/components/forms/schedule-form/scheduleForm.html new file mode 100644 index 000000000..1f287ece1 --- /dev/null +++ b/app/portainer/components/forms/schedule-form/scheduleForm.html @@ -0,0 +1,165 @@ +
    +
    + Schedule configuration +
    + +
    + +
    + +
    +
    +
    +
    +
    +

    This field is required.

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

    This field is required.

    +
    +
    +
    +
    + + You can refer to the following documentation to get more information about the supported cron expression format. + +
    + +
    + Job configuration +
    + +
    + +
    + +
    +
    +
    +
    +
    +

    This field is required.

    +
    +
    +
    + +
    +
    + + This schedule will be executed via a privileged container on the target hosts. You can access the host filesystem under the + /host folder. + +
    + +
    + Job content +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    +
    + + +
    +
    + Web editor +
    +
    +
    + +
    +
    +
    + + +
    +
    + Upload +
    +
    + + You can upload a script file from your computer. + +
    +
    +
    + + + {{ $ctrl.model.Job.File.name }} + + +
    +
    +
    + +
    +
    + Target endpoints +
    + + + + +
    + Actions +
    +
    +
    + + + {{ $ctrl.state.formValidationError }} + +
    +
    + +
    diff --git a/app/portainer/components/multi-endpoint-selector/multi-endpoint-selector.js b/app/portainer/components/multi-endpoint-selector/multi-endpoint-selector.js new file mode 100644 index 000000000..ecec019c4 --- /dev/null +++ b/app/portainer/components/multi-endpoint-selector/multi-endpoint-selector.js @@ -0,0 +1,9 @@ +angular.module('portainer.app').component('multiEndpointSelector', { + templateUrl: 'app/portainer/components/multi-endpoint-selector/multiEndpointSelector.html', + controller: 'MultiEndpointSelectorController', + bindings: { + 'model': '=', + 'endpoints': '<', + 'groups': '<' + } +}); diff --git a/app/portainer/components/multi-endpoint-selector/multiEndpointSelector.html b/app/portainer/components/multi-endpoint-selector/multiEndpointSelector.html new file mode 100644 index 000000000..5acf2149d --- /dev/null +++ b/app/portainer/components/multi-endpoint-selector/multiEndpointSelector.html @@ -0,0 +1,14 @@ + + + + {{ $item.Name }} + ({{ $item.Tags | arraytostr }}) + + + + + {{ endpoint.Name }} + ({{ endpoint.Tags | arraytostr }}) + + + diff --git a/app/portainer/components/multi-endpoint-selector/multiEndpointSelectorController.js b/app/portainer/components/multi-endpoint-selector/multiEndpointSelectorController.js new file mode 100644 index 000000000..418682771 --- /dev/null +++ b/app/portainer/components/multi-endpoint-selector/multiEndpointSelectorController.js @@ -0,0 +1,35 @@ +angular.module('portainer.app') +.controller('MultiEndpointSelectorController', function () { + var ctrl = this; + + this.sortGroups = function(groups) { + return _.sortBy(groups, ['name']); + }; + + this.groupEndpoints = function(endpoint) { + for (var i = 0; i < ctrl.availableGroups.length; i++) { + var group = ctrl.availableGroups[i]; + + if (endpoint.GroupId === group.Id) { + return group.Name; + } + } + }; + + this.$onInit = function() { + this.availableGroups = filterEmptyGroups(this.groups, 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/models/schedule.js b/app/portainer/models/schedule.js new file mode 100644 index 000000000..a3bb7cd45 --- /dev/null +++ b/app/portainer/models/schedule.js @@ -0,0 +1,47 @@ +function ScheduleDefaultModel() { + this.Name = ''; + this.CronExpression = ''; + this.JobType = 1; + this.Job = new ScriptExecutionDefaultJobModel(); +} + +function ScriptExecutionDefaultJobModel() { + this.Image = ''; + this.Endpoints = []; + this.FileContent = ''; + this.File = null; + this.Method = 'editor'; +} + +function ScheduleModel(data) { + this.Id = data.Id; + this.Name = data.Name; + this.JobType = data.JobType; + this.CronExpression = data.CronExpression; + this.Created = data.Created; + if (this.JobType === 1) { + this.Job = new ScriptExecutionJobModel(data.ScriptExecutionJob); + } +} + +function ScriptExecutionJobModel(data) { + this.Image = data.Image; + this.Endpoints = data.Endpoints; +} + +function ScheduleCreateRequest(model) { + this.Name = model.Name; + this.CronExpression = model.CronExpression; + this.Image = model.Job.Image; + this.Endpoints = model.Job.Endpoints; + this.FileContent = model.Job.FileContent; + this.File = model.Job.File; +} + +function ScheduleUpdateRequest(model) { + this.id = model.Id; + this.Name = model.Name; + this.CronExpression = model.CronExpression; + this.Image = model.Job.Image; + this.Endpoints = model.Job.Endpoints; +} diff --git a/app/portainer/rest/schedule.js b/app/portainer/rest/schedule.js new file mode 100644 index 000000000..8bd2fa624 --- /dev/null +++ b/app/portainer/rest/schedule.js @@ -0,0 +1,12 @@ +angular.module('portainer.app') +.factory('Schedules', ['$resource', 'API_ENDPOINT_SCHEDULES', +function SchedulesFactory($resource, API_ENDPOINT_SCHEDULES) { + 'use strict'; + return $resource(API_ENDPOINT_SCHEDULES + '/: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/scheduleService.js b/app/portainer/services/api/scheduleService.js new file mode 100644 index 000000000..f7723ef09 --- /dev/null +++ b/app/portainer/services/api/scheduleService.js @@ -0,0 +1,59 @@ +angular.module('portainer.app') +.factory('ScheduleService', ['$q', 'Schedules', 'FileUploadService', +function ScheduleService($q, Schedules, FileUploadService) { + 'use strict'; + var service = {}; + + service.schedule = function(scheduleId) { + var deferred = $q.defer(); + + Schedules.get({ id: scheduleId }).$promise + .then(function success(data) { + var schedule = new ScheduleModel(data); + deferred.resolve(schedule); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve schedule', err: err }); + }); + + return deferred.promise; + }; + + service.schedules = function() { + var deferred = $q.defer(); + + Schedules.query().$promise + .then(function success(data) { + var schedules = data.map(function (item) { + return new ScheduleModel(item); + }); + deferred.resolve(schedules); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve schedules', err: err }); + }); + + return deferred.promise; + }; + + service.createScheduleFromFileContent = function(model) { + var payload = new ScheduleCreateRequest(model); + return Schedules.create({ method: 'string' }, payload).$promise; + }; + + service.createScheduleFromFileUpload = function(model) { + var payload = new ScheduleCreateRequest(model); + return FileUploadService.createSchedule(payload); + }; + + service.updateSchedule = function(model) { + var payload = new ScheduleUpdateRequest(model); + return Schedules.update(payload).$promise; + }; + + service.deleteSchedule = function(scheduleId) { + return Schedules.remove({ id: scheduleId }).$promise; + }; + + return service; +}]); diff --git a/app/portainer/services/fileUpload.js b/app/portainer/services/fileUpload.js index 2d43cc44e..15b9ffbd3 100644 --- a/app/portainer/services/fileUpload.js +++ b/app/portainer/services/fileUpload.js @@ -39,6 +39,19 @@ angular.module('portainer.app') }); }; + service.createSchedule = function(payload) { + return Upload.upload({ + url: 'api/schedules?method=file', + data: { + file: payload.File, + Name: payload.Name, + CronExpression: payload.CronExpression, + Image: payload.Image, + Endpoints: Upload.json(payload.Endpoints) + } + }); + }; + service.createSwarmStack = function(stackName, swarmId, file, env, endpointId) { return Upload.upload({ url: 'api/stacks?method=file&type=1&endpointId=' + endpointId, diff --git a/app/portainer/views/schedules/create/createScheduleController.js b/app/portainer/views/schedules/create/createScheduleController.js new file mode 100644 index 000000000..03211d804 --- /dev/null +++ b/app/portainer/views/schedules/create/createScheduleController.js @@ -0,0 +1,52 @@ +angular.module('portainer.app') +.controller('CreateScheduleController', ['$q', '$scope', '$state', 'Notifications', 'EndpointService', 'GroupService', 'ScheduleService', +function ($q, $scope, $state, Notifications, EndpointService, GroupService, ScheduleService) { + + $scope.state = { + actionInProgress: false + }; + + $scope.create = create; + + function create() { + var model = $scope.model; + + $scope.state.actionInProgress = true; + createSchedule(model) + .then(function success() { + Notifications.success('Schedule successfully created'); + $state.go('portainer.schedules', {}, {reload: true}); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to create schedule'); + }) + .finally(function final() { + $scope.state.actionInProgress = false; + }); + } + + function createSchedule(model) { + if (model.Job.Method === 'editor') { + return ScheduleService.createScheduleFromFileContent(model); + } + return ScheduleService.createScheduleFromFileUpload(model); + } + + function initView() { + $scope.model = new ScheduleDefaultModel(); + + $q.all({ + endpoints: EndpointService.endpoints(), + groups: GroupService.groups() + }) + .then(function success(data) { + $scope.endpoints = data.endpoints; + $scope.groups = data.groups; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve endpoint list'); + }); + } + + initView(); +}]); diff --git a/app/portainer/views/schedules/create/createschedule.html b/app/portainer/views/schedules/create/createschedule.html new file mode 100644 index 000000000..801cc41ca --- /dev/null +++ b/app/portainer/views/schedules/create/createschedule.html @@ -0,0 +1,23 @@ + + + + Schedules > Add schedule + + + +
    +
    + + + + + +
    +
    diff --git a/app/portainer/views/schedules/edit/schedule.html b/app/portainer/views/schedules/edit/schedule.html new file mode 100644 index 000000000..f049459d6 --- /dev/null +++ b/app/portainer/views/schedules/edit/schedule.html @@ -0,0 +1,27 @@ + + + + + + + + Schedules > {{ ::schedule.Name }} + + + +
    +
    + + + + + +
    +
    diff --git a/app/portainer/views/schedules/edit/scheduleController.js b/app/portainer/views/schedules/edit/scheduleController.js new file mode 100644 index 000000000..628f2d5c3 --- /dev/null +++ b/app/portainer/views/schedules/edit/scheduleController.js @@ -0,0 +1,47 @@ +angular.module('portainer.app') +.controller('ScheduleController', ['$q', '$scope', '$transition$', '$state', 'Notifications', 'EndpointService', 'GroupService', 'ScheduleService', +function ($q, $scope, $transition$, $state, Notifications, EndpointService, GroupService, ScheduleService) { + + $scope.state = { + actionInProgress: false + }; + + $scope.update = update; + + function update() { + var model = $scope.schedule; + + $scope.state.actionInProgress = true; + ScheduleService.updateSchedule(model) + .then(function success() { + Notifications.success('Schedule successfully updated'); + $state.go('portainer.schedules', {}, {reload: true}); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to update schedule'); + }) + .finally(function final() { + $scope.state.actionInProgress = false; + }); + } + + function initView() { + var id = $transition$.params().id; + + $q.all({ + schedule: ScheduleService.schedule(id), + endpoints: EndpointService.endpoints(), + groups: GroupService.groups() + }) + .then(function success(data) { + $scope.schedule = data.schedule; + $scope.endpoints = data.endpoints; + $scope.groups = data.groups; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve endpoint list'); + }); + } + + initView(); +}]); diff --git a/app/portainer/views/schedules/schedules.html b/app/portainer/views/schedules/schedules.html new file mode 100644 index 000000000..507640db8 --- /dev/null +++ b/app/portainer/views/schedules/schedules.html @@ -0,0 +1,19 @@ + + + + + + + Schedules + + +
    +
    + +
    +
    diff --git a/app/portainer/views/schedules/schedulesController.js b/app/portainer/views/schedules/schedulesController.js new file mode 100644 index 000000000..2a8632613 --- /dev/null +++ b/app/portainer/views/schedules/schedulesController.js @@ -0,0 +1,50 @@ +angular.module('portainer.app') +.controller('SchedulesController', ['$scope', '$state', 'Notifications', 'ModalService', 'ScheduleService', +function ($scope, $state, Notifications, ModalService, ScheduleService) { + + $scope.removeAction = removeAction; + + function removeAction(selectedItems) { + ModalService.confirmDeletion( + 'Do you want to remove the selected schedule(s) ?', + function onConfirm(confirmed) { + if(!confirmed) { return; } + deleteSelectedSchedules(selectedItems); + } + ); + } + + function deleteSelectedSchedules(schedules) { + var actionCount = schedules.length; + angular.forEach(schedules, function (schedule) { + ScheduleService.deleteSchedule(schedule.Id) + .then(function success() { + Notifications.success('Schedule successfully removed', schedule.Name); + var index = $scope.schedules.indexOf(schedule); + $scope.schedules.splice(index, 1); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to remove schedule ' + schedule.Name); + }) + .finally(function final() { + --actionCount; + if (actionCount === 0) { + $state.reload(); + } + }); + }); + } + + function initView() { + ScheduleService.schedules() + .then(function success(data) { + $scope.schedules = data; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve schedules'); + $scope.schedules = []; + }); + } + + initView(); +}]); diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index af042c575..031cb586f 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -12,6 +12,9 @@
  • Home
    • +
  • + Job scheduler +
  • {{ applicationState.endpoint.name }}
    • From 695c28d4f8664940ad1847c7f3ae39841325d346 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 7 Nov 2018 16:06:27 +1300 Subject: [PATCH 45/93] fix(host): fix a typo in job history clear notification --- .../datatables/host-jobs-datatable/jobsDatatableController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js b/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js index 1a02da763..11be51be5 100644 --- a/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js +++ b/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js @@ -107,7 +107,7 @@ angular.module('portainer.docker') return $q.when(); } ContainerService.prune({ label: ['io.portainer.job.endpoint'] }).then(function success() { - Notifications.success('Success', 'Job hisotry cleared'); + Notifications.success('Success', 'Job history cleared'); $state.reload(); }).catch(function error(err) { Notifications.error('Failure', err.message, 'Unable to clear job history'); From 807c830db06282bf2b92a72b6fbbc73192beefbb Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 7 Nov 2018 17:19:10 +1300 Subject: [PATCH 46/93] feat(schedules): add the ability to update a schedule script (#2438) --- api/filesystem/filesystem.go | 10 +-- api/http/handler/schedules/handler.go | 3 +- api/http/handler/schedules/schedule_create.go | 3 +- api/http/handler/schedules/schedule_delete.go | 3 +- api/http/handler/schedules/schedule_file.go | 41 ++++++++++ api/http/handler/schedules/schedule_update.go | 12 ++- api/portainer.go | 4 +- .../forms/schedule-form/scheduleForm.html | 82 +++++++++---------- app/portainer/models/schedule.js | 3 + app/portainer/rest/schedule.js | 5 +- app/portainer/services/api/scheduleService.js | 4 + .../views/schedules/edit/schedule.html | 1 + .../schedules/edit/scheduleController.js | 9 +- 13 files changed, 124 insertions(+), 56 deletions(-) create mode 100644 api/http/handler/schedules/schedule_file.go diff --git a/api/filesystem/filesystem.go b/api/filesystem/filesystem.go index a0c85727d..acbb12db5 100644 --- a/api/filesystem/filesystem.go +++ b/api/filesystem/filesystem.go @@ -5,7 +5,6 @@ import ( "encoding/json" "encoding/pem" "io/ioutil" - "strconv" "github.com/portainer/portainer" @@ -322,16 +321,15 @@ func (service *Service) getContentFromPEMFile(filePath string) ([]byte, error) { return block.Bytes, nil } -// GetScheduleFolder returns the absolute path on the FS for a schedule based +// GetScheduleFolder returns the absolute path on the filesystem for a schedule based // on its identifier. -func (service *Service) GetScheduleFolder(scheduleIdentifier portainer.ScheduleID) string { - return path.Join(service.fileStorePath, ScheduleStorePath, strconv.Itoa(int(scheduleIdentifier))) +func (service *Service) GetScheduleFolder(identifier string) string { + return path.Join(service.fileStorePath, ScheduleStorePath, identifier) } // StoreScheduledJobFileFromBytes creates a subfolder in the ScheduleStorePath and stores a new file from bytes. // It returns the path to the folder where the file is stored. -func (service *Service) StoreScheduledJobFileFromBytes(scheduleIdentifier portainer.ScheduleID, data []byte) (string, error) { - identifier := strconv.Itoa(int(scheduleIdentifier)) +func (service *Service) StoreScheduledJobFileFromBytes(identifier string, data []byte) (string, error) { scheduleStorePath := path.Join(ScheduleStorePath, identifier) err := service.createDirectoryInStore(scheduleStorePath) if err != nil { diff --git a/api/http/handler/schedules/handler.go b/api/http/handler/schedules/handler.go index 408c8c65c..073c05606 100644 --- a/api/http/handler/schedules/handler.go +++ b/api/http/handler/schedules/handler.go @@ -35,6 +35,7 @@ func NewHandler(bouncer *security.RequestBouncer) *Handler { bouncer.AdministratorAccess(httperror.LoggerHandler(h.scheduleUpdate))).Methods(http.MethodPut) h.Handle("/schedules/{id}", bouncer.AdministratorAccess(httperror.LoggerHandler(h.scheduleDelete))).Methods(http.MethodDelete) - + h.Handle("/schedules/{id}/file", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.scheduleFile))).Methods(http.MethodGet) return h } diff --git a/api/http/handler/schedules/schedule_create.go b/api/http/handler/schedules/schedule_create.go index 4d8fbd740..625d707ca 100644 --- a/api/http/handler/schedules/schedule_create.go +++ b/api/http/handler/schedules/schedule_create.go @@ -3,6 +3,7 @@ package schedules import ( "errors" "net/http" + "strconv" "time" "github.com/asaskevich/govalidator" @@ -138,7 +139,7 @@ func (handler *Handler) createScheduleFromFile(w http.ResponseWriter, r *http.Re func (handler *Handler) createSchedule(name, image, cronExpression string, endpoints []portainer.EndpointID, file []byte) (*portainer.Schedule, error) { scheduleIdentifier := portainer.ScheduleID(handler.ScheduleService.GetNextIdentifier()) - scriptPath, err := handler.FileService.StoreScheduledJobFileFromBytes(scheduleIdentifier, file) + scriptPath, err := handler.FileService.StoreScheduledJobFileFromBytes(strconv.Itoa(int(scheduleIdentifier)), file) if err != nil { return nil, err } diff --git a/api/http/handler/schedules/schedule_delete.go b/api/http/handler/schedules/schedule_delete.go index 502f7d7e4..51c01eec9 100644 --- a/api/http/handler/schedules/schedule_delete.go +++ b/api/http/handler/schedules/schedule_delete.go @@ -3,6 +3,7 @@ package schedules import ( "errors" "net/http" + "strconv" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" @@ -27,7 +28,7 @@ func (handler *Handler) scheduleDelete(w http.ResponseWriter, r *http.Request) * return &httperror.HandlerError{http.StatusBadRequest, "Cannot remove system schedules", errors.New("Cannot remove system schedule")} } - scheduleFolder := handler.FileService.GetScheduleFolder(portainer.ScheduleID(scheduleID)) + scheduleFolder := handler.FileService.GetScheduleFolder(strconv.Itoa(scheduleID)) err = handler.FileService.RemoveDirectory(scheduleFolder) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove the files associated to the schedule on the filesystem", err} diff --git a/api/http/handler/schedules/schedule_file.go b/api/http/handler/schedules/schedule_file.go new file mode 100644 index 000000000..790f4d2e4 --- /dev/null +++ b/api/http/handler/schedules/schedule_file.go @@ -0,0 +1,41 @@ +package schedules + +import ( + "errors" + "net/http" + + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" +) + +type scheduleFileResponse struct { + ScheduleFileContent string `json:"ScheduleFileContent"` +} + +// GET request on /api/schedules/:id/file +func (handler *Handler) scheduleFile(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + scheduleID, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid schedule identifier route variable", err} + } + + schedule, err := handler.ScheduleService.Schedule(portainer.ScheduleID(scheduleID)) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find a schedule with the specified identifier inside the database", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a schedule with the specified identifier inside the database", err} + } + + if schedule.JobType != portainer.ScriptExecutionJobType { + return &httperror.HandlerError{http.StatusBadRequest, "Unable to retrieve script file", errors.New("This type of schedule do not have any associated script file")} + } + + scheduleFileContent, err := handler.FileService.GetFileContent(schedule.ScriptExecutionJob.ScriptPath) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve schedule script file from disk", err} + } + + return response.JSON(w, &scheduleFileResponse{ScheduleFileContent: string(scheduleFileContent)}) +} diff --git a/api/http/handler/schedules/schedule_update.go b/api/http/handler/schedules/schedule_update.go index 209c47da0..e4de5b5f1 100644 --- a/api/http/handler/schedules/schedule_update.go +++ b/api/http/handler/schedules/schedule_update.go @@ -2,6 +2,7 @@ package schedules import ( "net/http" + "strconv" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" @@ -15,6 +16,7 @@ type scheduleUpdatePayload struct { Image *string CronExpression *string Endpoints []portainer.EndpointID + FileContent *string } func (payload *scheduleUpdatePayload) Validate(r *http.Request) error { @@ -41,8 +43,16 @@ func (handler *Handler) scheduleUpdate(w http.ResponseWriter, r *http.Request) * } updateJobSchedule := updateSchedule(schedule, &payload) - if updateJobSchedule { + if payload.FileContent != nil { + _, err := handler.FileService.StoreScheduledJobFileFromBytes(strconv.Itoa(scheduleID), []byte(*payload.FileContent)) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist script file changes on the filesystem", err} + } + updateJobSchedule = true + } + + if updateJobSchedule { jobContext := cron.NewScriptExecutionJobContext(handler.JobService, handler.EndpointService, handler.FileService) jobRunner := cron.NewScriptExecutionJobRunner(schedule.ScriptExecutionJob, jobContext) err := handler.JobScheduler.UpdateSchedule(schedule, jobRunner) diff --git a/api/portainer.go b/api/portainer.go index b337c6d4b..9e3efb8e8 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -654,8 +654,8 @@ type ( LoadKeyPair() ([]byte, []byte, error) WriteJSONToFile(path string, content interface{}) error FileExists(path string) (bool, error) - StoreScheduledJobFileFromBytes(scheduleIdentifier ScheduleID, data []byte) (string, error) - GetScheduleFolder(scheduleIdentifier ScheduleID) string + StoreScheduledJobFileFromBytes(identifier string, data []byte) (string, error) + GetScheduleFolder(identifier string) string } // GitService represents a service for managing Git diff --git a/app/portainer/components/forms/schedule-form/scheduleForm.html b/app/portainer/components/forms/schedule-form/scheduleForm.html index 1f287ece1..02ed2ebbe 100644 --- a/app/portainer/components/forms/schedule-form/scheduleForm.html +++ b/app/portainer/components/forms/schedule-form/scheduleForm.html @@ -55,14 +55,14 @@ +
    + + This schedule will be executed via a privileged container on the target hosts. You can access the host filesystem under the + /host folder. + +
    +
    -
    - - This schedule will be executed via a privileged container on the target hosts. You can access the host filesystem under the - /host folder. - -
    -
    Job content
    @@ -91,46 +91,46 @@
    - - -
    -
    - Web editor -
    -
    -
    - -
    +
    + + +
    +
    + Web editor +
    +
    +
    +
    - - -
    -
    - Upload -
    -
    - - You can upload a script file from your computer. +
    + + +
    +
    + Upload +
    +
    + + You can upload a script file from your computer. + +
    +
    +
    + + + {{ $ctrl.model.Job.File.name }} +
    -
    -
    - - - {{ $ctrl.model.Job.File.name }} - - -
    -
    -
    +
    Target endpoints
    diff --git a/app/portainer/models/schedule.js b/app/portainer/models/schedule.js index a3bb7cd45..7dcdde119 100644 --- a/app/portainer/models/schedule.js +++ b/app/portainer/models/schedule.js @@ -27,6 +27,8 @@ function ScheduleModel(data) { function ScriptExecutionJobModel(data) { this.Image = data.Image; this.Endpoints = data.Endpoints; + this.FileContent = ''; + this.Method = 'editor'; } function ScheduleCreateRequest(model) { @@ -44,4 +46,5 @@ function ScheduleUpdateRequest(model) { this.CronExpression = model.CronExpression; this.Image = model.Job.Image; this.Endpoints = model.Job.Endpoints; + this.FileContent = model.Job.FileContent; } diff --git a/app/portainer/rest/schedule.js b/app/portainer/rest/schedule.js index 8bd2fa624..df57ef68e 100644 --- a/app/portainer/rest/schedule.js +++ b/app/portainer/rest/schedule.js @@ -2,11 +2,12 @@ angular.module('portainer.app') .factory('Schedules', ['$resource', 'API_ENDPOINT_SCHEDULES', function SchedulesFactory($resource, API_ENDPOINT_SCHEDULES) { 'use strict'; - return $resource(API_ENDPOINT_SCHEDULES + '/:id', {}, { + return $resource(API_ENDPOINT_SCHEDULES + '/:id/:action', {}, { 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'} } + remove: { method: 'DELETE', params: { id: '@id'} }, + file: { method: 'GET', params: { id : '@id', action: 'file' } } }); }]); diff --git a/app/portainer/services/api/scheduleService.js b/app/portainer/services/api/scheduleService.js index f7723ef09..e1698b9c1 100644 --- a/app/portainer/services/api/scheduleService.js +++ b/app/portainer/services/api/scheduleService.js @@ -55,5 +55,9 @@ function ScheduleService($q, Schedules, FileUploadService) { return Schedules.remove({ id: scheduleId }).$promise; }; + service.getScriptFile = function(scheduleId) { + return Schedules.file({ id: scheduleId }).$promise; + }; + return service; }]); diff --git a/app/portainer/views/schedules/edit/schedule.html b/app/portainer/views/schedules/edit/schedule.html index f049459d6..654ac8d50 100644 --- a/app/portainer/views/schedules/edit/schedule.html +++ b/app/portainer/views/schedules/edit/schedule.html @@ -14,6 +14,7 @@ Date: Thu, 8 Nov 2018 01:53:19 +0500 Subject: [PATCH 47/93] feat(container-creation): allow escaped quotes in command field (#2419) --- app/docker/helpers/containerHelper.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/docker/helpers/containerHelper.js b/app/docker/helpers/containerHelper.js index 1e5d45ff6..f683bf3ff 100644 --- a/app/docker/helpers/containerHelper.js +++ b/app/docker/helpers/containerHelper.js @@ -4,7 +4,7 @@ angular.module('portainer.docker') var helper = {}; helper.commandStringToArray = function(command) { - return splitargs(command); + return splitargs(command, undefined, true); }; helper.commandArrayToString = function(array) { From 309620545c5bf1c2acb6a07caa53638214ba195b Mon Sep 17 00:00:00 2001 From: Yassir Hannoun Date: Thu, 8 Nov 2018 01:31:33 +0100 Subject: [PATCH 48/93] fix(container-stat): fix cpu/mem charts on Windows containers * Fixing the CPU and Memory charts on Windows containers * Fixing the CPU and Memory charts on Windows containers --- app/docker/models/container.js | 14 +++++++--- .../stats/containerStatsController.js | 19 +++++++++++--- app/portainer/services/chartService.js | 26 ++++++++++++------- 3 files changed, 42 insertions(+), 17 deletions(-) diff --git a/app/docker/models/container.js b/app/docker/models/container.js index ee8837498..a28e978cb 100644 --- a/app/docker/models/container.js +++ b/app/docker/models/container.js @@ -63,9 +63,17 @@ function ContainerViewModel(data) { } function ContainerStatsViewModel(data) { - this.Date = data.read; - this.MemoryUsage = data.memory_stats.usage - data.memory_stats.stats.cache; - this.MemoryCache = data.memory_stats.stats.cache; + this.read = data.read; + this.preread = data.preread; + if(data.memory_stats.privateworkingset !== undefined) { // Windows + this.MemoryUsage = data.memory_stats.privateworkingset; + this.MemoryCache = 0; + this.NumProcs = data.num_procs; + this.isWindows = true; + } else { // Linux + this.MemoryUsage = data.memory_stats.usage - data.memory_stats.stats.cache; + this.MemoryCache = data.memory_stats.stats.cache; + } this.PreviousCPUTotalUsage = data.precpu_stats.cpu_usage.total_usage; this.PreviousCPUSystemUsage = data.precpu_stats.system_cpu_usage; this.CurrentCPUTotalUsage = data.cpu_stats.cpu_usage.total_usage; diff --git a/app/docker/views/containers/stats/containerStatsController.js b/app/docker/views/containers/stats/containerStatsController.js index d14aeaca1..5f62b09d4 100644 --- a/app/docker/views/containers/stats/containerStatsController.js +++ b/app/docker/views/containers/stats/containerStatsController.js @@ -23,21 +23,21 @@ function ($q, $scope, $transition$, $document, $interval, ContainerService, Char if (stats.Networks.length > 0) { var rx = stats.Networks[0].rx_bytes; var tx = stats.Networks[0].tx_bytes; - var label = moment(stats.Date).format('HH:mm:ss'); + var label = moment(stats.read).format('HH:mm:ss'); ChartService.UpdateNetworkChart(label, rx, tx, chart); } } function updateMemoryChart(stats, chart) { - var label = moment(stats.Date).format('HH:mm:ss'); + var label = moment(stats.read).format('HH:mm:ss'); ChartService.UpdateMemoryChart(label, stats.MemoryUsage, stats.MemoryCache, chart); } function updateCPUChart(stats, chart) { - var label = moment(stats.Date).format('HH:mm:ss'); - var value = calculateCPUPercentUnix(stats); + var label = moment(stats.read).format('HH:mm:ss'); + var value = stats.isWindows ? calculateCPUPercentWindows(stats) : calculateCPUPercentUnix(stats); ChartService.UpdateCPUChart(label, value, chart); } @@ -54,6 +54,17 @@ function ($q, $scope, $transition$, $document, $interval, ContainerService, Char return cpuPercent; } + function calculateCPUPercentWindows(stats) { + var possIntervals = stats.NumProcs * parseFloat( + moment(stats.read, 'YYYY-MM-DDTHH:mm:ss.SSSSSSSSSZ').valueOf() - moment(stats.preread, 'YYYY-MM-DDTHH:mm:ss.SSSSSSSSSZ').valueOf()); + var windowsCpuUsage = 0.0; + if(possIntervals > 0) { + windowsCpuUsage = parseFloat(stats.CurrentCPUTotalUsage - stats.PreviousCPUTotalUsage) / parseFloat(possIntervals * 100); + } + return windowsCpuUsage; + } + + $scope.changeUpdateRepeater = function() { var networkChart = $scope.networkChart; var cpuChart = $scope.cpuChart; diff --git a/app/portainer/services/chartService.js b/app/portainer/services/chartService.js index 818ed6e3d..079180ab2 100644 --- a/app/portainer/services/chartService.js +++ b/app/portainer/services/chartService.js @@ -135,6 +135,14 @@ angular.module('portainer.app') }); }; + function LimitChartItems(chart, CHART_LIMIT) { + if (chart.data.datasets[0].data.length > CHART_LIMIT) { + chart.data.labels.pop(); + chart.data.datasets[0].data.pop(); + chart.data.datasets[1].data.pop(); + } + } + function UpdateChart(label, value, chart) { chart.data.labels.push(label); chart.data.datasets[0].data.push(value); @@ -150,13 +158,15 @@ angular.module('portainer.app') service.UpdateMemoryChart = function UpdateChart(label, memoryValue, cacheValue, chart) { chart.data.labels.push(label); chart.data.datasets[0].data.push(memoryValue); - chart.data.datasets[1].data.push(cacheValue); - - if (chart.data.datasets[0].data.length > CHART_LIMIT) { - chart.data.labels.pop(); - chart.data.datasets[0].data.pop(); + + if(cacheValue) { + chart.data.datasets[1].data.push(cacheValue); + } else { // cache values are not available for Windows + chart.data.datasets.splice(1, 1); } + LimitChartItems(chart); + chart.update(0); }; service.UpdateCPUChart = UpdateChart; @@ -166,11 +176,7 @@ angular.module('portainer.app') chart.data.datasets[0].data.push(rx); chart.data.datasets[1].data.push(tx); - if (chart.data.datasets[0].data.length > CHART_LIMIT) { - chart.data.labels.pop(); - chart.data.datasets[0].data.pop(); - chart.data.datasets[1].data.pop(); - } + LimitChartItems(chart); chart.update(0); }; From e7ab057c81897bba78bfd7d7fbfd1d0859a62d68 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 8 Nov 2018 14:09:21 +1300 Subject: [PATCH 49/93] feat(sidebar): add a new Scheduler top entry --- app/portainer/views/sidebar/sidebar.html | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index 031cb586f..031cfe91e 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -12,9 +12,6 @@
  • Home
    • -
  • - Job scheduler -
  • {{ applicationState.endpoint.name }}
    • @@ -39,6 +36,12 @@ Profiles
    +
  • + Scheduler +
    • +
  • + Host jobs +
  • Settings
    • From a2d9f591a7108e205d625d0c55d449279823324f Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Fri, 9 Nov 2018 15:22:08 +1300 Subject: [PATCH 50/93] feat(schedules): add retry policy to script schedules (#2445) --- api/cron/job_script_execution.go | 29 ++++- api/docker/job.go | 5 + api/errors.go | 5 + api/http/handler/schedules/schedule_create.go | 103 +++++++++++++----- api/http/handler/schedules/schedule_update.go | 12 ++ api/portainer.go | 10 +- .../forms/schedule-form/scheduleForm.html | 30 ++++- app/portainer/models/schedule.js | 6 + app/portainer/services/fileUpload.js | 4 +- 9 files changed, 160 insertions(+), 44 deletions(-) diff --git a/api/cron/job_script_execution.go b/api/cron/job_script_execution.go index aafbc4892..b1b53d878 100644 --- a/api/cron/job_script_execution.go +++ b/api/cron/job_script_execution.go @@ -2,6 +2,7 @@ package cron import ( "log" + "time" "github.com/portainer/portainer" ) @@ -46,6 +47,7 @@ func (runner *ScriptExecutionJobRunner) Run() { return } + targets := make([]*portainer.Endpoint, 0) for _, endpointID := range runner.job.Endpoints { endpoint, err := runner.context.endpointService.Endpoint(endpointID) if err != nil { @@ -53,11 +55,32 @@ func (runner *ScriptExecutionJobRunner) Run() { return } - err = runner.context.jobService.Execute(endpoint, "", runner.job.Image, scriptFile) - if err != nil { - log.Printf("scheduled job error (script execution). Unable to execute scrtip (endpoint=%s) (err=%s)\n", endpoint.Name, err) + targets = append(targets, endpoint) + } + + runner.executeAndRetry(targets, scriptFile, 0) +} + +func (runner *ScriptExecutionJobRunner) executeAndRetry(endpoints []*portainer.Endpoint, script []byte, retryCount int) { + retryTargets := make([]*portainer.Endpoint, 0) + + for _, endpoint := range endpoints { + err := runner.context.jobService.Execute(endpoint, "", runner.job.Image, script) + if err == portainer.ErrUnableToPingEndpoint { + retryTargets = append(retryTargets, endpoint) + } else if err != nil { + log.Printf("scheduled job error (script execution). Unable to execute script (endpoint=%s) (err=%s)\n", endpoint.Name, err) } } + + retryCount++ + if retryCount >= runner.job.RetryCount { + return + } + + time.Sleep(time.Duration(runner.job.RetryInterval) * time.Second) + + runner.executeAndRetry(retryTargets, script, retryCount) } // GetScheduleID returns the schedule identifier associated to the runner diff --git a/api/docker/job.go b/api/docker/job.go index eba82e3e5..ed721cd4b 100644 --- a/api/docker/job.go +++ b/api/docker/job.go @@ -41,6 +41,11 @@ func (service *JobService) Execute(endpoint *portainer.Endpoint, nodeName, image } defer cli.Close() + _, err = cli.Ping(context.Background()) + if err != nil { + return portainer.ErrUnableToPingEndpoint + } + err = pullImage(cli, image) if err != nil { return err diff --git a/api/errors.go b/api/errors.go index e348aaf48..da6c4edfe 100644 --- a/api/errors.go +++ b/api/errors.go @@ -88,6 +88,11 @@ const ( ErrUndefinedTLSFileType = Error("Undefined TLS file type") ) +// Docker errors. +const ( + ErrUnableToPingEndpoint = Error("Unable to communicate with the endpoint") +) + // Error represents an application error. type Error string diff --git a/api/http/handler/schedules/schedule_create.go b/api/http/handler/schedules/schedule_create.go index 625d707ca..03db5203e 100644 --- a/api/http/handler/schedules/schedule_create.go +++ b/api/http/handler/schedules/schedule_create.go @@ -14,23 +14,27 @@ import ( "github.com/portainer/portainer/cron" ) -type scheduleFromFilePayload struct { +type scheduleCreateFromFilePayload struct { Name string Image string CronExpression string Endpoints []portainer.EndpointID File []byte + RetryCount int + RetryInterval int } -type scheduleFromFileContentPayload struct { +type scheduleCreateFromFileContentPayload struct { Name string CronExpression string Image string Endpoints []portainer.EndpointID FileContent string + RetryCount int + RetryInterval int } -func (payload *scheduleFromFilePayload) Validate(r *http.Request) error { +func (payload *scheduleCreateFromFilePayload) Validate(r *http.Request) error { name, err := request.RetrieveMultiPartFormValue(r, "Name", false) if err != nil { return errors.New("Invalid name") @@ -62,10 +66,16 @@ func (payload *scheduleFromFilePayload) Validate(r *http.Request) error { } payload.File = file + retryCount, _ := request.RetrieveNumericMultiPartFormValue(r, "RetryCount", true) + payload.RetryCount = retryCount + + retryInterval, _ := request.RetrieveNumericMultiPartFormValue(r, "RetryInterval", true) + payload.RetryInterval = retryInterval + return nil } -func (payload *scheduleFromFileContentPayload) Validate(r *http.Request) error { +func (payload *scheduleCreateFromFileContentPayload) Validate(r *http.Request) error { if govalidator.IsNull(payload.Name) { return portainer.Error("Invalid schedule name") } @@ -86,6 +96,10 @@ func (payload *scheduleFromFileContentPayload) Validate(r *http.Request) error { return portainer.Error("Invalid script file content") } + if payload.RetryCount != 0 && payload.RetryInterval == 0 { + return portainer.Error("RetryInterval must be set") + } + return nil } @@ -107,71 +121,100 @@ func (handler *Handler) scheduleCreate(w http.ResponseWriter, r *http.Request) * } func (handler *Handler) createScheduleFromFileContent(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { - var payload scheduleFromFileContentPayload + var payload scheduleCreateFromFileContentPayload err := request.DecodeAndValidateJSONPayload(r, &payload) if err != nil { return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } - schedule, err := handler.createSchedule(payload.Name, payload.Image, payload.CronExpression, payload.Endpoints, []byte(payload.FileContent)) + schedule := handler.createScheduleObjectFromFileContentPayload(&payload) + + err = handler.addAndPersistSchedule(schedule, []byte(payload.FileContent)) if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Failed executing job", err} + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to schedule script job", err} } return response.JSON(w, schedule) } func (handler *Handler) createScheduleFromFile(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { - payload := &scheduleFromFilePayload{} + payload := &scheduleCreateFromFilePayload{} err := payload.Validate(r) if err != nil { return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } - schedule, err := handler.createSchedule(payload.Name, payload.Image, payload.CronExpression, payload.Endpoints, payload.File) + schedule := handler.createScheduleObjectFromFilePayload(payload) + + err = handler.addAndPersistSchedule(schedule, payload.File) if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Failed executing job", err} + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to schedule script job", err} } return response.JSON(w, schedule) } -func (handler *Handler) createSchedule(name, image, cronExpression string, endpoints []portainer.EndpointID, file []byte) (*portainer.Schedule, error) { +func (handler *Handler) createScheduleObjectFromFilePayload(payload *scheduleCreateFromFilePayload) *portainer.Schedule { scheduleIdentifier := portainer.ScheduleID(handler.ScheduleService.GetNextIdentifier()) - scriptPath, err := handler.FileService.StoreScheduledJobFileFromBytes(strconv.Itoa(int(scheduleIdentifier)), file) - if err != nil { - return nil, err - } - job := &portainer.ScriptExecutionJob{ - Endpoints: endpoints, - Image: image, - ScriptPath: scriptPath, - ScheduleID: scheduleIdentifier, + Endpoints: payload.Endpoints, + Image: payload.Image, + ScheduleID: scheduleIdentifier, + RetryCount: payload.RetryCount, + RetryInterval: payload.RetryInterval, } schedule := &portainer.Schedule{ ID: scheduleIdentifier, - Name: name, - CronExpression: cronExpression, + Name: payload.Name, + CronExpression: payload.CronExpression, JobType: portainer.ScriptExecutionJobType, ScriptExecutionJob: job, Created: time.Now().Unix(), } + return schedule +} + +func (handler *Handler) createScheduleObjectFromFileContentPayload(payload *scheduleCreateFromFileContentPayload) *portainer.Schedule { + scheduleIdentifier := portainer.ScheduleID(handler.ScheduleService.GetNextIdentifier()) + + job := &portainer.ScriptExecutionJob{ + Endpoints: payload.Endpoints, + Image: payload.Image, + ScheduleID: scheduleIdentifier, + RetryCount: payload.RetryCount, + RetryInterval: payload.RetryInterval, + } + + schedule := &portainer.Schedule{ + ID: scheduleIdentifier, + Name: payload.Name, + CronExpression: payload.CronExpression, + JobType: portainer.ScriptExecutionJobType, + ScriptExecutionJob: job, + Created: time.Now().Unix(), + } + + return schedule +} + +func (handler *Handler) addAndPersistSchedule(schedule *portainer.Schedule, file []byte) error { + scriptPath, err := handler.FileService.StoreScheduledJobFileFromBytes(strconv.Itoa(int(schedule.ID)), file) + if err != nil { + return err + } + + schedule.ScriptExecutionJob.ScriptPath = scriptPath + jobContext := cron.NewScriptExecutionJobContext(handler.JobService, handler.EndpointService, handler.FileService) - jobRunner := cron.NewScriptExecutionJobRunner(job, jobContext) + jobRunner := cron.NewScriptExecutionJobRunner(schedule.ScriptExecutionJob, jobContext) err = handler.JobScheduler.CreateSchedule(schedule, jobRunner) if err != nil { - return nil, err + return err } - err = handler.ScheduleService.CreateSchedule(schedule) - if err != nil { - return nil, err - } - - return schedule, nil + return handler.ScheduleService.CreateSchedule(schedule) } diff --git a/api/http/handler/schedules/schedule_update.go b/api/http/handler/schedules/schedule_update.go index e4de5b5f1..2c3b376f4 100644 --- a/api/http/handler/schedules/schedule_update.go +++ b/api/http/handler/schedules/schedule_update.go @@ -17,6 +17,8 @@ type scheduleUpdatePayload struct { CronExpression *string Endpoints []portainer.EndpointID FileContent *string + RetryCount *int + RetryInterval *int } func (payload *scheduleUpdatePayload) Validate(r *http.Request) error { @@ -91,5 +93,15 @@ func updateSchedule(schedule *portainer.Schedule, payload *scheduleUpdatePayload updateJobSchedule = true } + if payload.RetryCount != nil { + schedule.ScriptExecutionJob.RetryCount = *payload.RetryCount + updateJobSchedule = true + } + + if payload.RetryInterval != nil { + schedule.ScriptExecutionJob.RetryInterval = *payload.RetryInterval + updateJobSchedule = true + } + return updateJobSchedule } diff --git a/api/portainer.go b/api/portainer.go index 9e3efb8e8..30ac5983d 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -228,10 +228,12 @@ type ( // ScriptExecutionJob represents a scheduled job that can execute a script via a privileged container ScriptExecutionJob struct { - ScheduleID ScheduleID `json:"ScheduleId"` - Endpoints []EndpointID - Image string - ScriptPath string + ScheduleID ScheduleID `json:"ScheduleId"` + Endpoints []EndpointID + Image string + ScriptPath string + RetryCount int + RetryInterval int } // SnapshotJob represents a scheduled job that can create endpoint snapshots diff --git a/app/portainer/components/forms/schedule-form/scheduleForm.html b/app/portainer/components/forms/schedule-form/scheduleForm.html index 02ed2ebbe..4cdae3d96 100644 --- a/app/portainer/components/forms/schedule-form/scheduleForm.html +++ b/app/portainer/components/forms/schedule-form/scheduleForm.html @@ -42,8 +42,8 @@
    - -
    + +
    @@ -55,12 +55,24 @@
    +
    - - This schedule will be executed via a privileged container on the target hosts. You can access the host filesystem under the - /host folder. - + +
    + +
    + +
    + +
    +
    @@ -98,6 +110,12 @@
    Web editor
    +
    + + This schedule will be executed via a privileged container on the target hosts. You can access the host filesystem under the + /host folder. + +
    Date: Tue, 13 Nov 2018 14:39:26 +1300 Subject: [PATCH 51/93] feat(schedules): add the ability to list tasks from snapshots (#2458) * feat(schedules): add the ability to list tasks from snapshots * feat(schedules): update schedules * refactor(schedules): fix linting issue --- api/cmd/portainer/main.go | 12 +-- api/cron/job_endpoint_sync.go | 26 ++--- api/cron/job_script_execution.go | 36 +++---- api/cron/job_snapshot.go | 34 +++---- api/cron/scheduler.go | 69 +++++++++---- api/docker/job.go | 29 +++--- api/http/handler/endpoints/endpoint_job.go | 4 +- api/http/handler/schedules/handler.go | 2 + api/http/handler/schedules/schedule_create.go | 16 +-- api/http/handler/schedules/schedule_delete.go | 2 + api/http/handler/schedules/schedule_tasks.go | 87 +++++++++++++++++ api/http/handler/schedules/schedule_update.go | 4 +- api/http/handler/settings/settings_update.go | 7 +- api/portainer.go | 22 ++--- .../host-jobs-datatable/jobsDatatable.html | 2 +- .../scheduleTasksDatatable.html | 97 +++++++++++++++++++ .../scheduleTasksDatatable.js | 13 +++ app/portainer/models/schedule.js | 7 ++ app/portainer/rest/schedule.js | 3 +- app/portainer/services/api/scheduleService.js | 17 ++++ .../views/schedules/edit/schedule.html | 56 +++++++++-- .../schedules/edit/scheduleController.js | 44 +++++++-- 22 files changed, 440 insertions(+), 149 deletions(-) create mode 100644 api/http/handler/schedules/schedule_tasks.go create mode 100644 app/portainer/components/datatables/schedule-tasks-datatable/scheduleTasksDatatable.html create mode 100644 app/portainer/components/datatables/schedule-tasks-datatable/scheduleTasksDatatable.js diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index 2fffc2a69..0e0c189ac 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -141,9 +141,9 @@ func loadSnapshotSystemSchedule(jobScheduler portainer.JobScheduler, snapshotter } snapshotJobContext := cron.NewSnapshotJobContext(endpointService, snapshotter) - snapshotJobRunner := cron.NewSnapshotJobRunner(snapshotJob, snapshotJobContext) + snapshotJobRunner := cron.NewSnapshotJobRunner(snapshotSchedule, snapshotJobContext) - err = jobScheduler.CreateSchedule(snapshotSchedule, snapshotJobRunner) + err = jobScheduler.ScheduleJob(snapshotJobRunner) if err != nil { return err } @@ -179,9 +179,9 @@ func loadEndpointSyncSystemSchedule(jobScheduler portainer.JobScheduler, schedul } endpointSyncJobContext := cron.NewEndpointSyncJobContext(endpointService, *flags.ExternalEndpoints) - endpointSyncJobRunner := cron.NewEndpointSyncJobRunner(endpointSyncJob, endpointSyncJobContext) + endpointSyncJobRunner := cron.NewEndpointSyncJobRunner(endointSyncSchedule, endpointSyncJobContext) - err = jobScheduler.CreateSchedule(endointSyncSchedule, endpointSyncJobRunner) + err = jobScheduler.ScheduleJob(endpointSyncJobRunner) if err != nil { return err } @@ -199,9 +199,9 @@ func loadSchedulesFromDatabase(jobScheduler portainer.JobScheduler, jobService p if schedule.JobType == portainer.ScriptExecutionJobType { jobContext := cron.NewScriptExecutionJobContext(jobService, endpointService, fileService) - jobRunner := cron.NewScriptExecutionJobRunner(schedule.ScriptExecutionJob, jobContext) + jobRunner := cron.NewScriptExecutionJobRunner(&schedule, jobContext) - err = jobScheduler.CreateSchedule(&schedule, jobRunner) + err = jobScheduler.ScheduleJob(jobRunner) if err != nil { return err } diff --git a/api/cron/job_endpoint_sync.go b/api/cron/job_endpoint_sync.go index d6ff92173..ef13a4970 100644 --- a/api/cron/job_endpoint_sync.go +++ b/api/cron/job_endpoint_sync.go @@ -11,8 +11,8 @@ import ( // EndpointSyncJobRunner is used to run a EndpointSyncJob type EndpointSyncJobRunner struct { - job *portainer.EndpointSyncJob - context *EndpointSyncJobContext + schedule *portainer.Schedule + context *EndpointSyncJobContext } // EndpointSyncJobContext represents the context of execution of a EndpointSyncJob @@ -30,10 +30,10 @@ func NewEndpointSyncJobContext(endpointService portainer.EndpointService, endpoi } // NewEndpointSyncJobRunner returns a new runner that can be scheduled -func NewEndpointSyncJobRunner(job *portainer.EndpointSyncJob, context *EndpointSyncJobContext) *EndpointSyncJobRunner { +func NewEndpointSyncJobRunner(schedule *portainer.Schedule, context *EndpointSyncJobContext) *EndpointSyncJobRunner { return &EndpointSyncJobRunner{ - job: job, - context: context, + schedule: schedule, + context: context, } } @@ -53,19 +53,9 @@ type fileEndpoint struct { TLSKey string `json:"TLSKey,omitempty"` } -// GetScheduleID returns the schedule identifier associated to the runner -func (runner *EndpointSyncJobRunner) GetScheduleID() portainer.ScheduleID { - return runner.job.ScheduleID -} - -// SetScheduleID sets the schedule identifier associated to the runner -func (runner *EndpointSyncJobRunner) SetScheduleID(ID portainer.ScheduleID) { - runner.job.ScheduleID = ID -} - -// GetJobType returns the job type associated to the runner -func (runner *EndpointSyncJobRunner) GetJobType() portainer.JobType { - return portainer.EndpointSyncJobType +// GetSchedule returns the schedule associated to the runner +func (runner *EndpointSyncJobRunner) GetSchedule() *portainer.Schedule { + return runner.schedule } // Run triggers the execution of the endpoint synchronization process. diff --git a/api/cron/job_script_execution.go b/api/cron/job_script_execution.go index b1b53d878..6f984e8fd 100644 --- a/api/cron/job_script_execution.go +++ b/api/cron/job_script_execution.go @@ -9,8 +9,8 @@ import ( // ScriptExecutionJobRunner is used to run a ScriptExecutionJob type ScriptExecutionJobRunner struct { - job *portainer.ScriptExecutionJob - context *ScriptExecutionJobContext + schedule *portainer.Schedule + context *ScriptExecutionJobContext } // ScriptExecutionJobContext represents the context of execution of a ScriptExecutionJob @@ -30,10 +30,10 @@ func NewScriptExecutionJobContext(jobService portainer.JobService, endpointServi } // NewScriptExecutionJobRunner returns a new runner that can be scheduled -func NewScriptExecutionJobRunner(job *portainer.ScriptExecutionJob, context *ScriptExecutionJobContext) *ScriptExecutionJobRunner { +func NewScriptExecutionJobRunner(schedule *portainer.Schedule, context *ScriptExecutionJobContext) *ScriptExecutionJobRunner { return &ScriptExecutionJobRunner{ - job: job, - context: context, + schedule: schedule, + context: context, } } @@ -41,14 +41,14 @@ func NewScriptExecutionJobRunner(job *portainer.ScriptExecutionJob, context *Scr // It will iterate through all the endpoints specified in the context to // execute the script associated to the job. func (runner *ScriptExecutionJobRunner) Run() { - scriptFile, err := runner.context.fileService.GetFileContent(runner.job.ScriptPath) + scriptFile, err := runner.context.fileService.GetFileContent(runner.schedule.ScriptExecutionJob.ScriptPath) if err != nil { log.Printf("scheduled job error (script execution). Unable to retrieve script file (err=%s)\n", err) return } targets := make([]*portainer.Endpoint, 0) - for _, endpointID := range runner.job.Endpoints { + for _, endpointID := range runner.schedule.ScriptExecutionJob.Endpoints { endpoint, err := runner.context.endpointService.Endpoint(endpointID) if err != nil { log.Printf("scheduled job error (script execution). Unable to retrieve information about endpoint (id=%d) (err=%s)\n", endpointID, err) @@ -65,7 +65,7 @@ func (runner *ScriptExecutionJobRunner) executeAndRetry(endpoints []*portainer.E retryTargets := make([]*portainer.Endpoint, 0) for _, endpoint := range endpoints { - err := runner.context.jobService.Execute(endpoint, "", runner.job.Image, script) + err := runner.context.jobService.ExecuteScript(endpoint, "", runner.schedule.ScriptExecutionJob.Image, script, runner.schedule) if err == portainer.ErrUnableToPingEndpoint { retryTargets = append(retryTargets, endpoint) } else if err != nil { @@ -74,26 +74,16 @@ func (runner *ScriptExecutionJobRunner) executeAndRetry(endpoints []*portainer.E } retryCount++ - if retryCount >= runner.job.RetryCount { + if retryCount >= runner.schedule.ScriptExecutionJob.RetryCount { return } - time.Sleep(time.Duration(runner.job.RetryInterval) * time.Second) + time.Sleep(time.Duration(runner.schedule.ScriptExecutionJob.RetryInterval) * time.Second) runner.executeAndRetry(retryTargets, script, retryCount) } -// GetScheduleID returns the schedule identifier associated to the runner -func (runner *ScriptExecutionJobRunner) GetScheduleID() portainer.ScheduleID { - return runner.job.ScheduleID -} - -// SetScheduleID sets the schedule identifier associated to the runner -func (runner *ScriptExecutionJobRunner) SetScheduleID(ID portainer.ScheduleID) { - runner.job.ScheduleID = ID -} - -// GetJobType returns the job type associated to the runner -func (runner *ScriptExecutionJobRunner) GetJobType() portainer.JobType { - return portainer.ScriptExecutionJobType +// GetSchedule returns the schedule associated to the runner +func (runner *ScriptExecutionJobRunner) GetSchedule() *portainer.Schedule { + return runner.schedule } diff --git a/api/cron/job_snapshot.go b/api/cron/job_snapshot.go index 5918b47aa..153d3c5b7 100644 --- a/api/cron/job_snapshot.go +++ b/api/cron/job_snapshot.go @@ -8,8 +8,8 @@ import ( // SnapshotJobRunner is used to run a SnapshotJob type SnapshotJobRunner struct { - job *portainer.SnapshotJob - context *SnapshotJobContext + schedule *portainer.Schedule + context *SnapshotJobContext } // SnapshotJobContext represents the context of execution of a SnapshotJob @@ -27,35 +27,25 @@ func NewSnapshotJobContext(endpointService portainer.EndpointService, snapshotte } // NewSnapshotJobRunner returns a new runner that can be scheduled -func NewSnapshotJobRunner(job *portainer.SnapshotJob, context *SnapshotJobContext) *SnapshotJobRunner { +func NewSnapshotJobRunner(schedule *portainer.Schedule, context *SnapshotJobContext) *SnapshotJobRunner { return &SnapshotJobRunner{ - job: job, - context: context, + schedule: schedule, + context: context, } } -// GetScheduleID returns the schedule identifier associated to the runner -func (runner *SnapshotJobRunner) GetScheduleID() portainer.ScheduleID { - return runner.job.ScheduleID +// GetSchedule returns the schedule associated to the runner +func (runner *SnapshotJobRunner) GetSchedule() *portainer.Schedule { + return runner.schedule } -// SetScheduleID sets the schedule identifier associated to the runner -func (runner *SnapshotJobRunner) SetScheduleID(ID portainer.ScheduleID) { - runner.job.ScheduleID = ID -} - -// GetJobType returns the job type associated to the runner -func (runner *SnapshotJobRunner) GetJobType() portainer.JobType { - return portainer.EndpointSyncJobType -} - -// Run triggers the execution of the job. +// Run triggers the execution of the schedule. // It will iterate through all the endpoints available in the database to // create a snapshot of each one of them. func (runner *SnapshotJobRunner) Run() { endpoints, err := runner.context.endpointService.Endpoints() if err != nil { - log.Printf("background job error (endpoint snapshot). Unable to retrieve endpoint list (err=%s)\n", err) + log.Printf("background schedule error (endpoint snapshot). Unable to retrieve endpoint list (err=%s)\n", err) return } @@ -67,7 +57,7 @@ func (runner *SnapshotJobRunner) Run() { snapshot, err := runner.context.snapshotter.CreateSnapshot(&endpoint) endpoint.Status = portainer.EndpointStatusUp if err != nil { - log.Printf("background job error (endpoint snapshot). Unable to create snapshot (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + log.Printf("background schedule error (endpoint snapshot). Unable to create snapshot (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) endpoint.Status = portainer.EndpointStatusDown } @@ -77,7 +67,7 @@ func (runner *SnapshotJobRunner) Run() { err = runner.context.endpointService.UpdateEndpoint(endpoint.ID, &endpoint) if err != nil { - log.Printf("background job error (endpoint snapshot). Unable to update endpoint (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + log.Printf("background schedule error (endpoint snapshot). Unable to update endpoint (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) return } } diff --git a/api/cron/scheduler.go b/api/cron/scheduler.go index f329d00bd..2cff329e8 100644 --- a/api/cron/scheduler.go +++ b/api/cron/scheduler.go @@ -17,31 +17,25 @@ func NewJobScheduler() *JobScheduler { } } -// CreateSchedule schedules the execution of a job via a runner -func (scheduler *JobScheduler) CreateSchedule(schedule *portainer.Schedule, runner portainer.JobRunner) error { - runner.SetScheduleID(schedule.ID) - return scheduler.cron.AddJob(schedule.CronExpression, runner) +// ScheduleJob schedules the execution of a job via a runner +func (scheduler *JobScheduler) ScheduleJob(runner portainer.JobRunner) error { + return scheduler.cron.AddJob(runner.GetSchedule().CronExpression, runner) } -// UpdateSchedule updates a specific scheduled job by re-creating a new cron +// UpdateSystemJobSchedule updates the first occurence of the specified +// scheduled job based on the specified job type. +// It does so by re-creating a new cron // and adding all the existing jobs. It will then re-schedule the new job -// via the specified JobRunner parameter. +// with the update cron expression passed in parameter. // NOTE: the cron library do not support updating schedules directly // hence the work-around -func (scheduler *JobScheduler) UpdateSchedule(schedule *portainer.Schedule, runner portainer.JobRunner) error { +func (scheduler *JobScheduler) UpdateSystemJobSchedule(jobType portainer.JobType, newCronExpression string) error { cronEntries := scheduler.cron.Entries() newCron := cron.New() for _, entry := range cronEntries { - - if entry.Job.(portainer.JobRunner).GetScheduleID() == schedule.ID { - - var jobRunner cron.Job = runner - if entry.Job.(portainer.JobRunner).GetJobType() == portainer.SnapshotJobType { - jobRunner = entry.Job - } - - err := newCron.AddJob(schedule.CronExpression, jobRunner) + if entry.Job.(portainer.JobRunner).GetSchedule().JobType == jobType { + err := newCron.AddJob(newCronExpression, entry.Job) if err != nil { return err } @@ -56,17 +50,50 @@ func (scheduler *JobScheduler) UpdateSchedule(schedule *portainer.Schedule, runn return nil } -// RemoveSchedule remove a scheduled job by re-creating a new cron -// and adding all the existing jobs except for the one specified via scheduleID. -// NOTE: the cron library do not support removing schedules directly +// UpdateJobSchedule updates a specific scheduled job by re-creating a new cron +// and adding all the existing jobs. It will then re-schedule the new job +// via the specified JobRunner parameter. +// NOTE: the cron library do not support updating schedules directly // hence the work-around -func (scheduler *JobScheduler) RemoveSchedule(scheduleID portainer.ScheduleID) { +func (scheduler *JobScheduler) UpdateJobSchedule(runner portainer.JobRunner) error { cronEntries := scheduler.cron.Entries() newCron := cron.New() for _, entry := range cronEntries { - if entry.Job.(portainer.JobRunner).GetScheduleID() == scheduleID { + if entry.Job.(portainer.JobRunner).GetSchedule().ID == runner.GetSchedule().ID { + + var jobRunner cron.Job = runner + if entry.Job.(portainer.JobRunner).GetSchedule().JobType == portainer.SnapshotJobType { + jobRunner = entry.Job + } + + err := newCron.AddJob(runner.GetSchedule().CronExpression, jobRunner) + if err != nil { + return err + } + } + + newCron.Schedule(entry.Schedule, entry.Job) + } + + scheduler.cron.Stop() + scheduler.cron = newCron + scheduler.cron.Start() + return nil +} + +// UnscheduleJob remove a scheduled job by re-creating a new cron +// and adding all the existing jobs except for the one specified via scheduleID. +// NOTE: the cron library do not support removing schedules directly +// hence the work-around +func (scheduler *JobScheduler) UnscheduleJob(scheduleID portainer.ScheduleID) { + cronEntries := scheduler.cron.Entries() + newCron := cron.New() + + for _, entry := range cronEntries { + + if entry.Job.(portainer.JobRunner).GetSchedule().ID == scheduleID { continue } diff --git a/api/docker/job.go b/api/docker/job.go index ed721cd4b..ea343e91c 100644 --- a/api/docker/job.go +++ b/api/docker/job.go @@ -18,24 +18,25 @@ import ( // JobService represents a service that handles the execution of jobs type JobService struct { - DockerClientFactory *ClientFactory + dockerClientFactory *ClientFactory } // NewJobService returns a pointer to a new job service func NewJobService(dockerClientFactory *ClientFactory) *JobService { return &JobService{ - DockerClientFactory: dockerClientFactory, + dockerClientFactory: dockerClientFactory, } } -// Execute will execute a script on the endpoint host with the supplied image as a container -func (service *JobService) Execute(endpoint *portainer.Endpoint, nodeName, image string, script []byte) error { +// ExecuteScript will leverage a privileged container to execute a script against the specified endpoint/nodename. +// It will copy the script content specified as a parameter inside a container based on the specified image and execute it. +func (service *JobService) ExecuteScript(endpoint *portainer.Endpoint, nodeName, image string, script []byte, schedule *portainer.Schedule) error { buffer, err := archive.TarFileInBuffer(script, "script.sh", 0700) if err != nil { return err } - cli, err := service.DockerClientFactory.CreateClient(endpoint, nodeName) + cli, err := service.dockerClientFactory.CreateClient(endpoint, nodeName) if err != nil { return err } @@ -64,6 +65,10 @@ func (service *JobService) Execute(endpoint *portainer.Endpoint, nodeName, image Cmd: strslice.StrSlice([]string{"sh", "/tmp/script.sh"}), } + if schedule != nil { + containerConfig.Labels["io.portainer.schedule.id"] = strconv.Itoa(int(schedule.ID)) + } + hostConfig := &container.HostConfig{ Binds: []string{"/:/host", "/etc:/etc:ro", "/usr:/usr:ro", "/run:/run:ro", "/sbin:/sbin:ro", "/var:/var:ro"}, NetworkMode: "host", @@ -77,6 +82,13 @@ func (service *JobService) Execute(endpoint *portainer.Endpoint, nodeName, image return err } + if schedule != nil { + err = cli.ContainerRename(context.Background(), body.ID, endpoint.Name+"_"+schedule.Name+"_"+body.ID) + if err != nil { + return err + } + } + copyOptions := types.CopyToContainerOptions{} err = cli.CopyToContainer(context.Background(), body.ID, "/tmp", bytes.NewReader(buffer), copyOptions) if err != nil { @@ -84,12 +96,7 @@ func (service *JobService) Execute(endpoint *portainer.Endpoint, nodeName, image } startOptions := types.ContainerStartOptions{} - err = cli.ContainerStart(context.Background(), body.ID, startOptions) - if err != nil { - return err - } - - return nil + return cli.ContainerStart(context.Background(), body.ID, startOptions) } func pullImage(cli *client.Client, image string) error { diff --git a/api/http/handler/endpoints/endpoint_job.go b/api/http/handler/endpoints/endpoint_job.go index 025f6ab3a..565418f42 100644 --- a/api/http/handler/endpoints/endpoint_job.go +++ b/api/http/handler/endpoints/endpoint_job.go @@ -92,7 +92,7 @@ func (handler *Handler) executeJobFromFile(w http.ResponseWriter, r *http.Reques return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } - err = handler.JobService.Execute(endpoint, nodeName, payload.Image, payload.File) + err = handler.JobService.ExecuteScript(endpoint, nodeName, payload.Image, payload.File, nil) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Failed executing job", err} } @@ -107,7 +107,7 @@ func (handler *Handler) executeJobFromFileContent(w http.ResponseWriter, r *http return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} } - err = handler.JobService.Execute(endpoint, nodeName, payload.Image, []byte(payload.FileContent)) + err = handler.JobService.ExecuteScript(endpoint, nodeName, payload.Image, []byte(payload.FileContent), nil) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Failed executing job", err} } diff --git a/api/http/handler/schedules/handler.go b/api/http/handler/schedules/handler.go index 073c05606..4c5b64bbd 100644 --- a/api/http/handler/schedules/handler.go +++ b/api/http/handler/schedules/handler.go @@ -37,5 +37,7 @@ func NewHandler(bouncer *security.RequestBouncer) *Handler { bouncer.AdministratorAccess(httperror.LoggerHandler(h.scheduleDelete))).Methods(http.MethodDelete) h.Handle("/schedules/{id}/file", bouncer.AdministratorAccess(httperror.LoggerHandler(h.scheduleFile))).Methods(http.MethodGet) + h.Handle("/schedules/{id}/tasks", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.scheduleTasks))).Methods(http.MethodGet) return h } diff --git a/api/http/handler/schedules/schedule_create.go b/api/http/handler/schedules/schedule_create.go index 03db5203e..d09f94860 100644 --- a/api/http/handler/schedules/schedule_create.go +++ b/api/http/handler/schedules/schedule_create.go @@ -158,9 +158,9 @@ func (handler *Handler) createScheduleObjectFromFilePayload(payload *scheduleCre scheduleIdentifier := portainer.ScheduleID(handler.ScheduleService.GetNextIdentifier()) job := &portainer.ScriptExecutionJob{ - Endpoints: payload.Endpoints, - Image: payload.Image, - ScheduleID: scheduleIdentifier, + Endpoints: payload.Endpoints, + Image: payload.Image, + // ScheduleID: scheduleIdentifier, RetryCount: payload.RetryCount, RetryInterval: payload.RetryInterval, } @@ -181,9 +181,9 @@ func (handler *Handler) createScheduleObjectFromFileContentPayload(payload *sche scheduleIdentifier := portainer.ScheduleID(handler.ScheduleService.GetNextIdentifier()) job := &portainer.ScriptExecutionJob{ - Endpoints: payload.Endpoints, - Image: payload.Image, - ScheduleID: scheduleIdentifier, + Endpoints: payload.Endpoints, + Image: payload.Image, + // ScheduleID: scheduleIdentifier, RetryCount: payload.RetryCount, RetryInterval: payload.RetryInterval, } @@ -209,9 +209,9 @@ func (handler *Handler) addAndPersistSchedule(schedule *portainer.Schedule, file schedule.ScriptExecutionJob.ScriptPath = scriptPath jobContext := cron.NewScriptExecutionJobContext(handler.JobService, handler.EndpointService, handler.FileService) - jobRunner := cron.NewScriptExecutionJobRunner(schedule.ScriptExecutionJob, jobContext) + jobRunner := cron.NewScriptExecutionJobRunner(schedule, jobContext) - err = handler.JobScheduler.CreateSchedule(schedule, jobRunner) + err = handler.JobScheduler.ScheduleJob(jobRunner) if err != nil { return err } diff --git a/api/http/handler/schedules/schedule_delete.go b/api/http/handler/schedules/schedule_delete.go index 51c01eec9..7597fb6c0 100644 --- a/api/http/handler/schedules/schedule_delete.go +++ b/api/http/handler/schedules/schedule_delete.go @@ -34,6 +34,8 @@ func (handler *Handler) scheduleDelete(w http.ResponseWriter, r *http.Request) * return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove the files associated to the schedule on the filesystem", err} } + handler.JobScheduler.UnscheduleJob(schedule.ID) + err = handler.ScheduleService.DeleteSchedule(portainer.ScheduleID(scheduleID)) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to remove the schedule from the database", err} diff --git a/api/http/handler/schedules/schedule_tasks.go b/api/http/handler/schedules/schedule_tasks.go new file mode 100644 index 000000000..da88fdac7 --- /dev/null +++ b/api/http/handler/schedules/schedule_tasks.go @@ -0,0 +1,87 @@ +package schedules + +import ( + "encoding/json" + "errors" + "net/http" + "strconv" + + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" +) + +type taskContainer struct { + ID string `json:"Id"` + EndpointID portainer.EndpointID `json:"EndpointId"` + Status string `json:"Status"` + Created float64 `json:"Created"` + Labels map[string]string `json:"Labels"` +} + +// GET request on /api/schedules/:id/tasks +func (handler *Handler) scheduleTasks(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + scheduleID, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid schedule identifier route variable", err} + } + + schedule, err := handler.ScheduleService.Schedule(portainer.ScheduleID(scheduleID)) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find a schedule with the specified identifier inside the database", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a schedule with the specified identifier inside the database", err} + } + + if schedule.JobType != portainer.ScriptExecutionJobType { + return &httperror.HandlerError{http.StatusBadRequest, "Unable to retrieve schedule tasks", errors.New("This type of schedule do not have any associated tasks")} + } + + tasks := make([]taskContainer, 0) + + for _, endpointID := range schedule.ScriptExecutionJob.Endpoints { + endpoint, err := handler.EndpointService.Endpoint(endpointID) + if err == portainer.ErrObjectNotFound { + continue + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find an endpoint with the specified identifier inside the database", err} + } + + endpointTasks, err := extractTasksFromContainerSnasphot(endpoint, schedule.ID) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find extract schedule tasks from endpoint snapshot", err} + } + + tasks = append(tasks, endpointTasks...) + } + + return response.JSON(w, tasks) +} + +func extractTasksFromContainerSnasphot(endpoint *portainer.Endpoint, scheduleID portainer.ScheduleID) ([]taskContainer, error) { + endpointTasks := make([]taskContainer, 0) + if len(endpoint.Snapshots) == 0 { + return endpointTasks, nil + } + + b, err := json.Marshal(endpoint.Snapshots[0].SnapshotRaw.Containers) + if err != nil { + return nil, err + } + + var containers []taskContainer + err = json.Unmarshal(b, &containers) + if err != nil { + return nil, err + } + + for _, container := range containers { + if container.Labels["io.portainer.schedule.id"] == strconv.Itoa(int(scheduleID)) { + container.EndpointID = endpoint.ID + endpointTasks = append(endpointTasks, container) + } + } + + return endpointTasks, nil +} diff --git a/api/http/handler/schedules/schedule_update.go b/api/http/handler/schedules/schedule_update.go index 2c3b376f4..12284181c 100644 --- a/api/http/handler/schedules/schedule_update.go +++ b/api/http/handler/schedules/schedule_update.go @@ -56,8 +56,8 @@ func (handler *Handler) scheduleUpdate(w http.ResponseWriter, r *http.Request) * if updateJobSchedule { jobContext := cron.NewScriptExecutionJobContext(handler.JobService, handler.EndpointService, handler.FileService) - jobRunner := cron.NewScriptExecutionJobRunner(schedule.ScriptExecutionJob, jobContext) - err := handler.JobScheduler.UpdateSchedule(schedule, jobRunner) + jobRunner := cron.NewScriptExecutionJobRunner(schedule, jobContext) + err := handler.JobScheduler.UpdateJobSchedule(jobRunner) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to update job scheduler", err} } diff --git a/api/http/handler/settings/settings_update.go b/api/http/handler/settings/settings_update.go index 472a34ada..bef9cee9e 100644 --- a/api/http/handler/settings/settings_update.go +++ b/api/http/handler/settings/settings_update.go @@ -108,7 +108,12 @@ func (handler *Handler) updateSnapshotInterval(settings *portainer.Settings, sna snapshotSchedule := schedules[0] snapshotSchedule.CronExpression = "@every " + snapshotInterval - err := handler.JobScheduler.UpdateSchedule(&snapshotSchedule, nil) + err := handler.JobScheduler.UpdateSystemJobSchedule(portainer.SnapshotJobType, snapshotSchedule.CronExpression) + if err != nil { + return err + } + + err = handler.ScheduleService.UpdateSchedule(snapshotSchedule.ID, &snapshotSchedule) if err != nil { return err } diff --git a/api/portainer.go b/api/portainer.go index 30ac5983d..6682017b7 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -228,7 +228,6 @@ type ( // ScriptExecutionJob represents a scheduled job that can execute a script via a privileged container ScriptExecutionJob struct { - ScheduleID ScheduleID `json:"ScheduleId"` Endpoints []EndpointID Image string ScriptPath string @@ -237,14 +236,10 @@ type ( } // SnapshotJob represents a scheduled job that can create endpoint snapshots - SnapshotJob struct { - ScheduleID ScheduleID `json:"ScheduleId"` - } + SnapshotJob struct{} // EndpointSyncJob represents a scheduled job that synchronize endpoints based on an external file - EndpointSyncJob struct { - ScheduleID ScheduleID `json:"ScheduleId"` - } + EndpointSyncJob struct{} // Schedule represents a scheduled job. // It only contains a pointer to one of the JobRunner implementations @@ -668,18 +663,17 @@ type ( // JobScheduler represents a service to run jobs on a periodic basis JobScheduler interface { - CreateSchedule(schedule *Schedule, runner JobRunner) error - UpdateSchedule(schedule *Schedule, runner JobRunner) error - RemoveSchedule(ID ScheduleID) + ScheduleJob(runner JobRunner) error + UpdateJobSchedule(runner JobRunner) error + UpdateSystemJobSchedule(jobType JobType, newCronExpression string) error + UnscheduleJob(ID ScheduleID) Start() } // JobRunner represents a service that can be used to run a job JobRunner interface { Run() - GetScheduleID() ScheduleID - SetScheduleID(ID ScheduleID) - GetJobType() JobType + GetSchedule() *Schedule } // Snapshotter represents a service used to create endpoint snapshots @@ -710,7 +704,7 @@ type ( // JobService represents a service to manage job execution on hosts JobService interface { - Execute(endpoint *Endpoint, nodeName, image string, script []byte) error + ExecuteScript(endpoint *Endpoint, nodeName, image string, script []byte, schedule *Schedule) error } ) diff --git a/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html index 38f58e6a9..e3fe91b87 100644 --- a/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html +++ b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html @@ -71,7 +71,7 @@ - {{ item.Id | truncate: 32}} + {{ item | containername }} +
    +
    + + +
    +
    + + {{ $ctrl.titleText }} +
    +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + Endpoint + + + + Id + + + + + + State + + + + + + + + Created + +
    + {{ item.Endpoint.Name }} + + {{ item.Id | truncate: 32 }} + + {{ item.Status }} + + {{ item.Created | getisodatefromtimestamp}} +
    Loading...
    No tasks available.
    +
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    +
    +
    diff --git a/app/portainer/components/datatables/schedule-tasks-datatable/scheduleTasksDatatable.js b/app/portainer/components/datatables/schedule-tasks-datatable/scheduleTasksDatatable.js new file mode 100644 index 000000000..cdd7344c6 --- /dev/null +++ b/app/portainer/components/datatables/schedule-tasks-datatable/scheduleTasksDatatable.js @@ -0,0 +1,13 @@ +angular.module('portainer.docker').component('scheduleTasksDatatable', { + templateUrl: 'app/portainer/components/datatables/schedule-tasks-datatable/scheduleTasksDatatable.html', + controller: 'GenericDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + goToContainerLogs: '<' + } +}); diff --git a/app/portainer/models/schedule.js b/app/portainer/models/schedule.js index f48fd42bc..874ebc8d5 100644 --- a/app/portainer/models/schedule.js +++ b/app/portainer/models/schedule.js @@ -33,6 +33,13 @@ function ScriptExecutionJobModel(data) { this.RetryInterval = data.RetryInterval; } +function ScriptExecutionTaskModel(data) { + this.Id = data.Id; + this.EndpointId = data.EndpointId; + this.Status = createStatus(data.Status); + this.Created = data.Created; +} + function ScheduleCreateRequest(model) { this.Name = model.Name; this.CronExpression = model.CronExpression; diff --git a/app/portainer/rest/schedule.js b/app/portainer/rest/schedule.js index df57ef68e..eae5a218f 100644 --- a/app/portainer/rest/schedule.js +++ b/app/portainer/rest/schedule.js @@ -8,6 +8,7 @@ function SchedulesFactory($resource, API_ENDPOINT_SCHEDULES) { get: { method: 'GET', params: { id: '@id' } }, update: { method: 'PUT', params: { id: '@id' } }, remove: { method: 'DELETE', params: { id: '@id'} }, - file: { method: 'GET', params: { id : '@id', action: 'file' } } + file: { method: 'GET', params: { id : '@id', action: 'file' } }, + tasks: { method: 'GET', isArray: true, params: { id : '@id', action: 'tasks' } } }); }]); diff --git a/app/portainer/services/api/scheduleService.js b/app/portainer/services/api/scheduleService.js index e1698b9c1..3f5d81de2 100644 --- a/app/portainer/services/api/scheduleService.js +++ b/app/portainer/services/api/scheduleService.js @@ -36,6 +36,23 @@ function ScheduleService($q, Schedules, FileUploadService) { return deferred.promise; }; + service.scriptExecutionTasks = function(scheduleId) { + var deferred = $q.defer(); + + Schedules.tasks({ id: scheduleId }).$promise + .then(function success(data) { + var tasks = data.map(function (item) { + return new ScriptExecutionTaskModel(item); + }); + deferred.resolve(tasks); + }) + .catch(function error(err) { + deferred.reject({ msg: 'Unable to retrieve tasks associated to the schedule', err: err }); + }); + + return deferred.promise; + }; + service.createScheduleFromFileContent = function(model) { var payload = new ScheduleCreateRequest(model); return Schedules.create({ method: 'string' }, payload).$promise; diff --git a/app/portainer/views/schedules/edit/schedule.html b/app/portainer/views/schedules/edit/schedule.html index 654ac8d50..fb7aa5625 100644 --- a/app/portainer/views/schedules/edit/schedule.html +++ b/app/portainer/views/schedules/edit/schedule.html @@ -13,15 +13,53 @@
    - + + + + + Configuration + + + + + + + + + Tasks + + +
    + Information +
    +
    + + Tasks are retrieved across all endpoints via snapshots. Data available in this view might not be up-to-date. + +
    + +
    + Tasks +
    + +     + +
    diff --git a/app/portainer/views/schedules/edit/scheduleController.js b/app/portainer/views/schedules/edit/scheduleController.js index ce05d528d..06313f3ab 100644 --- a/app/portainer/views/schedules/edit/scheduleController.js +++ b/app/portainer/views/schedules/edit/scheduleController.js @@ -1,12 +1,13 @@ angular.module('portainer.app') -.controller('ScheduleController', ['$q', '$scope', '$transition$', '$state', 'Notifications', 'EndpointService', 'GroupService', 'ScheduleService', -function ($q, $scope, $transition$, $state, Notifications, EndpointService, GroupService, ScheduleService) { +.controller('ScheduleController', ['$q', '$scope', '$transition$', '$state', 'Notifications', 'EndpointService', 'GroupService', 'ScheduleService', 'EndpointProvider', +function ($q, $scope, $transition$, $state, Notifications, EndpointService, GroupService, ScheduleService, EndpointProvider) { $scope.state = { actionInProgress: false }; $scope.update = update; + $scope.goToContainerLogs = goToContainerLogs; function update() { var model = $scope.schedule; @@ -25,25 +26,48 @@ function ($q, $scope, $transition$, $state, Notifications, EndpointService, Grou }); } + function goToContainerLogs(endpointId, containerId) { + EndpointProvider.setEndpointID(endpointId); + $state.go('docker.containers.container.logs', { id: containerId }); + } + + function associateEndpointsToTasks(tasks, endpoints) { + for (var i = 0; i < tasks.length; i++) { + var task = tasks[i]; + + for (var j = 0; j < endpoints.length; j++) { + var endpoint = endpoints[j]; + + if (task.EndpointId === endpoint.Id) { + task.Endpoint = endpoint; + break; + } + } + } + } + function initView() { var id = $transition$.params().id; - var schedule = null; $q.all({ schedule: ScheduleService.schedule(id), + file: ScheduleService.getScriptFile(id), + tasks: ScheduleService.scriptExecutionTasks(id), endpoints: EndpointService.endpoints(), groups: GroupService.groups() }) .then(function success(data) { - schedule = data.schedule; + var schedule = data.schedule; + schedule.Job.FileContent = data.file.ScheduleFileContent; + + var endpoints = data.endpoints; + var tasks = data.tasks; + associateEndpointsToTasks(tasks, endpoints); + + $scope.schedule = schedule; + $scope.tasks = data.tasks; $scope.endpoints = data.endpoints; $scope.groups = data.groups; - - return ScheduleService.getScriptFile(schedule.Id); - }) - .then(function success(data) { - schedule.Job.FileContent = data.ScheduleFileContent; - $scope.schedule = schedule; }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to retrieve endpoint list'); From 381ab81fddc79caa12b50409fe670c4f2db3d7a0 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 13 Nov 2018 15:18:38 +1300 Subject: [PATCH 52/93] fix(endpoints): ensure endpoint is up to date after snapshot (#2460) * feat(snapshots): fix a potential concurrency issue with endpoint snapshots * fix(endpoints): ensure endpoint is up to date after snapshot --- api/cron/job_snapshot.go | 23 ++++++++++++------ .../handler/endpoints/endpoint_snapshot.go | 24 +++++++++++++------ 2 files changed, 33 insertions(+), 14 deletions(-) diff --git a/api/cron/job_snapshot.go b/api/cron/job_snapshot.go index 153d3c5b7..aaeff3212 100644 --- a/api/cron/job_snapshot.go +++ b/api/cron/job_snapshot.go @@ -42,6 +42,8 @@ func (runner *SnapshotJobRunner) GetSchedule() *portainer.Schedule { // Run triggers the execution of the schedule. // It will iterate through all the endpoints available in the database to // create a snapshot of each one of them. +// As a snapshot can be a long process, to avoid any concurrency issue we +// retrieve the latest version of the endpoint right after a snapshot. func (runner *SnapshotJobRunner) Run() { endpoints, err := runner.context.endpointService.Endpoints() if err != nil { @@ -54,18 +56,25 @@ func (runner *SnapshotJobRunner) Run() { continue } - snapshot, err := runner.context.snapshotter.CreateSnapshot(&endpoint) - endpoint.Status = portainer.EndpointStatusUp - if err != nil { - log.Printf("background schedule error (endpoint snapshot). Unable to create snapshot (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) - endpoint.Status = portainer.EndpointStatusDown + snapshot, snapshotError := runner.context.snapshotter.CreateSnapshot(&endpoint) + + latestEndpointReference, err := runner.context.endpointService.Endpoint(endpoint.ID) + if latestEndpointReference == nil { + log.Printf("background schedule error (endpoint snapshot). Endpoint not found inside the database anymore (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + continue + } + + latestEndpointReference.Status = portainer.EndpointStatusUp + if snapshotError != nil { + log.Printf("background schedule error (endpoint snapshot). Unable to create snapshot (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, snapshotError) + latestEndpointReference.Status = portainer.EndpointStatusDown } if snapshot != nil { - endpoint.Snapshots = []portainer.Snapshot{*snapshot} + latestEndpointReference.Snapshots = []portainer.Snapshot{*snapshot} } - err = runner.context.endpointService.UpdateEndpoint(endpoint.ID, &endpoint) + err = runner.context.endpointService.UpdateEndpoint(latestEndpointReference.ID, latestEndpointReference) if err != nil { log.Printf("background schedule error (endpoint snapshot). Unable to update endpoint (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) return diff --git a/api/http/handler/endpoints/endpoint_snapshot.go b/api/http/handler/endpoints/endpoint_snapshot.go index 720f4c072..53e4c3339 100644 --- a/api/http/handler/endpoints/endpoint_snapshot.go +++ b/api/http/handler/endpoints/endpoint_snapshot.go @@ -3,6 +3,7 @@ package endpoints import ( "log" "net/http" + "time" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/response" @@ -21,18 +22,27 @@ func (handler *Handler) endpointSnapshot(w http.ResponseWriter, r *http.Request) 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 + time.Sleep(10 * time.Second) + + snapshot, snapshotError := handler.Snapshotter.CreateSnapshot(&endpoint) + + latestEndpointReference, err := handler.EndpointService.Endpoint(endpoint.ID) + if latestEndpointReference == nil { + log.Printf("background schedule error (endpoint snapshot). Endpoint not found inside the database anymore (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + continue + } + + latestEndpointReference.Status = portainer.EndpointStatusUp + if snapshotError != nil { + log.Printf("background schedule error (endpoint snapshot). Unable to create snapshot (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, snapshotError) + latestEndpointReference.Status = portainer.EndpointStatusDown } if snapshot != nil { - endpoint.Snapshots = []portainer.Snapshot{*snapshot} + latestEndpointReference.Snapshots = []portainer.Snapshot{*snapshot} } - err = handler.EndpointService.UpdateEndpoint(endpoint.ID, &endpoint) + err = handler.EndpointService.UpdateEndpoint(latestEndpointReference.ID, latestEndpointReference) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist endpoint changes inside the database", err} } From cf370f6a4c6481313ec02477977770669294e4d5 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 13 Nov 2018 15:19:29 +1300 Subject: [PATCH 53/93] refactor(endpoints): remove time.Sleep call --- api/http/handler/endpoints/endpoint_snapshot.go | 3 --- 1 file changed, 3 deletions(-) diff --git a/api/http/handler/endpoints/endpoint_snapshot.go b/api/http/handler/endpoints/endpoint_snapshot.go index 53e4c3339..0a457a383 100644 --- a/api/http/handler/endpoints/endpoint_snapshot.go +++ b/api/http/handler/endpoints/endpoint_snapshot.go @@ -3,7 +3,6 @@ package endpoints import ( "log" "net/http" - "time" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/response" @@ -22,8 +21,6 @@ func (handler *Handler) endpointSnapshot(w http.ResponseWriter, r *http.Request) continue } - time.Sleep(10 * time.Second) - snapshot, snapshotError := handler.Snapshotter.CreateSnapshot(&endpoint) latestEndpointReference, err := handler.EndpointService.Endpoint(endpoint.ID) From 0825d0554675480c651670f402c8489809e23aaf Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 13 Nov 2018 16:02:49 +1300 Subject: [PATCH 54/93] feat(endpoints): improve offline banner UX (#2462) * feat(endpoints): add the last snapshot timestamp in offline banner * feat(endpoints): add the ability to refresh a snapshot in the offline banner --- .../handler/endpoints/endpoint_snapshot.go | 55 ++++++++++--------- .../handler/endpoints/endpoint_snapshots.go | 49 +++++++++++++++++ api/http/handler/endpoints/handler.go | 4 +- .../informationPanelOffline.html | 9 ++- .../informationPanelOffline.js | 2 +- .../informationPanelOfflineController.js | 34 ++++++++++++ app/portainer/rest/endpoint.js | 3 +- app/portainer/services/api/endpointService.js | 8 ++- app/portainer/views/home/homeController.js | 2 +- 9 files changed, 133 insertions(+), 33 deletions(-) create mode 100644 api/http/handler/endpoints/endpoint_snapshots.go create mode 100644 app/portainer/components/information-panel-offline/informationPanelOfflineController.js diff --git a/api/http/handler/endpoints/endpoint_snapshot.go b/api/http/handler/endpoints/endpoint_snapshot.go index 0a457a383..559cf127c 100644 --- a/api/http/handler/endpoints/endpoint_snapshot.go +++ b/api/http/handler/endpoints/endpoint_snapshot.go @@ -1,48 +1,51 @@ package endpoints import ( - "log" "net/http" httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" "github.com/portainer/libhttp/response" "github.com/portainer/portainer" ) -// POST request on /api/endpoints/snapshot +// POST request on /api/endpoints/:id/snapshot func (handler *Handler) endpointSnapshot(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { - endpoints, err := handler.EndpointService.Endpoints() + endpointID, err := request.RetrieveNumericRouteVariableValue(r, "id") if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve endpoints from the database", err} + return &httperror.HandlerError{http.StatusBadRequest, "Invalid endpoint identifier route variable", err} } - for _, endpoint := range endpoints { - if endpoint.Type == portainer.AzureEnvironment { - continue - } + endpoint, err := handler.EndpointService.Endpoint(portainer.EndpointID(endpointID)) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find an endpoint with the specified identifier inside the database", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find an endpoint with the specified identifier inside the database", err} + } - snapshot, snapshotError := handler.Snapshotter.CreateSnapshot(&endpoint) + if endpoint.Type == portainer.AzureEnvironment { + return &httperror.HandlerError{http.StatusBadRequest, "Snapshots not supported for Azure endpoints", err} + } - latestEndpointReference, err := handler.EndpointService.Endpoint(endpoint.ID) - if latestEndpointReference == nil { - log.Printf("background schedule error (endpoint snapshot). Endpoint not found inside the database anymore (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) - continue - } + snapshot, snapshotError := handler.Snapshotter.CreateSnapshot(endpoint) - latestEndpointReference.Status = portainer.EndpointStatusUp - if snapshotError != nil { - log.Printf("background schedule error (endpoint snapshot). Unable to create snapshot (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, snapshotError) - latestEndpointReference.Status = portainer.EndpointStatusDown - } + latestEndpointReference, err := handler.EndpointService.Endpoint(endpoint.ID) + if latestEndpointReference == nil { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find an endpoint with the specified identifier inside the database", err} + } - if snapshot != nil { - latestEndpointReference.Snapshots = []portainer.Snapshot{*snapshot} - } + latestEndpointReference.Status = portainer.EndpointStatusUp + if snapshotError != nil { + latestEndpointReference.Status = portainer.EndpointStatusDown + } - err = handler.EndpointService.UpdateEndpoint(latestEndpointReference.ID, latestEndpointReference) - if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist endpoint changes inside the database", err} - } + if snapshot != nil { + latestEndpointReference.Snapshots = []portainer.Snapshot{*snapshot} + } + + err = handler.EndpointService.UpdateEndpoint(latestEndpointReference.ID, latestEndpointReference) + 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/endpoint_snapshots.go b/api/http/handler/endpoints/endpoint_snapshots.go new file mode 100644 index 000000000..f59b7a40d --- /dev/null +++ b/api/http/handler/endpoints/endpoint_snapshots.go @@ -0,0 +1,49 @@ +package endpoints + +import ( + "log" + "net/http" + + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" +) + +// POST request on /api/endpoints/snapshot +func (handler *Handler) endpointSnapshots(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, snapshotError := handler.Snapshotter.CreateSnapshot(&endpoint) + + latestEndpointReference, err := handler.EndpointService.Endpoint(endpoint.ID) + if latestEndpointReference == nil { + log.Printf("background schedule error (endpoint snapshot). Endpoint not found inside the database anymore (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + continue + } + + latestEndpointReference.Status = portainer.EndpointStatusUp + if snapshotError != nil { + log.Printf("background schedule error (endpoint snapshot). Unable to create snapshot (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, snapshotError) + latestEndpointReference.Status = portainer.EndpointStatusDown + } + + if snapshot != nil { + latestEndpointReference.Snapshots = []portainer.Snapshot{*snapshot} + } + + err = handler.EndpointService.UpdateEndpoint(latestEndpointReference.ID, latestEndpointReference) + 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 1ef8d1727..d8a94d360 100644 --- a/api/http/handler/endpoints/handler.go +++ b/api/http/handler/endpoints/handler.go @@ -45,7 +45,7 @@ func NewHandler(bouncer *security.RequestBouncer, authorizeEndpointManagement bo 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) + bouncer.AdministratorAccess(httperror.LoggerHandler(h.endpointSnapshots))).Methods(http.MethodPost) h.Handle("/endpoints", bouncer.RestrictedAccess(httperror.LoggerHandler(h.endpointList))).Methods(http.MethodGet) h.Handle("/endpoints/{id}", @@ -62,5 +62,7 @@ func NewHandler(bouncer *security.RequestBouncer, authorizeEndpointManagement bo bouncer.AuthenticatedAccess(httperror.LoggerHandler(h.endpointExtensionRemove))).Methods(http.MethodDelete) h.Handle("/endpoints/{id}/job", bouncer.AdministratorAccess(httperror.LoggerHandler(h.endpointJob))).Methods(http.MethodPost) + h.Handle("/endpoints/{id}/snapshot", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.endpointSnapshot))).Methods(http.MethodPost) return h } diff --git a/app/portainer/components/information-panel-offline/informationPanelOffline.html b/app/portainer/components/information-panel-offline/informationPanelOffline.html index a7c51a3e5..17942ee5a 100644 --- a/app/portainer/components/information-panel-offline/informationPanelOffline.html +++ b/app/portainer/components/information-panel-offline/informationPanelOffline.html @@ -4,5 +4,12 @@ This endpoint is currently offline (read-only). Data shown is based on the latest available snapshot.

    +

    + + Last snapshot: {{ $ctrl.snapshotTime | getisodatefromtimestamp }} +

    + - \ No newline at end of file + diff --git a/app/portainer/components/information-panel-offline/informationPanelOffline.js b/app/portainer/components/information-panel-offline/informationPanelOffline.js index c3f6e9517..e788dfe29 100644 --- a/app/portainer/components/information-panel-offline/informationPanelOffline.js +++ b/app/portainer/components/information-panel-offline/informationPanelOffline.js @@ -1,4 +1,4 @@ angular.module('portainer.app').component('informationPanelOffline', { templateUrl: 'app/portainer/components/information-panel-offline/informationPanelOffline.html', - transclude: true + controller: 'InformationPanelOfflineController' }); diff --git a/app/portainer/components/information-panel-offline/informationPanelOfflineController.js b/app/portainer/components/information-panel-offline/informationPanelOfflineController.js new file mode 100644 index 000000000..efe75545e --- /dev/null +++ b/app/portainer/components/information-panel-offline/informationPanelOfflineController.js @@ -0,0 +1,34 @@ +angular.module('portainer.app').controller('InformationPanelOfflineController', ['$state', 'EndpointProvider', 'EndpointService', 'Authentication', 'Notifications', +function StackDuplicationFormController($state, EndpointProvider, EndpointService, Authentication, Notifications) { + var ctrl = this; + + this.$onInit = onInit; + this.triggerSnapshot = triggerSnapshot; + + function triggerSnapshot() { + var endpointId = EndpointProvider.endpointID(); + + EndpointService.snapshotEndpoint(endpointId) + .then(function onSuccess() { + $state.reload(); + }) + .catch(function onError(err) { + Notifications.error('Failure', err, 'An error occured during endpoint snapshot'); + }); + } + + function onInit() { + var endpointId = EndpointProvider.endpointID(); + ctrl.showRefreshButton = Authentication.getUserDetails().role === 1; + + + EndpointService.endpoint(endpointId) + .then(function onSuccess(data) { + ctrl.snapshotTime = data.Snapshots[0].Time; + }) + .catch(function onError(err) { + Notifications.error('Failure', err, 'Unable to retrieve endpoint information'); + }); + } + +}]); diff --git a/app/portainer/rest/endpoint.js b/app/portainer/rest/endpoint.js index 7b50372e9..068a8ef66 100644 --- a/app/portainer/rest/endpoint.js +++ b/app/portainer/rest/endpoint.js @@ -7,7 +7,8 @@ angular.module('portainer.app') update: { method: 'PUT', params: { id: '@id' } }, updateAccess: { method: 'PUT', params: { id: '@id', action: 'access' } }, remove: { method: 'DELETE', params: { id: '@id'} }, - snapshot: { method: 'POST', params: { id: 'snapshot' }}, + snapshots: { method: 'POST', params: { action: 'snapshot' }}, + snapshot: { method: 'POST', params: { id: '@id', action: 'snapshot' }}, executeJob: { method: 'POST', ignoreLoadingBar: true, params: { id: '@id', action: 'job' } } }); }]); diff --git a/app/portainer/services/api/endpointService.js b/app/portainer/services/api/endpointService.js index fa17052e5..f7098ae51 100644 --- a/app/portainer/services/api/endpointService.js +++ b/app/portainer/services/api/endpointService.js @@ -12,8 +12,12 @@ function EndpointServiceFactory($q, Endpoints, FileUploadService) { return Endpoints.query({}).$promise; }; - service.snapshot = function() { - return Endpoints.snapshot({}, {}).$promise; + service.snapshotEndpoints = function() { + return Endpoints.snapshots({}, {}).$promise; + }; + + service.snapshotEndpoint = function(endpointID) { + return Endpoints.snapshot({ id: endpointID }, {}).$promise; }; service.endpointsByGroup = function(groupId) { diff --git a/app/portainer/views/home/homeController.js b/app/portainer/views/home/homeController.js index 083c75625..b422a7e86 100644 --- a/app/portainer/views/home/homeController.js +++ b/app/portainer/views/home/homeController.js @@ -101,7 +101,7 @@ function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, G } function triggerSnapshot() { - EndpointService.snapshot() + EndpointService.snapshotEndpoints() .then(function success() { Notifications.success('Success', 'Endpoints updated'); $state.reload(); From d455ab3fc74ffe287a2fca824209964de0a0c842 Mon Sep 17 00:00:00 2001 From: baron_l Date: Tue, 13 Nov 2018 04:08:12 +0100 Subject: [PATCH 55/93] feat(endpoints): enhance offline browsing (#2454) * feat(api): rewrite error response when trying to query a down endpoint * feat(interceptors): adding custom backend return code on offline fastfail --- api/http/handler/endpointproxy/proxy_docker.go | 5 +++++ app/docker/interceptors/containersInterceptor.js | 2 +- app/docker/interceptors/imagesInterceptor.js | 2 +- app/docker/interceptors/infoInterceptor.js | 2 +- app/docker/interceptors/networksInterceptor.js | 2 +- app/docker/interceptors/versionInterceptor.js | 2 +- app/docker/interceptors/volumesInterceptor.js | 2 +- app/portainer/interceptors/endpointStatusInterceptor.js | 2 +- 8 files changed, 12 insertions(+), 7 deletions(-) diff --git a/api/http/handler/endpointproxy/proxy_docker.go b/api/http/handler/endpointproxy/proxy_docker.go index f03ca8e67..9ca932a97 100644 --- a/api/http/handler/endpointproxy/proxy_docker.go +++ b/api/http/handler/endpointproxy/proxy_docker.go @@ -1,6 +1,7 @@ package endpointproxy import ( + "errors" "strconv" httperror "github.com/portainer/libhttp/error" @@ -23,6 +24,10 @@ func (handler *Handler) proxyRequestsToDockerAPI(w http.ResponseWriter, r *http. return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find an endpoint with the specified identifier inside the database", err} } + if endpoint.Status == portainer.EndpointStatusDown { + return &httperror.HandlerError{http.StatusServiceUnavailable, "Unable to query endpoint", errors.New("Endpoint is down")} + } + err = handler.requestBouncer.EndpointAccess(r, endpoint) if err != nil { return &httperror.HandlerError{http.StatusForbidden, "Permission denied to access endpoint", portainer.ErrEndpointAccessDenied} diff --git a/app/docker/interceptors/containersInterceptor.js b/app/docker/interceptors/containersInterceptor.js index f717ea211..066ffe4fe 100644 --- a/app/docker/interceptors/containersInterceptor.js +++ b/app/docker/interceptors/containersInterceptor.js @@ -6,7 +6,7 @@ angular.module('portainer.app') interceptor.responseError = responseErrorInterceptor; function responseErrorInterceptor(rejection) { - if (rejection.status === 502 || rejection.status === -1) { + if (rejection.status === 502 || rejection.status === 503 || rejection.status === -1) { var endpoint = EndpointProvider.currentEndpoint(); if (endpoint !== undefined) { var data = endpoint.Snapshots[0].SnapshotRaw.Containers; diff --git a/app/docker/interceptors/imagesInterceptor.js b/app/docker/interceptors/imagesInterceptor.js index bdfcdd6de..9d79fbc86 100644 --- a/app/docker/interceptors/imagesInterceptor.js +++ b/app/docker/interceptors/imagesInterceptor.js @@ -6,7 +6,7 @@ angular.module('portainer.app') interceptor.responseError = responseErrorInterceptor; function responseErrorInterceptor(rejection) { - if (rejection.status === 502 || rejection.status === -1) { + if (rejection.status === 502 || rejection.status === 503 || rejection.status === -1) { var endpoint = EndpointProvider.currentEndpoint(); if (endpoint !== undefined) { var data = endpoint.Snapshots[0].SnapshotRaw.Images; diff --git a/app/docker/interceptors/infoInterceptor.js b/app/docker/interceptors/infoInterceptor.js index 716d4fbfd..17f310641 100644 --- a/app/docker/interceptors/infoInterceptor.js +++ b/app/docker/interceptors/infoInterceptor.js @@ -6,7 +6,7 @@ angular.module('portainer.app') interceptor.responseError = responseErrorInterceptor; function responseErrorInterceptor(rejection) { - if (rejection.status === 502 || rejection.status === -1) { + if (rejection.status === 502 || rejection.status === 503 || rejection.status === -1) { var endpoint = EndpointProvider.currentEndpoint(); if (endpoint !== undefined) { var data = endpoint.Snapshots[0].SnapshotRaw.Info; diff --git a/app/docker/interceptors/networksInterceptor.js b/app/docker/interceptors/networksInterceptor.js index 85bce4ba2..b5068534c 100644 --- a/app/docker/interceptors/networksInterceptor.js +++ b/app/docker/interceptors/networksInterceptor.js @@ -6,7 +6,7 @@ angular.module('portainer.app') interceptor.responseError = responseErrorInterceptor; function responseErrorInterceptor(rejection) { - if (rejection.status === 502 || rejection.status === -1) { + if (rejection.status === 502 || rejection.status === 503 || rejection.status === -1) { var endpoint = EndpointProvider.currentEndpoint(); if (endpoint !== undefined) { var data = endpoint.Snapshots[0].SnapshotRaw.Networks; diff --git a/app/docker/interceptors/versionInterceptor.js b/app/docker/interceptors/versionInterceptor.js index 4b6ed5776..95a5d56c4 100644 --- a/app/docker/interceptors/versionInterceptor.js +++ b/app/docker/interceptors/versionInterceptor.js @@ -6,7 +6,7 @@ angular.module('portainer.app') interceptor.responseError = responseErrorInterceptor; function responseErrorInterceptor(rejection) { - if (rejection.status === 502 || rejection.status === -1) { + if (rejection.status === 502 || rejection.status === 503 || rejection.status === -1) { var endpoint = EndpointProvider.currentEndpoint(); if (endpoint !== undefined) { var data = endpoint.Snapshots[0].SnapshotRaw.Version; diff --git a/app/docker/interceptors/volumesInterceptor.js b/app/docker/interceptors/volumesInterceptor.js index 268f6a4fd..a42addd2c 100644 --- a/app/docker/interceptors/volumesInterceptor.js +++ b/app/docker/interceptors/volumesInterceptor.js @@ -6,7 +6,7 @@ angular.module('portainer.app') interceptor.responseError = responseErrorInterceptor; function responseErrorInterceptor(rejection) { - if (rejection.status === 502 || rejection.status === -1) { + if (rejection.status === 502 || rejection.status === 503 || rejection.status === -1) { var endpoint = EndpointProvider.currentEndpoint(); if (endpoint !== undefined) { var data = endpoint.Snapshots[0].SnapshotRaw.Volumes; diff --git a/app/portainer/interceptors/endpointStatusInterceptor.js b/app/portainer/interceptors/endpointStatusInterceptor.js index 46ca7a42b..9411f8d62 100644 --- a/app/portainer/interceptors/endpointStatusInterceptor.js +++ b/app/portainer/interceptors/endpointStatusInterceptor.js @@ -30,7 +30,7 @@ angular.module('portainer.app') function responseErrorInterceptor(rejection) { var EndpointService = $injector.get('EndpointService'); var url = rejection.config.url; - if ((rejection.status === 502 || rejection.status === -1) && canBeOffline(url) && !EndpointProvider.offlineMode()) { + if ((rejection.status === 502 || rejection.status === 503 || rejection.status === -1) && canBeOffline(url) && !EndpointProvider.offlineMode()) { EndpointProvider.setOfflineMode(true); EndpointService.updateEndpoint(EndpointProvider.endpointID(), {Status: EndpointProvider.endpointStatusFromOfflineMode(true)}); } From 40e0c3879cd3c9fa54f9329e4ad253ea8e30034d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christer=20War=C3=A9n?= Date: Tue, 13 Nov 2018 23:01:36 +0200 Subject: [PATCH 56/93] style(dashboard): change blocklist-item border color (#2465) Changing blocklist-item border color to more confortable color that makes UI look more consistence --- assets/css/app.css | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/assets/css/app.css b/assets/css/app.css index 2be345ca2..0ab4b52cd 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -168,13 +168,13 @@ a[ng-click]{ padding: 0.7rem; margin-bottom: 0.7rem; cursor: pointer; - border: 1px solid #333333; + border: 1px solid #cccccc; border-radius: 2px; box-shadow: 0 3px 10px -2px rgba(161, 170, 166, 0.5); } .blocklist-item--selected { - border: 2px solid #333333; + border: 2px solid #bbbbbb; background-color: #ececec; color: #2d3e63; } From 94d3d7bde252693e5c1f84c5339aef0bc3db48b6 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 14 Nov 2018 12:20:33 +1300 Subject: [PATCH 57/93] feat(motd): relocate motd file URL and always return 200 (#2466) --- api/http/handler/motd/motd.go | 2 +- api/portainer.go | 2 +- app/portainer/views/home/home.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/api/http/handler/motd/motd.go b/api/http/handler/motd/motd.go index ca279d890..53246fec1 100644 --- a/api/http/handler/motd/motd.go +++ b/api/http/handler/motd/motd.go @@ -18,7 +18,7 @@ func (handler *Handler) motd(w http.ResponseWriter, r *http.Request) { motd, err := client.Get(portainer.MessageOfTheDayURL, 0) if err != nil { - w.WriteHeader(http.StatusInternalServerError) + response.JSON(w, &motdResponse{Message: ""}) return } diff --git a/api/portainer.go b/api/portainer.go index 6682017b7..f75574723 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -714,7 +714,7 @@ const ( // DBVersion is the version number of the Portainer database DBVersion = 14 // MessageOfTheDayURL represents the URL where Portainer MOTD message can be retrieved - MessageOfTheDayURL = "https://raw.githubusercontent.com/portainer/motd/master/message.html" + MessageOfTheDayURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com/motd.html" // 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 diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html index 1ffaa88bd..86767459e 100644 --- a/app/portainer/views/home/home.html +++ b/app/portainer/views/home/home.html @@ -8,7 +8,7 @@ From 0ef25a4cbda2118b069505d0b1b0dfdab25e01bd Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 14 Nov 2018 16:10:49 +1300 Subject: [PATCH 58/93] fix(schedules): add schedule name validation and remove endpoint name prefix (#2470) --- api/docker/job.go | 2 +- api/http/handler/schedules/schedule_create.go | 12 ++++++++++-- api/http/handler/schedules/schedule_update.go | 5 +++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/api/docker/job.go b/api/docker/job.go index ea343e91c..7765f5f2e 100644 --- a/api/docker/job.go +++ b/api/docker/job.go @@ -83,7 +83,7 @@ func (service *JobService) ExecuteScript(endpoint *portainer.Endpoint, nodeName, } if schedule != nil { - err = cli.ContainerRename(context.Background(), body.ID, endpoint.Name+"_"+schedule.Name+"_"+body.ID) + err = cli.ContainerRename(context.Background(), body.ID, schedule.Name+"_"+body.ID) if err != nil { return err } diff --git a/api/http/handler/schedules/schedule_create.go b/api/http/handler/schedules/schedule_create.go index d09f94860..4dca4c3f3 100644 --- a/api/http/handler/schedules/schedule_create.go +++ b/api/http/handler/schedules/schedule_create.go @@ -37,13 +37,17 @@ type scheduleCreateFromFileContentPayload struct { func (payload *scheduleCreateFromFilePayload) Validate(r *http.Request) error { name, err := request.RetrieveMultiPartFormValue(r, "Name", false) if err != nil { - return errors.New("Invalid name") + return errors.New("Invalid schedule name") + } + + if !govalidator.Matches(name, `^[a-zA-Z0-9][a-zA-Z0-9_.-]+$`) { + return errors.New("Invalid schedule name format. Allowed characters are: [a-zA-Z0-9_.-]") } payload.Name = name image, err := request.RetrieveMultiPartFormValue(r, "Image", false) if err != nil { - return errors.New("Invalid image") + return errors.New("Invalid schedule image") } payload.Image = image @@ -80,6 +84,10 @@ func (payload *scheduleCreateFromFileContentPayload) Validate(r *http.Request) e return portainer.Error("Invalid schedule name") } + if !govalidator.Matches(payload.Name, `^[a-zA-Z0-9][a-zA-Z0-9_.-]+$`) { + return errors.New("Invalid schedule name format. Allowed characters are: [a-zA-Z0-9_.-]") + } + if govalidator.IsNull(payload.Image) { return portainer.Error("Invalid schedule image") } diff --git a/api/http/handler/schedules/schedule_update.go b/api/http/handler/schedules/schedule_update.go index 12284181c..ed680dfa1 100644 --- a/api/http/handler/schedules/schedule_update.go +++ b/api/http/handler/schedules/schedule_update.go @@ -1,9 +1,11 @@ package schedules import ( + "errors" "net/http" "strconv" + "github.com/asaskevich/govalidator" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" "github.com/portainer/libhttp/response" @@ -22,6 +24,9 @@ type scheduleUpdatePayload struct { } func (payload *scheduleUpdatePayload) Validate(r *http.Request) error { + if payload.Name != nil && !govalidator.Matches(*payload.Name, `^[a-zA-Z0-9][a-zA-Z0-9_.-]+$`) { + return errors.New("Invalid schedule name format. Allowed characters are: [a-zA-Z0-9_.-]") + } return nil } From 488dc5f9db7feaf52c81a94545c16810dd64a362 Mon Sep 17 00:00:00 2001 From: baron_l Date: Fri, 16 Nov 2018 01:26:56 +0100 Subject: [PATCH 59/93] fix(network-creation): macvlan availability for standalone endpoints (#2441) --- .../views/networks/create/createNetworkController.js | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/app/docker/views/networks/create/createNetworkController.js b/app/docker/views/networks/create/createNetworkController.js index 9f5dd6493..a2893f353 100644 --- a/app/docker/views/networks/create/createNetworkController.js +++ b/app/docker/views/networks/create/createNetworkController.js @@ -105,7 +105,11 @@ angular.module('portainer.docker') config.ConfigFrom = { Network: selectedNetworkConfig.Name }; - config.Scope = 'swarm'; + if ($scope.applicationState.endpoint.mode.provider === 'DOCKER_SWARM_MODE') { + config.Scope = 'swarm'; + } else { + config.Scope = 'local'; + } } function validateForm(accessControlData, isAdmin) { @@ -192,9 +196,6 @@ angular.module('portainer.docker') PluginService.networkPlugins(apiVersion < 1.25) .then(function success(data) { - if ($scope.applicationState.endpoint.mode.provider !== 'DOCKER_SWARM_MODE') { - data.splice(data.indexOf('macvlan'), 1); - } $scope.availableNetworkDrivers = data; }) .catch(function error(err) { From fe8dfee69a611256193576b94ff896f2905a3e50 Mon Sep 17 00:00:00 2001 From: baron_l Date: Mon, 19 Nov 2018 07:07:38 +0100 Subject: [PATCH 60/93] feat(home): display each endpoint URL (#2471) --- .../components/endpoint-list/endpoint-item/endpointItem.html | 3 +++ .../components/endpoint-list/endpoint-list-controller.js | 1 + app/portainer/components/endpoint-list/endpointList.html | 2 +- 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html index 6e643da5b..f9c720cf6 100644 --- a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html +++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html @@ -82,6 +82,9 @@ + + {{ $ctrl.model.URL | stripprotocol }} +
    diff --git a/app/portainer/components/endpoint-list/endpoint-list-controller.js b/app/portainer/components/endpoint-list/endpoint-list-controller.js index aab801410..bffbacc1d 100644 --- a/app/portainer/components/endpoint-list/endpoint-list-controller.js +++ b/app/portainer/components/endpoint-list/endpoint-list-controller.js @@ -44,6 +44,7 @@ angular.module('portainer.app').controller('EndpointListController', [ return ( _.includes(endpoint.Name.toLowerCase(), lowerCaseKeyword) || _.includes(endpoint.GroupName.toLowerCase(), lowerCaseKeyword) || + _.includes(endpoint.URL.toLowerCase(), lowerCaseKeyword) || _.some(endpoint.Tags, function(tag) { return _.includes(tag.toLowerCase(), lowerCaseKeyword); }) || diff --git a/app/portainer/components/endpoint-list/endpointList.html b/app/portainer/components/endpoint-list/endpointList.html index 2886916f1..9deecf8ca 100644 --- a/app/portainer/components/endpoint-list/endpointList.html +++ b/app/portainer/components/endpoint-list/endpointList.html @@ -21,7 +21,7 @@ class="searchInput" ng-model="$ctrl.state.textFilter" ng-change="$ctrl.onFilterChanged()" - placeholder="Search by name, group, tag, status..." auto-focus> + placeholder="Search by name, group, tag, status, URL..." auto-focus>
    From d03fd5805a56949992f6d9af5de5c69a9952cec5 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Fri, 23 Nov 2018 11:46:51 +1300 Subject: [PATCH 61/93] feat(api): support AGENT_SECRET environment variable (#2486) --- api/cmd/portainer/main.go | 3 ++- api/crypto/ecdsa.go | 23 +++++++++++++++++--- api/docker/client.go | 2 +- api/exec/swarm_stack.go | 2 +- api/http/handler/websocket/websocket_exec.go | 3 ++- api/http/proxy/docker_transport.go | 2 +- api/portainer.go | 2 +- 7 files changed, 28 insertions(+), 9 deletions(-) diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index 0e0c189ac..f7890c2c4 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -2,6 +2,7 @@ package main // import "github.com/portainer/portainer" import ( "encoding/json" + "os" "strings" "time" @@ -88,7 +89,7 @@ func initJWTService(authenticationEnabled bool) portainer.JWTService { } func initDigitalSignatureService() portainer.DigitalSignatureService { - return &crypto.ECDSAService{} + return crypto.NewECDSAService(os.Getenv("AGENT_SECRET")) } func initCryptoService() portainer.CryptoService { diff --git a/api/crypto/ecdsa.go b/api/crypto/ecdsa.go index 003547531..f2b87d639 100644 --- a/api/crypto/ecdsa.go +++ b/api/crypto/ecdsa.go @@ -8,6 +8,8 @@ import ( "encoding/base64" "encoding/hex" "math/big" + + "github.com/portainer/portainer" ) const ( @@ -26,6 +28,15 @@ type ECDSAService struct { privateKey *ecdsa.PrivateKey publicKey *ecdsa.PublicKey encodedPubKey string + secret string +} + +// NewECDSAService returns a pointer to a ECDSAService. +// An optional secret can be specified +func NewECDSAService(secret string) *ECDSAService { + return &ECDSAService{ + secret: secret, + } } // EncodedPublicKey returns the encoded version of the public that can be used @@ -91,11 +102,17 @@ func (service *ECDSAService) GenerateKeyPair() ([]byte, []byte, error) { return private, public, nil } -// Sign creates a signature from a message. -// It automatically hash the message using MD5 and creates a signature from +// CreateSignature creates a digital signature. +// It automatically hash a specific message using MD5 and creates a signature from // that hash. // It then encodes the generated signature in base64. -func (service *ECDSAService) Sign(message string) (string, error) { +func (service *ECDSAService) CreateSignature() (string, error) { + + message := portainer.PortainerAgentSignatureMessage + if service.secret != "" { + message = service.secret + } + hash := HashFromBytes([]byte(message)) r := big.NewInt(0) diff --git a/api/docker/client.go b/api/docker/client.go index 9c608a19b..913e5dd87 100644 --- a/api/docker/client.go +++ b/api/docker/client.go @@ -67,7 +67,7 @@ func createAgentClient(endpoint *portainer.Endpoint, signatureService portainer. return nil, err } - signature, err := signatureService.Sign(portainer.PortainerAgentSignatureMessage) + signature, err := signatureService.CreateSignature() if err != nil { return nil, err } diff --git a/api/exec/swarm_stack.go b/api/exec/swarm_stack.go index aa32bfe54..f41a581db 100644 --- a/api/exec/swarm_stack.go +++ b/api/exec/swarm_stack.go @@ -140,7 +140,7 @@ func (manager *SwarmStackManager) updateDockerCLIConfiguration(dataPath string) return err } - signature, err := manager.signatureService.Sign(portainer.PortainerAgentSignatureMessage) + signature, err := manager.signatureService.CreateSignature() if err != nil { return err } diff --git a/api/http/handler/websocket/websocket_exec.go b/api/http/handler/websocket/websocket_exec.go index d797e020a..6f2d07d22 100644 --- a/api/http/handler/websocket/websocket_exec.go +++ b/api/http/handler/websocket/websocket_exec.go @@ -111,12 +111,13 @@ func (handler *Handler) proxyWebsocketRequest(w http.ResponseWriter, r *http.Req } } - signature, err := handler.SignatureService.Sign(portainer.PortainerAgentSignatureMessage) + signature, err := handler.SignatureService.CreateSignature() if err != nil { return err } proxy.Director = func(incoming *http.Request, out http.Header) { + out.Set(portainer.PortainerAgentPublicKeyHeader, handler.SignatureService.EncodedPublicKey()) out.Set(portainer.PortainerAgentSignatureHeader, signature) out.Set(portainer.PortainerAgentTargetHeader, params.nodeName) } diff --git a/api/http/proxy/docker_transport.go b/api/http/proxy/docker_transport.go index 37e46c2dd..2476685cc 100644 --- a/api/http/proxy/docker_transport.go +++ b/api/http/proxy/docker_transport.go @@ -64,7 +64,7 @@ func (p *proxyTransport) proxyDockerRequest(request *http.Request) (*http.Respon request.URL.Path = path if p.enableSignature { - signature, err := p.SignatureService.Sign(portainer.PortainerAgentSignatureMessage) + signature, err := p.SignatureService.CreateSignature() if err != nil { return nil, err } diff --git a/api/portainer.go b/api/portainer.go index f75574723..ee2d6687f 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -626,7 +626,7 @@ type ( GenerateKeyPair() ([]byte, []byte, error) EncodedPublicKey() string PEMHeaders() (string, string) - Sign(message string) (string, error) + CreateSignature() (string, error) } // JWTService represents a service for managing JWT tokens From 5e49f934b9176577de30bd66df9a4c43e86cf797 Mon Sep 17 00:00:00 2001 From: baron_l Date: Fri, 23 Nov 2018 09:44:34 +0100 Subject: [PATCH 62/93] fix(containers-stats): accessing a down container stats wont display a js error anymore (#2484) --- app/docker/models/container.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/app/docker/models/container.js b/app/docker/models/container.js index a28e978cb..6666f1e03 100644 --- a/app/docker/models/container.js +++ b/app/docker/models/container.js @@ -71,8 +71,12 @@ function ContainerStatsViewModel(data) { this.NumProcs = data.num_procs; this.isWindows = true; } else { // Linux - this.MemoryUsage = data.memory_stats.usage - data.memory_stats.stats.cache; - this.MemoryCache = data.memory_stats.stats.cache; + if (data.memory_stats.stats === undefined || data.memory_stats.usage === undefined) { + this.MemoryUsage = this.MemoryCache = 0; + } else { + this.MemoryUsage = data.memory_stats.usage - data.memory_stats.stats.cache; + this.MemoryCache = data.memory_stats.stats.cache; + } } this.PreviousCPUTotalUsage = data.precpu_stats.cpu_usage.total_usage; this.PreviousCPUSystemUsage = data.precpu_stats.system_cpu_usage; From 17d63ae3caf4344cf32a8124ad189f37f5dca60b Mon Sep 17 00:00:00 2001 From: Olli Janatuinen Date: Fri, 23 Nov 2018 11:00:30 +0200 Subject: [PATCH 63/93] chore(dependencies): updated xterm to 3.8.0 version (#2452) --- package.json | 3 +-- yarn.lock | 7 ++++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 6d7486278..71aa19cc9 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "clean-all": "yarn grunt clean:all", "build": "yarn grunt build", "build-offline": "cd ./api/cmd/portainer && CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' && mv -b portainer ../../../dist/portainer-linux-amd64" - }, "engines": { "node": ">= 0.8.4" @@ -65,7 +64,7 @@ "splitargs": "github:deviantony/splitargs#~0.2.0", "toastr": "github:CodeSeven/toastr#~2.1.3", "ui-select": "^0.19.8", - "xterm": "^3.1.0" + "xterm": "^3.8.0" }, "devDependencies": { "autoprefixer": "^7.1.1", diff --git a/yarn.lock b/yarn.lock index 275854f70..7592562cb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4506,9 +4506,10 @@ xtend@~3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/xtend/-/xtend-3.0.0.tgz#5cce7407baf642cba7becda568111c493f59665a" -xterm@^3.1.0: - version "3.1.0" - resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.1.0.tgz#7f7e1c8cf4b80bd881a4e8891213b851423e90c9" +xterm@^3.8.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/xterm/-/xterm-3.8.0.tgz#55d1de518bdc9c9793823f5e4e97d6898972938d" + integrity sha512-rS3HLryuMWbLsv98+jVVSUXCxmoyXPwqwJNC0ad0VSMdXgl65LefPztQVwfurkaF7kM7ZSgM8eJjnJ9kkdoR1w== yargs@~3.10.0: version "3.10.0" From d510bbbcfd470651cb62256dc547211f5b73b6fc Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sat, 24 Nov 2018 08:40:56 +1300 Subject: [PATCH 64/93] feat(api): filter LDAP password from settings response (#2488) --- api/http/handler/settings/handler.go | 4 ++++ api/http/handler/settings/settings_inspect.go | 1 + api/portainer.go | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/api/http/handler/settings/handler.go b/api/http/handler/settings/handler.go index d20c388d7..0acbd2ca6 100644 --- a/api/http/handler/settings/handler.go +++ b/api/http/handler/settings/handler.go @@ -9,6 +9,10 @@ import ( "github.com/portainer/portainer/http/security" ) +func hideFields(settings *portainer.Settings) { + settings.LDAPSettings.Password = "" +} + // Handler is the HTTP handler used to handle settings operations. type Handler struct { *mux.Router diff --git a/api/http/handler/settings/settings_inspect.go b/api/http/handler/settings/settings_inspect.go index c922e1f47..a28b1ef09 100644 --- a/api/http/handler/settings/settings_inspect.go +++ b/api/http/handler/settings/settings_inspect.go @@ -14,5 +14,6 @@ func (handler *Handler) settingsInspect(w http.ResponseWriter, r *http.Request) return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve the settings from the database", err} } + hideFields(settings) return response.JSON(w, settings) } diff --git a/api/portainer.go b/api/portainer.go index ee2d6687f..634d8635c 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -47,7 +47,7 @@ type ( // LDAPSettings represents the settings used to connect to a LDAP server LDAPSettings struct { ReaderDN string `json:"ReaderDN"` - Password string `json:"Password"` + Password string `json:"Password,omitempty"` URL string `json:"URL"` TLSConfig TLSConfiguration `json:"TLSConfig"` StartTLS bool `json:"StartTLS"` From 52788029ede8de40c2313bffefc2839c3a7198f9 Mon Sep 17 00:00:00 2001 From: baron_l Date: Fri, 23 Nov 2018 23:11:58 +0100 Subject: [PATCH 65/93] feat(container-details): add visual feedback when creating image from container (#2487) --- app/docker/views/containers/edit/containerController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/docker/views/containers/edit/containerController.js b/app/docker/views/containers/edit/containerController.js index f687b116c..63902e77e 100644 --- a/app/docker/views/containers/edit/containerController.js +++ b/app/docker/views/containers/edit/containerController.js @@ -154,6 +154,7 @@ function ($q, $scope, $state, $transition$, $filter, Commit, ContainerHelper, Co Commit.commitContainer({id: $transition$.params().id, tag: imageConfig.tag, repo: imageConfig.repo}, function () { update(); Notifications.success('Container commited', $transition$.params().id); + $scope.config.Image = ''; }, function (e) { update(); Notifications.error('Failure', e, 'Unable to commit container'); From b809177147f29ba987164479fa962832ac91e24f Mon Sep 17 00:00:00 2001 From: Andreas Roussos Date: Sat, 24 Nov 2018 22:46:13 +0200 Subject: [PATCH 66/93] feat(dashboard): use plural form only when required * fix(endpoint-item): use plural form only when required * refactor(endpoint-item): use clearer patterns * refactor(dashboard): use clearer patterns --- app/docker/views/dashboard/dashboard.html | 12 ++++++------ .../endpoint-list/endpoint-item/endpointItem.html | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/app/docker/views/dashboard/dashboard.html b/app/docker/views/dashboard/dashboard.html index 9d2751010..89cee5867 100644 --- a/app/docker/views/dashboard/dashboard.html +++ b/app/docker/views/dashboard/dashboard.html @@ -84,7 +84,7 @@
    {{ stackCount }}
    -
    Stacks
    +
    {{ stackCount === 1 ? 'Stack' : 'Stacks' }}
    @@ -97,7 +97,7 @@
    {{ serviceCount }}
    -
    Services
    +
    {{ serviceCount === 1 ? 'Service' : 'Services' }}
    @@ -114,7 +114,7 @@
    {{ containers | stoppedcontainers }} stopped
    {{ containers.length }}
    -
    Containers
    +
    {{ containers.length === 1 ? 'Container' : 'Containers' }}
    @@ -130,7 +130,7 @@
    {{ images | imagestotalsize | humansize }}
    {{ images.length }}
    -
    Images
    +
    {{ images.length === 1 ? 'Image' : 'Images' }}
    @@ -143,7 +143,7 @@
    {{ volumeCount }}
    -
    Volumes
    +
    {{ volumeCount === 1 ? 'Volume' : 'Volumes' }}
    @@ -156,7 +156,7 @@
    {{ networkCount }}
    -
    Networks
    +
    {{ networkCount === 1 ? 'Network' : 'Networks' }}
    diff --git a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html index f9c720cf6..a2f96a392 100644 --- a/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html +++ b/app/portainer/components/endpoint-list/endpoint-item/endpointItem.html @@ -38,13 +38,13 @@ - {{ $ctrl.model.Snapshots[0].StackCount }} stacks + {{ $ctrl.model.Snapshots[0].StackCount }} {{ $ctrl.model.Snapshots[0].StackCount === 1 ? 'stack' : 'stacks' }} - {{ $ctrl.model.Snapshots[0].ServiceCount }} services + {{ $ctrl.model.Snapshots[0].ServiceCount }} {{ $ctrl.model.Snapshots[0].ServiceCount === 1 ? 'service' : '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].RunningContainerCount + $ctrl.model.Snapshots[0].StoppedContainerCount === 1 ? 'container' : 'containers' }} - {{ $ctrl.model.Snapshots[0].RunningContainerCount }} @@ -52,10 +52,10 @@ - {{ $ctrl.model.Snapshots[0].VolumeCount }} volumes + {{ $ctrl.model.Snapshots[0].VolumeCount }} {{ $ctrl.model.Snapshots[0].VolumeCount === 1 ? 'volume' : 'volumes' }} - {{ $ctrl.model.Snapshots[0].ImageCount }} images + {{ $ctrl.model.Snapshots[0].ImageCount }} {{ $ctrl.model.Snapshots[0].ImageCount === 1 ? 'image' : 'images' }} From 34b886d69097ba671e789d209b008df776ddcbb6 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Mon, 26 Nov 2018 23:05:13 +0200 Subject: [PATCH 67/93] chore(build-system): add start and start:server scripts (#2495) --- package.json | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 71aa19cc9..e5ca71a22 100644 --- a/package.json +++ b/package.json @@ -21,10 +21,11 @@ ], "scripts": { "grunt": "grunt", - "dev": "yarn grunt run-dev", - "clean-all": "yarn grunt clean:all", - "build": "yarn grunt build", - "build-offline": "cd ./api/cmd/portainer && CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' && mv -b portainer ../../../dist/portainer-linux-amd64" + "start": "grunt run-dev", + "start:server": "yarn build:server:offline && grunt shell:run:amd64", + "clean:all": "grunt clean:all", + "build": "grunt build", + "build:server:offline": "cd ./api/cmd/portainer && CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' && mv -f portainer ../../../dist/portainer-linux-amd64" }, "engines": { "node": ">= 0.8.4" From c778e7900491332a3549c35f7dc672b6b54617e8 Mon Sep 17 00:00:00 2001 From: baron_l Date: Wed, 28 Nov 2018 18:57:36 +0100 Subject: [PATCH 68/93] fix(container-console): close the console when selected shell does not exist inside the container (#2502) --- .../views/containers/console/containerConsoleController.js | 1 + 1 file changed, 1 insertion(+) diff --git a/app/docker/views/containers/console/containerConsoleController.js b/app/docker/views/containers/console/containerConsoleController.js index 812e5b567..9501075f9 100644 --- a/app/docker/views/containers/console/containerConsoleController.js +++ b/app/docker/views/containers/console/containerConsoleController.js @@ -52,6 +52,7 @@ function ($scope, $transition$, ContainerService, ImageService, EndpointProvider }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to exec into container'); + $scope.disconnect(); }); }; From 969f70edeb39d8a52f3a9e44984105436596a8b9 Mon Sep 17 00:00:00 2001 From: baron_l Date: Wed, 28 Nov 2018 19:00:58 +0100 Subject: [PATCH 69/93] fix(image-upload): uploading a tar with multiple images wont display an error anymore (#2503) --- app/portainer/services/fileUpload.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/portainer/services/fileUpload.js b/app/portainer/services/fileUpload.js index cd75e7bbb..d00271dcb 100644 --- a/app/portainer/services/fileUpload.js +++ b/app/portainer/services/fileUpload.js @@ -35,7 +35,8 @@ angular.module('portainer.app') 'Content-Type': file.type }, data: file, - ignoreLoadingBar: true + ignoreLoadingBar: true, + transformResponse: genericHandler }); }; From dc9a878f4bce8df45bab2f9832249d687c8b7e07 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Mon, 3 Dec 2018 12:10:55 +1300 Subject: [PATCH 70/93] chore(docker): update docker binary version to 18.09.0 (#2510) --- gruntfile.js | 91 ++++++++++++++++++++++++++-------------------------- 1 file changed, 46 insertions(+), 45 deletions(-) diff --git a/gruntfile.js b/gruntfile.js index 873d55473..a73549c7f 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -2,9 +2,9 @@ var gruntfile_cfg = {}; var loadGruntTasks = require('load-grunt-tasks'); var os = require('os'); var arch = os.arch(); -if ( arch === 'x64' ) arch = 'amd64'; +if (arch === 'x64') arch = 'amd64'; -module.exports = function (grunt) { +module.exports = function(grunt) { loadGruntTasks(grunt, { pattern: ['grunt-*', 'gruntify-*'] @@ -48,46 +48,46 @@ module.exports = function (grunt) { 'after-copy' ]); grunt.task.registerTask('release', 'release::', function(p, a) { - grunt.task.run(['config:prod', 'clean:all', 'shell:buildBinary:'+p+':'+a, 'shell:downloadDockerBinary:'+p+':'+a, 'before-copy', 'copy:assets', 'after-copy' ]); + grunt.task.run(['config:prod', 'clean:all', 'shell:buildBinary:' + p + ':' + a, 'shell:downloadDockerBinary:' + p + ':' + a, 'before-copy', 'copy:assets', 'after-copy']); }); grunt.registerTask('lint', ['eslint']); - grunt.registerTask('run-dev', ['build', 'shell:run:'+arch, 'watch:build']); + grunt.registerTask('run-dev', ['build', 'shell:run:' + arch, 'watch:build']); grunt.registerTask('clear', ['clean:app']); // Load content of `vendor.yml` to src.jsVendor, src.cssVendor and src.angularVendor grunt.registerTask('vendor', function() { - var vendorFile = grunt.file.readYAML('vendor.yml'); - for (var filelist in vendorFile) { - if (vendorFile.hasOwnProperty(filelist)) { - var list = vendorFile[filelist]; - // Check if any of the files is missing - for (var itemIndex in list) { - if (list.hasOwnProperty(itemIndex)) { - var item = 'node_modules/'+list[itemIndex]; - if (!grunt.file.exists(item)) { - grunt.fail.warn('Dependency file ' + item + ' not found.'); - } - list[itemIndex] = item; - } - } - // If none is missing, save the list - grunt.config('src.' + filelist + 'Vendor', list); + var vendorFile = grunt.file.readYAML('vendor.yml'); + for (var filelist in vendorFile) { + if (vendorFile.hasOwnProperty(filelist)) { + var list = vendorFile[filelist]; + // Check if any of the files is missing + for (var itemIndex in list) { + if (list.hasOwnProperty(itemIndex)) { + var item = 'node_modules/' + list[itemIndex]; + if (!grunt.file.exists(item)) { + grunt.fail.warn('Dependency file ' + item + ' not found.'); + } + list[itemIndex] = item; } + } + // If none is missing, save the list + grunt.config('src.' + filelist + 'Vendor', list); } + } }); // Project configuration. grunt.initConfig({ root: 'dist', distdir: 'dist/public', - shippedDockerVersion: '18.06.1-ce', + shippedDockerVersion: '18.09.0', shippedDockerVersionWindows: '17.09.0-ce', pkg: grunt.file.readJSON('package.json'), config: gruntfile_cfg.config, src: gruntfile_cfg.src, clean: gruntfile_cfg.clean, useminPrepare: gruntfile_cfg.useminPrepare, - filerev: { files: { src: ['<%= distdir %>/js/*.js', '<%= distdir %>/css/*.css'] }}, + filerev: { files: { src: ['<%= distdir %>/js/*.js', '<%= distdir %>/css/*.css'] } }, usemin: { html: ['<%= distdir %>/index.html'] }, copy: gruntfile_cfg.copy, eslint: gruntfile_cfg.eslint, @@ -108,8 +108,8 @@ var autoprefixer = require('autoprefixer'); var cssnano = require('cssnano'); gruntfile_cfg.config = { - dev: { options: { variables: { 'environment': 'development' }}}, - prod: { options: { variables: { 'environment': 'production' }}} + dev: { options: { variables: { 'environment': 'development' } } }, + prod: { options: { variables: { 'environment': 'production' } } } }; gruntfile_cfg.src = { @@ -152,18 +152,18 @@ gruntfile_cfg.useminPrepare = { gruntfile_cfg.copy = { bundle: { files: [ - {dest:'<%= distdir %>/js/', src: ['app.js'], expand: true, cwd: '.tmp/concat/js/' }, - {dest:'<%= distdir %>/css/', src: ['app.css'], expand: true, cwd: '.tmp/concat/css/' } + { dest: '<%= distdir %>/js/', src: ['app.js'], expand: true, cwd: '.tmp/concat/js/' }, + { dest: '<%= distdir %>/css/', src: ['app.css'], expand: true, cwd: '.tmp/concat/css/' } ] }, assets: { files: [ - {dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/bootstrap/fonts/'}, - {dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,eot,svg}', expand: true, cwd: 'node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/'}, - {dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/rdash-ui/dist/fonts/'}, - {dest: '<%= distdir %>/images/', src: '**', expand: true, cwd: 'assets/images/'}, - {dest: '<%= distdir %>/ico', src: '**', expand: true, cwd: 'assets/ico'}, - {dest: '<%= root %>/', src: 'templates.json', cwd: ''} + { dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/bootstrap/fonts/' }, + { dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,eot,svg}', expand: true, cwd: 'node_modules/@fortawesome/fontawesome-free-webfonts/webfonts/' }, + { dest: '<%= distdir %>/fonts/', src: '*.{ttf,woff,woff2,eof,svg}', expand: true, cwd: 'node_modules/rdash-ui/dist/fonts/' }, + { dest: '<%= distdir %>/images/', src: '**', expand: true, cwd: 'assets/images/' }, + { dest: '<%= distdir %>/ico', src: '**', expand: true, cwd: 'assets/ico' }, + { dest: '<%= root %>/', src: 'templates.json', cwd: '' } ] } }; @@ -205,8 +205,9 @@ gruntfile_cfg.uglify = { }, vendor: { options: { preserveComments: 'some' }, // Preserve license comments - files: { '<%= distdir %>/js/vendor.js': ['<%= src.jsVendor %>'] , - '<%= distdir %>/js/angular.js': ['<%= src.angularVendor %>'] + files: { + '<%= distdir %>/js/vendor.js': ['<%= src.jsVendor %>'], + '<%= distdir %>/js/angular.js': ['<%= src.angularVendor %>'] } } }; @@ -215,7 +216,7 @@ gruntfile_cfg.postcss = { build: { options: { processors: [ - autoprefixer({browsers: 'last 2 versions'}), // add vendor prefixes + autoprefixer({ browsers: 'last 2 versions' }), // add vendor prefixes cssnano() // minify the result ] }, @@ -235,9 +236,9 @@ gruntfile_cfg.replace = { concat: { options: { patterns: [ - { match: 'ENVIRONMENT', replacement: '<%= grunt.config.get("environment") %>' }, + { match: 'ENVIRONMENT', replacement: '<%= grunt.config.get("environment") %>' }, { match: 'CONFIG_GA_ID', replacement: '<%= pkg.config.GA_ID %>' }, - { match: /..\/webfonts\//g, replacement: '../fonts/'} + { match: /..\/webfonts\//g, replacement: '../fonts/' } ] }, files: [ @@ -258,12 +259,12 @@ gruntfile_cfg.replace = { }; function shell_buildBinary(p, a) { - var binfile = 'dist/portainer-'+p+'-'+a; + var binfile = 'dist/portainer-' + p + '-' + a; return [ - 'if [ -f '+(( p === 'windows' ) ? binfile+'.exe' : binfile)+' ]; then', - 'echo "Portainer binary exists";', + 'if [ -f ' + ((p === 'windows') ? binfile + '.exe' : binfile) + ' ]; then', + 'echo "Portainer binary exists";', 'else', - 'build/build_in_container.sh ' + p + ' ' + a + ';', + 'build/build_in_container.sh ' + p + ' ' + a + ';', 'fi' ].join(' '); } @@ -280,12 +281,12 @@ function shell_downloadDockerBinary(p, a) { var as = { 'amd64': 'x86_64', 'arm': 'armhf', 'arm64': 'aarch64' }; var ip = ((ps[p] === undefined) ? p : ps[p]); var ia = ((as[a] === undefined) ? a : as[a]); - var binaryVersion = (( p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>' )); + var binaryVersion = ((p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>')); return [ - 'if [ -f '+(( p === 'windows' ) ? 'dist/docker.exe' : 'dist/docker')+' ]; then', - 'echo "Docker binary exists";', + 'if [ -f ' + ((p === 'windows') ? 'dist/docker.exe' : 'dist/docker') + ' ]; then', + 'echo "Docker binary exists";', 'else', - 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';', + 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';', 'fi' ].join(' '); } From 5fa4403d204a9a47d5199f99649140b76ef7b324 Mon Sep 17 00:00:00 2001 From: linquize Date: Mon, 3 Dec 2018 16:49:02 +0800 Subject: [PATCH 71/93] feat(container-stats): add refresh rate of 1 and 3 seconds (#2493) --- app/docker/views/containers/stats/containerstats.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/docker/views/containers/stats/containerstats.html b/app/docker/views/containers/stats/containerstats.html index 79adc3029..13fe72145 100644 --- a/app/docker/views/containers/stats/containerstats.html +++ b/app/docker/views/containers/stats/containerstats.html @@ -26,6 +26,8 @@
    + +
    +
    diff --git a/app/portainer/views/settings/settingsController.js b/app/portainer/views/settings/settingsController.js index e1b7156e2..81ed2588e 100644 --- a/app/portainer/views/settings/settingsController.js +++ b/app/portainer/views/settings/settingsController.js @@ -12,7 +12,8 @@ function ($scope, $state, Notifications, SettingsService, StateManager) { restrictBindMounts: false, restrictPrivilegedMode: false, labelName: '', - labelValue: '' + labelValue: '', + enableHostManagementFeatures: false }; $scope.removeFilteredContainerLabel = function(index) { @@ -46,6 +47,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager) { settings.AllowBindMountsForRegularUsers = !$scope.formValues.restrictBindMounts; settings.AllowPrivilegedModeForRegularUsers = !$scope.formValues.restrictPrivilegedMode; + settings.EnableHostManagementFeatures = $scope.formValues.enableHostManagementFeatures; $scope.state.actionInProgress = true; updateSettings(settings); @@ -57,6 +59,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager) { Notifications.success('Settings updated'); StateManager.updateLogo(settings.LogoURL); StateManager.updateSnapshotInterval(settings.SnapshotInterval); + StateManager.updateEnableHostManagementFeatures(settings.EnableHostManagementFeatures); $state.reload(); }) .catch(function error(err) { @@ -80,6 +83,7 @@ function ($scope, $state, Notifications, SettingsService, StateManager) { } $scope.formValues.restrictBindMounts = !settings.AllowBindMountsForRegularUsers; $scope.formValues.restrictPrivilegedMode = !settings.AllowPrivilegedModeForRegularUsers; + $scope.formValues.enableHostManagementFeatures = settings.EnableHostManagementFeatures; }) .catch(function error(err) { Notifications.error('Failure', err, 'Unable to retrieve application settings'); diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index 031cfe91e..a78c4f986 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -36,10 +36,10 @@ Profiles
    -
  • +
  • Scheduler
    • -
  • +
  • Host jobs
  • From 9e1800e2ec09c1a94c8be2432b88d5dd812b3ef1 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Thu, 6 Dec 2018 14:01:49 +1300 Subject: [PATCH 75/93] style(settings): update host management tooltip --- app/portainer/views/settings/settings.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/portainer/views/settings/settings.html b/app/portainer/views/settings/settings.html index cedb0aeb1..1df7d0e7d 100644 --- a/app/portainer/views/settings/settings.html +++ b/app/portainer/views/settings/settings.html @@ -105,7 +105,7 @@
    -
    - -
    - -
    + +
    + Schedule configuration
    -
    -
    -
    -

    This field is required.

    +
    +
    +
    +
    + + +
    +
    + +
    -
    - - You can refer to the following documentation to get more information about the supported cron expression format. - + + +
    +
    + +
    + +
    +
    + +
    +
    + +
    + +
    +
    +
    +
    +

    This field is required.

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

    This field is required.

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

    This field is required.

    +
    +
    +
    +
    + + You can refer to the following documentation to get more information about the supported cron expression format. + +
    +
    +
    Job configuration diff --git a/app/portainer/models/schedule.js b/app/portainer/models/schedule.js index 874ebc8d5..8b9a88e88 100644 --- a/app/portainer/models/schedule.js +++ b/app/portainer/models/schedule.js @@ -1,5 +1,6 @@ function ScheduleDefaultModel() { this.Name = ''; + this.Recurring = false; this.CronExpression = ''; this.JobType = 1; this.Job = new ScriptExecutionDefaultJobModel(); @@ -16,6 +17,7 @@ function ScriptExecutionDefaultJobModel() { function ScheduleModel(data) { this.Id = data.Id; this.Name = data.Name; + this.Recurring = data.Recurring; this.JobType = data.JobType; this.CronExpression = data.CronExpression; this.Created = data.Created; @@ -42,6 +44,7 @@ function ScriptExecutionTaskModel(data) { function ScheduleCreateRequest(model) { this.Name = model.Name; + this.Recurring = model.Recurring; this.CronExpression = model.CronExpression; this.Image = model.Job.Image; this.Endpoints = model.Job.Endpoints; @@ -54,6 +57,7 @@ function ScheduleCreateRequest(model) { function ScheduleUpdateRequest(model) { this.id = model.Id; this.Name = model.Name; + this.Recurring = model.Recurring; this.CronExpression = model.CronExpression; this.Image = model.Job.Image; this.Endpoints = model.Job.Endpoints; diff --git a/index.html b/index.html index 0ec14b658..704ec3d3e 100644 --- a/index.html +++ b/index.html @@ -18,8 +18,8 @@ - + diff --git a/package.json b/package.json index e5ca71a22..0f6b5ab6f 100644 --- a/package.json +++ b/package.json @@ -44,6 +44,7 @@ "angular-local-storage": "~0.5.2", "angular-messages": "~1.5.0", "angular-mocks": "~1.5.0", + "angular-moment-picker": "^0.10.2", "angular-resource": "~1.5.0", "angular-sanitize": "~1.5.0", "angular-ui-bootstrap": "~2.5.0", diff --git a/vendor.yml b/vendor.yml index 097faec26..4ead34d5b 100644 --- a/vendor.yml +++ b/vendor.yml @@ -32,6 +32,7 @@ css: - 'codemirror/addon/lint/lint.css' - 'angular-json-tree/dist/angular-json-tree.css' - 'angular-loading-bar/build/loading-bar.css' + - 'angular-moment-picker/dist/angular-moment-picker.min.css' angular: - 'angular/angular.js' - 'angular-ui-bootstrap/dist/ui-bootstrap-tpls.js' @@ -53,3 +54,4 @@ angular: - 'angularjs-scroll-glue/src/scrollglue.js' - 'angular-clipboard/angular-clipboard.js' - 'angular-file-saver/dist/angular-file-saver.bundle.js' + - 'angular-moment-picker/dist/angular-moment-picker.min.js' diff --git a/yarn.lock b/yarn.lock index 7592562cb..5e094094b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -136,6 +136,14 @@ angular-mocks@~1.5.0: version "1.5.11" resolved "https://registry.yarnpkg.com/angular-mocks/-/angular-mocks-1.5.11.tgz#a0e1dd0ea55fd77ee7a757d75536c5e964c86f81" +angular-moment-picker@^0.10.2: + version "0.10.2" + resolved "https://registry.yarnpkg.com/angular-moment-picker/-/angular-moment-picker-0.10.2.tgz#54c8b3c228b33dffa3b7b3d0773a585323815c33" + integrity sha512-WvmrQM0zEcFqi50yDELaF34Ilrx4PtL7mWLcpTZCJGQDvMlIsxJrB30LxOkoJv8yrrLxD2s6nnR3t1/SqioWWw== + dependencies: + angular "^1.3" + moment "^2.16.0" + angular-resource@~1.5.0: version "1.5.11" resolved "https://registry.yarnpkg.com/angular-resource/-/angular-resource-1.5.11.tgz#d93ea619184a2e0ee3ae338265758363172929f0" @@ -156,6 +164,11 @@ angular@1.x, angular@~1.5.0: version "1.5.11" resolved "https://registry.yarnpkg.com/angular/-/angular-1.5.11.tgz#8c5ba7386f15965c9acf3429f6881553aada30d6" +angular@^1.3: + version "1.7.5" + resolved "https://registry.yarnpkg.com/angular/-/angular-1.7.5.tgz#d1c1c01c6f5dc835638f3f9aa51012857bdac49e" + integrity sha512-760183yxtGzni740IBTieNuWLtPNAoMqvmC0Z62UoU0I3nqk+VJuO3JbQAXOyvo3Oy/ZsdNQwrSTh/B0OQZjNw== + angularjs-scroll-glue@^2.2.0: version "2.2.0" resolved "https://registry.yarnpkg.com/angularjs-scroll-glue/-/angularjs-scroll-glue-2.2.0.tgz#07d3399ac16ca874c63b6b5ee2ee30558b37e5d1" @@ -2905,6 +2918,11 @@ moment@^2.10.6: version "2.14.1" resolved "https://registry.yarnpkg.com/moment/-/moment-2.14.1.tgz#b35b27c47e57ed2ddc70053d6b07becdb291741c" +moment@^2.16.0: + version "2.22.2" + resolved "https://registry.yarnpkg.com/moment/-/moment-2.22.2.tgz#3c257f9839fc0e93ff53149632239eb90783ff66" + integrity sha1-PCV/mDn8DpP/UxSWMiOeuQeD/2Y= + moment@^2.21.0: version "2.21.0" resolved "https://registry.yarnpkg.com/moment/-/moment-2.21.0.tgz#2a114b51d2a6ec9e6d83cf803f838a878d8a023a" From 2541f4daea554bb3fd57853844b8b579c3852a2e Mon Sep 17 00:00:00 2001 From: Olli Janatuinen Date: Thu, 6 Dec 2018 21:54:34 +0200 Subject: [PATCH 77/93] feat(UX): persist search criterias (#2425) * feat(ui): persist search criteria * fix(ui): trying make templates search working correctly * fix(ui): corrected search persistance on home and templates * fix(ui): corrected javascript errors --- .../files-datatable/files-datatable.html | 2 +- .../containerGroupsDatatable.html | 2 +- .../configs-datatable/configsDatatable.html | 2 +- .../containersDatatable.html | 2 +- .../containersDatatableController.js | 9 +++ .../events-datatable/eventsDatatable.html | 2 +- .../host-jobs-datatable/jobsDatatable.html | 2 +- .../jobsDatatableController.js | 9 +++ .../images-datatable/imagesDatatable.html | 2 +- .../imagesDatatableController.js | 9 +++ .../macvlanNodesDatatable.html | 2 +- .../networks-datatable/networksDatatable.html | 2 +- .../nodeTasksDatatable.html | 2 +- .../nodes-datatable/nodesDatatable.html | 2 +- .../secrets-datatable/secretsDatatable.html | 2 +- .../services-datatable/servicesDatatable.html | 2 +- .../servicesDatatableController.js | 9 +++ .../tasks-datatable/tasksDatatable.html | 2 +- .../tasksDatatableController.js | 9 +++ .../volumes-datatable/volumesDatatable.html | 2 +- .../volumesDatatableController.js | 9 +++ .../storidgeClusterEventsDatatable.html | 2 +- .../storidgeNodesDatatable.html | 2 +- .../storidgeProfilesDatatable.html | 2 +- .../components/access-table/accessTable.html | 2 +- .../endpointsDatatable.html | 2 +- .../datatables/genericDatatableController.js | 11 ++++ .../groups-datatable/groupsDatatable.html | 2 +- .../registriesDatatable.html | 2 +- .../stacks-datatable/stacksDatatable.html | 2 +- .../stacksDatatableController.js | 9 +++ .../tags-datatable/tagsDatatable.html | 2 +- .../teams-datatable/teamsDatatable.html | 2 +- .../users-datatable/usersDatatable.html | 2 +- .../endpoint-list/endpoint-list-controller.js | 19 +++++-- .../components/endpoint-list/endpoint-list.js | 1 + .../endpoint-list/endpointList.html | 2 +- .../groupAssociationTable.html | 2 +- .../template-list/template-list-controller.js | 56 +++++++++++++++++++ .../components/template-list/template-list.js | 47 +--------------- .../template-list/templateList.html | 2 +- app/portainer/services/datatableService.js | 8 +++ app/portainer/services/localStorage.js | 6 ++ app/portainer/views/home/home.html | 2 +- app/portainer/views/templates/templates.html | 2 +- 45 files changed, 192 insertions(+), 81 deletions(-) create mode 100644 app/portainer/components/template-list/template-list-controller.js diff --git a/app/agent/components/files-datatable/files-datatable.html b/app/agent/components/files-datatable/files-datatable.html index 58cebe051..65dc569a8 100644 --- a/app/agent/components/files-datatable/files-datatable.html +++ b/app/agent/components/files-datatable/files-datatable.html @@ -8,7 +8,7 @@
    + ng-change="$ctrl.onTextFilterChange()" placeholder="Search..." auto-focus>
    diff --git a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html index 8ba81dece..9f85333b7 100644 --- a/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html +++ b/app/azure/components/datatables/containergroups-datatable/containerGroupsDatatable.html @@ -17,7 +17,7 @@
    - +
    diff --git a/app/docker/components/datatables/configs-datatable/configsDatatable.html b/app/docker/components/datatables/configs-datatable/configsDatatable.html index 9b2f4364f..5e8f075a6 100644 --- a/app/docker/components/datatables/configs-datatable/configsDatatable.html +++ b/app/docker/components/datatables/configs-datatable/configsDatatable.html @@ -17,7 +17,7 @@
    - +
    diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.html b/app/docker/components/datatables/containers-datatable/containersDatatable.html index 2ade1ff08..e9179cd33 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatable.html +++ b/app/docker/components/datatables/containers-datatable/containersDatatable.html @@ -109,7 +109,7 @@ >
    - +
    diff --git a/app/docker/components/datatables/containers-datatable/containersDatatableController.js b/app/docker/components/datatables/containers-datatable/containersDatatableController.js index 2fd6ffe1e..68a3d925b 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatableController.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatableController.js @@ -78,6 +78,10 @@ function (PaginationService, DatatableService, EndpointProvider) { } }; + this.onTextFilterChange = function() { + DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter); + }; + this.onColumnVisibilityChange = function() { DatatableService.setColumnVisibilitySettings(this.tableKey, this.columnVisibility); }; @@ -227,6 +231,11 @@ function (PaginationService, DatatableService, EndpointProvider) { this.columnVisibility = storedColumnVisibility; } this.columnVisibility.state.open = false; + + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + } }; function setDefaults(ctrl) { diff --git a/app/docker/components/datatables/events-datatable/eventsDatatable.html b/app/docker/components/datatables/events-datatable/eventsDatatable.html index 77bb95c71..f70cbb9e7 100644 --- a/app/docker/components/datatables/events-datatable/eventsDatatable.html +++ b/app/docker/components/datatables/events-datatable/eventsDatatable.html @@ -8,7 +8,7 @@
    - +
    diff --git a/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html index e3fe91b87..2e0ce6ffe 100644 --- a/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html +++ b/app/docker/components/datatables/host-jobs-datatable/jobsDatatable.html @@ -16,7 +16,7 @@
    - +
    diff --git a/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js b/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js index 11be51be5..02016fcde 100644 --- a/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js +++ b/app/docker/components/datatables/host-jobs-datatable/jobsDatatableController.js @@ -17,6 +17,10 @@ angular.module('portainer.docker') } }; + this.onTextFilterChange = function() { + DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter); + }; + this.changeOrderBy = function (orderField) { this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; this.state.orderBy = orderField; @@ -130,6 +134,11 @@ angular.module('portainer.docker') this.updateStoredFilters(storedFilters.state.values); } this.filters.state.open = false; + + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + } }; function setDefaults(ctrl) { diff --git a/app/docker/components/datatables/images-datatable/imagesDatatable.html b/app/docker/components/datatables/images-datatable/imagesDatatable.html index a509ebd75..ebe7aa4b1 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatable.html +++ b/app/docker/components/datatables/images-datatable/imagesDatatable.html @@ -37,7 +37,7 @@
    - +
    diff --git a/app/docker/components/datatables/images-datatable/imagesDatatableController.js b/app/docker/components/datatables/images-datatable/imagesDatatableController.js index f5254a47b..c197ccc64 100644 --- a/app/docker/components/datatables/images-datatable/imagesDatatableController.js +++ b/app/docker/components/datatables/images-datatable/imagesDatatableController.js @@ -22,6 +22,10 @@ function (PaginationService, DatatableService) { } }; + this.onTextFilterChange = function() { + DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter); + }; + this.changeOrderBy = function(orderField) { this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; this.state.orderBy = orderField; @@ -86,6 +90,11 @@ function (PaginationService, DatatableService) { this.filters = storedFilters; } this.filters.usage.open = false; + + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + } }; function setDefaults(ctrl) { diff --git a/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html b/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html index 5b8b3660e..f4a65f6c2 100644 --- a/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html +++ b/app/docker/components/datatables/macvlan-nodes-datatable/macvlanNodesDatatable.html @@ -8,7 +8,7 @@
    - +
    diff --git a/app/docker/components/datatables/networks-datatable/networksDatatable.html b/app/docker/components/datatables/networks-datatable/networksDatatable.html index 1f3ca48cd..29b82b6a7 100644 --- a/app/docker/components/datatables/networks-datatable/networksDatatable.html +++ b/app/docker/components/datatables/networks-datatable/networksDatatable.html @@ -17,7 +17,7 @@
    - +
    diff --git a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html index 81c40551e..ea87ad303 100644 --- a/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html +++ b/app/docker/components/datatables/node-tasks-datatable/nodeTasksDatatable.html @@ -8,7 +8,7 @@
    - +
    diff --git a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html index 0a647868d..dac5c644b 100644 --- a/app/docker/components/datatables/nodes-datatable/nodesDatatable.html +++ b/app/docker/components/datatables/nodes-datatable/nodesDatatable.html @@ -8,7 +8,7 @@
    - +
    diff --git a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html index ed5249557..bb5df46d6 100644 --- a/app/docker/components/datatables/secrets-datatable/secretsDatatable.html +++ b/app/docker/components/datatables/secrets-datatable/secretsDatatable.html @@ -17,7 +17,7 @@
    - +
    diff --git a/app/docker/components/datatables/services-datatable/servicesDatatable.html b/app/docker/components/datatables/services-datatable/servicesDatatable.html index ba3d870ad..c982365a3 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatable.html +++ b/app/docker/components/datatables/services-datatable/servicesDatatable.html @@ -14,7 +14,7 @@ >
    - +
    diff --git a/app/docker/components/datatables/services-datatable/servicesDatatableController.js b/app/docker/components/datatables/services-datatable/servicesDatatableController.js index 38c39947b..b265863b4 100644 --- a/app/docker/components/datatables/services-datatable/servicesDatatableController.js +++ b/app/docker/components/datatables/services-datatable/servicesDatatableController.js @@ -16,6 +16,10 @@ function (PaginationService, DatatableService, EndpointProvider) { publicURL: EndpointProvider.endpointPublicURL() }; + this.onTextFilterChange = function() { + DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter); + }; + this.changeOrderBy = function(orderField) { this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; this.state.orderBy = orderField; @@ -109,6 +113,11 @@ function (PaginationService, DatatableService, EndpointProvider) { if (storedExpandedItems !== null) { this.expandItems(storedExpandedItems); } + + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + } }; function setDefaults(ctrl) { diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html index fd65be5fa..391852180 100644 --- a/app/docker/components/datatables/tasks-datatable/tasksDatatable.html +++ b/app/docker/components/datatables/tasks-datatable/tasksDatatable.html @@ -8,7 +8,7 @@
    - +
    diff --git a/app/docker/components/datatables/tasks-datatable/tasksDatatableController.js b/app/docker/components/datatables/tasks-datatable/tasksDatatableController.js index d23255869..368fa76d2 100644 --- a/app/docker/components/datatables/tasks-datatable/tasksDatatableController.js +++ b/app/docker/components/datatables/tasks-datatable/tasksDatatableController.js @@ -14,6 +14,10 @@ function (PaginationService, DatatableService) { selectedItems: [] }; + this.onTextFilterChange = function() { + DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter); + }; + this.changeOrderBy = function(orderField) { this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; this.state.orderBy = orderField; @@ -52,6 +56,11 @@ function (PaginationService, DatatableService) { this.state.reverseOrder = storedOrder.reverse; this.state.orderBy = storedOrder.orderBy; } + + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + } }; function setDefaults(ctrl) { diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html index 348832346..ca92dad87 100644 --- a/app/docker/components/datatables/volumes-datatable/volumesDatatable.html +++ b/app/docker/components/datatables/volumes-datatable/volumesDatatable.html @@ -17,7 +17,7 @@
    - +
    diff --git a/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js b/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js index 38b3ebbff..e7a88dd96 100644 --- a/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js +++ b/app/docker/components/datatables/volumes-datatable/volumesDatatableController.js @@ -22,6 +22,10 @@ function (PaginationService, DatatableService) { } }; + this.onTextFilterChange = function() { + DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter); + }; + this.changeOrderBy = function(orderField) { this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; this.state.orderBy = orderField; @@ -86,6 +90,11 @@ function (PaginationService, DatatableService) { this.filters = storedFilters; } this.filters.usage.open = false; + + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + } }; function setDefaults(ctrl) { diff --git a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html index e69cf040c..2094f938b 100644 --- a/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html +++ b/app/extensions/storidge/components/cluster-events-datatable/storidgeClusterEventsDatatable.html @@ -8,7 +8,7 @@
    - +
    diff --git a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html index 95e8433ba..2a0e35f97 100644 --- a/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html +++ b/app/extensions/storidge/components/nodes-datatable/storidgeNodesDatatable.html @@ -8,7 +8,7 @@
    - +
    diff --git a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html index f41789d26..594e1d079 100644 --- a/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html +++ b/app/extensions/storidge/components/profiles-datatable/storidgeProfilesDatatable.html @@ -14,7 +14,7 @@
    - +
    diff --git a/app/portainer/components/access-table/accessTable.html b/app/portainer/components/access-table/accessTable.html index bf2f366ce..a69147435 100644 --- a/app/portainer/components/access-table/accessTable.html +++ b/app/portainer/components/access-table/accessTable.html @@ -2,7 +2,7 @@
    - +
    diff --git a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html index ce6122f08..d83793598 100644 --- a/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html +++ b/app/portainer/components/datatables/endpoints-datatable/endpointsDatatable.html @@ -17,7 +17,7 @@
    - +
    diff --git a/app/portainer/components/datatables/genericDatatableController.js b/app/portainer/components/datatables/genericDatatableController.js index 7fa0143aa..4f7ef4994 100644 --- a/app/portainer/components/datatables/genericDatatableController.js +++ b/app/portainer/components/datatables/genericDatatableController.js @@ -11,6 +11,11 @@ function (PaginationService, DatatableService) { selectedItems: [] }; + + this.onTextFilterChange = function() { + DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter); + }; + this.changeOrderBy = function(orderField) { this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; this.state.orderBy = orderField; @@ -49,6 +54,12 @@ function (PaginationService, DatatableService) { this.state.reverseOrder = storedOrder.reverse; this.state.orderBy = storedOrder.orderBy; } + + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + this.onTextFilterChange(); + } }; function setDefaults(ctrl) { diff --git a/app/portainer/components/datatables/groups-datatable/groupsDatatable.html b/app/portainer/components/datatables/groups-datatable/groupsDatatable.html index 70d55de3d..003469270 100644 --- a/app/portainer/components/datatables/groups-datatable/groupsDatatable.html +++ b/app/portainer/components/datatables/groups-datatable/groupsDatatable.html @@ -17,7 +17,7 @@
    - +
    diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html index 3dc8f221d..601171eae 100644 --- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html +++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html @@ -17,7 +17,7 @@
    - +
    diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html index b91a8e1da..dc18ed8e1 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html @@ -17,7 +17,7 @@
    - +
    diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js index 1b223e286..a1d735964 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js @@ -11,6 +11,10 @@ function (PaginationService, DatatableService) { selectedItems: [] }; + this.onTextFilterChange = function() { + DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter); + }; + this.changeOrderBy = function(orderField) { this.state.reverseOrder = this.state.orderBy === orderField ? !this.state.reverseOrder : false; this.state.orderBy = orderField; @@ -49,6 +53,11 @@ function (PaginationService, DatatableService) { this.state.reverseOrder = storedOrder.reverse; this.state.orderBy = storedOrder.orderBy; } + + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + } }; function setDefaults(ctrl) { diff --git a/app/portainer/components/datatables/tags-datatable/tagsDatatable.html b/app/portainer/components/datatables/tags-datatable/tagsDatatable.html index c96b0fa17..e4eade921 100644 --- a/app/portainer/components/datatables/tags-datatable/tagsDatatable.html +++ b/app/portainer/components/datatables/tags-datatable/tagsDatatable.html @@ -14,7 +14,7 @@
    - +
    diff --git a/app/portainer/components/datatables/teams-datatable/teamsDatatable.html b/app/portainer/components/datatables/teams-datatable/teamsDatatable.html index 9141226ef..0d056e512 100644 --- a/app/portainer/components/datatables/teams-datatable/teamsDatatable.html +++ b/app/portainer/components/datatables/teams-datatable/teamsDatatable.html @@ -14,7 +14,7 @@
    - +
    diff --git a/app/portainer/components/datatables/users-datatable/usersDatatable.html b/app/portainer/components/datatables/users-datatable/usersDatatable.html index df2051f07..11692974d 100644 --- a/app/portainer/components/datatables/users-datatable/usersDatatable.html +++ b/app/portainer/components/datatables/users-datatable/usersDatatable.html @@ -14,7 +14,7 @@
    - +
    diff --git a/app/portainer/components/endpoint-list/endpoint-list-controller.js b/app/portainer/components/endpoint-list/endpoint-list-controller.js index bffbacc1d..62c284f56 100644 --- a/app/portainer/components/endpoint-list/endpoint-list-controller.js +++ b/app/portainer/components/endpoint-list/endpoint-list-controller.js @@ -1,5 +1,5 @@ -angular.module('portainer.app').controller('EndpointListController', [ - function EndpointListController() { +angular.module('portainer.app').controller('EndpointListController', ['DatatableService', + function EndpointListController(DatatableService) { var ctrl = this; ctrl.state = { textFilter: '', @@ -7,7 +7,7 @@ angular.module('portainer.app').controller('EndpointListController', [ }; ctrl.$onChanges = $onChanges; - ctrl.onFilterChanged = onFilterChanged; + ctrl.onTextFilterChange = onTextFilterChange; function $onChanges(changesObj) { handleEndpointsChange(changesObj.endpoints); @@ -21,15 +21,16 @@ angular.module('portainer.app').controller('EndpointListController', [ return; } - onFilterChanged(); + onTextFilterChange(); } - function onFilterChanged() { + function onTextFilterChange() { var filterValue = ctrl.state.textFilter; ctrl.state.filteredEndpoints = filterEndpoints( ctrl.endpoints, filterValue ); + DatatableService.setDataTableTextFilters(this.tableKey, filterValue); } function filterEndpoints(endpoints, filterValue) { @@ -57,5 +58,13 @@ angular.module('portainer.app').controller('EndpointListController', [ function convertStatusToString(status) { return status === 1 ? 'up' : 'down'; } + + this.$onInit = function() { + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + onTextFilterChange(); + } + }; } ]); diff --git a/app/portainer/components/endpoint-list/endpoint-list.js b/app/portainer/components/endpoint-list/endpoint-list.js index a622c3db4..e0ebc8062 100644 --- a/app/portainer/components/endpoint-list/endpoint-list.js +++ b/app/portainer/components/endpoint-list/endpoint-list.js @@ -5,6 +5,7 @@ angular.module('portainer.app').component('endpointList', { titleText: '@', titleIcon: '@', endpoints: '<', + tableKey: '@', dashboardAction: '<', snapshotAction: '<', showSnapshotAction: '<', diff --git a/app/portainer/components/endpoint-list/endpointList.html b/app/portainer/components/endpoint-list/endpointList.html index 9deecf8ca..f429be03f 100644 --- a/app/portainer/components/endpoint-list/endpointList.html +++ b/app/portainer/components/endpoint-list/endpointList.html @@ -20,7 +20,7 @@ type="text" class="searchInput" ng-model="$ctrl.state.textFilter" - ng-change="$ctrl.onFilterChanged()" + ng-change="$ctrl.onTextFilterChange()" placeholder="Search by name, group, tag, status, URL..." auto-focus> diff --git a/app/portainer/components/group-association-table/groupAssociationTable.html b/app/portainer/components/group-association-table/groupAssociationTable.html index 18e024b77..c457bd295 100644 --- a/app/portainer/components/group-association-table/groupAssociationTable.html +++ b/app/portainer/components/group-association-table/groupAssociationTable.html @@ -2,7 +2,7 @@
    - +
    diff --git a/app/portainer/components/template-list/template-list-controller.js b/app/portainer/components/template-list/template-list-controller.js new file mode 100644 index 000000000..48323fd0d --- /dev/null +++ b/app/portainer/components/template-list/template-list-controller.js @@ -0,0 +1,56 @@ +angular.module('portainer.app').controller('TemplateListController', ['DatatableService', + function TemplateListController(DatatableService) { + var ctrl = this; + + this.state = { + textFilter: '', + selectedCategory: '', + categories: [], + showContainerTemplates: true + }; + + this.onTextFilterChange = function() { + DatatableService.setDataTableTextFilters(this.tableKey, this.state.textFilter); + } + + 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(); + + var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); + if (textFilter !== null) { + this.state.textFilter = textFilter; + } + }; + } +]); diff --git a/app/portainer/components/template-list/template-list.js b/app/portainer/components/template-list/template-list.js index e58a9deda..d4b058ca0 100644 --- a/app/portainer/components/template-list/template-list.js +++ b/app/portainer/components/template-list/template-list.js @@ -1,54 +1,11 @@ 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(); - }; - }, + controller: 'TemplateListController', bindings: { titleText: '@', titleIcon: '@', templates: '<', + tableKey: '@', selectAction: '<', deleteAction: '<', showSwarmStacks: '<', diff --git a/app/portainer/components/template-list/templateList.html b/app/portainer/components/template-list/templateList.html index 76aa514fb..1f3d818a2 100644 --- a/app/portainer/components/template-list/templateList.html +++ b/app/portainer/components/template-list/templateList.html @@ -37,7 +37,7 @@
    - +
    diff --git a/app/portainer/services/datatableService.js b/app/portainer/services/datatableService.js index 2842c948d..6b2e08224 100644 --- a/app/portainer/services/datatableService.js +++ b/app/portainer/services/datatableService.js @@ -13,6 +13,14 @@ function DatatableServiceFactory(LocalStorage) { return LocalStorage.getDataTableSettings(key); }; + service.setDataTableTextFilters = function(key, filters) { + LocalStorage.storeDataTableTextFilters(key, filters); + }; + + service.getDataTableTextFilters = function(key) { + return LocalStorage.getDataTableTextFilters(key); + }; + service.setDataTableFilters = function(key, filters) { LocalStorage.storeDataTableFilters(key, filters); }; diff --git a/app/portainer/services/localStorage.js b/app/portainer/services/localStorage.js index 2988ebd9d..bc63fec00 100644 --- a/app/portainer/services/localStorage.js +++ b/app/portainer/services/localStorage.js @@ -65,6 +65,12 @@ angular.module('portainer.app') storeDataTableOrder: function(key, data) { localStorageService.set('datatable_order_' + key, data); }, + getDataTableTextFilters: function(key) { + return localStorageService.get('datatable_text_filter_' + key); + }, + storeDataTableTextFilters: function(key, data) { + localStorageService.set('datatable_text_filter_' + key, data); + }, getDataTableFilters: function(key) { return localStorageService.get('datatable_filters_' + key); }, diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html index 86767459e..49641ec85 100644 --- a/app/portainer/views/home/home.html +++ b/app/portainer/views/home/home.html @@ -40,7 +40,7 @@
    Date: Fri, 7 Dec 2018 16:19:58 +1300 Subject: [PATCH 78/93] feat(build-system): add support for AppVeyor CI (#2449) --- appveyor-ci.yml | 44 +++++++++++++++++++++++ appveyor-release.yml | 61 ++++++++++++++++++++++++++++++++ build/build_binary.ps1 | 24 +++++++++++++ build/build_binary.sh | 14 ++++++++ build/build_in_container.sh | 10 ------ build/ci-linux.sh | 28 +++++++++++++++ build/ci-windows.ps1 | 36 +++++++++++++++++++ build/download_docker_binary.ps1 | 13 +++++++ build/download_docker_binary.sh | 2 +- build/release-linux.sh | 45 +++++++++++++++++++++++ build/release-windows.ps1 | 41 +++++++++++++++++++++ gruntfile.js | 52 ++++++++++++++++++--------- 12 files changed, 343 insertions(+), 27 deletions(-) create mode 100644 appveyor-ci.yml create mode 100644 appveyor-release.yml create mode 100644 build/build_binary.ps1 create mode 100755 build/build_binary.sh delete mode 100755 build/build_in_container.sh create mode 100644 build/ci-linux.sh create mode 100644 build/ci-windows.ps1 create mode 100644 build/download_docker_binary.ps1 create mode 100644 build/release-linux.sh create mode 100644 build/release-windows.ps1 diff --git a/appveyor-ci.yml b/appveyor-ci.yml new file mode 100644 index 000000000..4cc36adb8 --- /dev/null +++ b/appveyor-ci.yml @@ -0,0 +1,44 @@ +version: 1.0.{build} +image: + - Visual Studio 2017 + - Ubuntu +environment: + matrix: + - ARCH: amd64 + - ARCH: arm + - ARCH: arm64 + - ARCH: ppc64le + - ARCH: s390x + DOCKER_USER: + secure: JapmC7j5F0mY3j/MVzU+Cw== + DOCKER_PASS: + secure: QGlCLNWzPD0HL8ipkohVic45/yU3bVOdjn0IiV6NnSQ= +matrix: + exclude: + - image: Visual Studio 2017 + ARCH: arm + - image: Visual Studio 2017 + ARCH: arm64 + - image: Visual Studio 2017 + ARCH: ppc64le + - image: Visual Studio 2017 + ARCH: s390x +branches: + except: + - master +stack: + - node 9, go 1.10 +install: + - yarn install + - npm install -g rebase-docker-image +init: + - sh: export IMAGE=linux + - cmd: SET IMAGE=windows + - ps: >- + if (!(Test-Path ~/.docker)) { mkdir ~/.docker }; + Set-Content -Value '{ "experimental": "enabled" }' -Path ~/.docker/config.json -Encoding Ascii +build_script: + - sh: yarn grunt release:$IMAGE:$ARCH + - cmd: yarn grunt release:%IMAGE%:%ARCH% + - sh: sudo bash build/ci-linux.sh $IMAGE $ARCH $DOCKER_USER $DOCKER_PASS $APPVEYOR_REPO_BRANCH $APPVEYOR_PULL_REQUEST_NUMBER + - cmd: powershell -Command "& .\\build\\ci-windows.ps1" \ No newline at end of file diff --git a/appveyor-release.yml b/appveyor-release.yml new file mode 100644 index 000000000..348897690 --- /dev/null +++ b/appveyor-release.yml @@ -0,0 +1,61 @@ +version: 1.0.{build} +image: + - Visual Studio 2017 + - Ubuntu +environment: + matrix: + - ARCH: amd64 + - ARCH: arm + - ARCH: arm64 + - ARCH: ppc64le + - ARCH: s390x + DOCKER_USER: + secure: JapmC7j5F0mY3j/MVzU+Cw== + DOCKER_PASS: + secure: QGlCLNWzPD0HL8ipkohVic45/yU3bVOdjn0IiV6NnSQ= + PORTAINER_VERSION: "1.19.2" +matrix: + exclude: + - image: Visual Studio 2017 + ARCH: arm + - image: Visual Studio 2017 + ARCH: arm64 + - image: Visual Studio 2017 + ARCH: ppc64le + - image: Visual Studio 2017 + ARCH: s390x +branches: + only: + - master +stack: node 9, go 1.10 +artifacts: + - path: 'portainer-$(PORTAINER_VERSION)-$(IMAGE)-$(ARCH).tar.gz' + type: file + - path: 'portainer-$(PORTAINER_VERSION)-$(IMAGE)-$(ARCH)-checksum.txt' + type: file +install: + - yarn install + - npm install -g rebase-docker-image +init: + - sh: export IMAGE=linux + - cmd: SET IMAGE=windows + - ps: >- + if (!(Test-Path ~/.docker)) { mkdir ~/.docker } + Set-Content -Value '{ "experimental": "enabled" }' -Path ~/.docker/config.json -Encoding Ascii +build_script: + - sh: yarn grunt release:$IMAGE:$ARCH + - cmd: yarn grunt release:%IMAGE%:%ARCH% + - sh: sudo bash build/release-linux.sh $IMAGE $ARCH $PORTAINER_VERSION $DOCKER_USER $DOCKER_PASS + - cmd: powershell -Command "& .\\build\\release-windows.ps1" +test: off +deploy: + release: Release $(PORTAINER_VERSION) + description: '' + provider: GitHub + auth_token: + secure: BRYVGj94QlFBCMoO8yhSu+AGqKNV1+03LJEFrNUTRzo5erXfUHUIi/rgztnxfSGW + artifact: /portainer-$(PORTAINER_VERSION)-$(IMAGE)-$(ARCH).*/ + draft: true + prerelease: false + on: + branch: master diff --git a/build/build_binary.ps1 b/build/build_binary.ps1 new file mode 100644 index 000000000..5d486c1f4 --- /dev/null +++ b/build/build_binary.ps1 @@ -0,0 +1,24 @@ +param ( + [string]$platform, + [string]$arch +) + +$ErrorActionPreference = "Stop"; + +$binary = "portainer.exe" +$project_path = (Get-ITEM -Path env:APPVEYOR_BUILD_FOLDER).Value + +Set-Item env:GOPATH "$project_path\api" + +New-Item -Name dist -Path "$project_path" -ItemType Directory | Out-Null +New-Item -Name portainer -Path "$project_path\api\src\github.com\" -ItemType Directory | Out-Null + +Copy-Item -Path "$project_path\api" -Destination "$project_path\api\src\github.com\portainer" -Recurse -Force -ErrorAction:SilentlyContinue +Rename-Item -Path "$project_path\api\src\github.com\portainer\api" -NewName "portainer" -ErrorAction:SilentlyContinue + +Set-Location -Path "$project_path\api\cmd\portainer" + +C:\go\bin\go.exe get -t -d -v ./... +C:\go\bin\go.exe build -v + +Move-Item -Path "$project_path\api\cmd\portainer\$($binary)" -Destination "$project_path\dist" diff --git a/build/build_binary.sh b/build/build_binary.sh new file mode 100755 index 000000000..ae57b007b --- /dev/null +++ b/build/build_binary.sh @@ -0,0 +1,14 @@ +export GOPATH="$APPVEYOR_BUILD_FOLDER/api" +binary="portainer" + +mkdir -p dist +mkdir -p api/src/github.com/portainer/ + +cp -R api/ api/src/github.com/portainer/portainer/ + +cd 'api/cmd/portainer' + +go get -t -d -v ./... +GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' + +mv "$APPVEYOR_BUILD_FOLDER/api/cmd/portainer/$binary" "$APPVEYOR_BUILD_FOLDER/dist/portainer" diff --git a/build/build_in_container.sh b/build/build_in_container.sh deleted file mode 100755 index a827bddfd..000000000 --- a/build/build_in_container.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env sh - -binary="portainer-$1-$2" - -mkdir -p dist - -docker run --rm -tv "$(pwd)/api:/src" -e BUILD_GOOS="$1" -e BUILD_GOARCH="$2" portainer/golang-builder:cross-platform /src/cmd/portainer - -mv "api/cmd/portainer/$binary" dist/ -#sha256sum "dist/$binary" > portainer-checksum.txt diff --git a/build/ci-linux.sh b/build/ci-linux.sh new file mode 100644 index 000000000..1308d568d --- /dev/null +++ b/build/ci-linux.sh @@ -0,0 +1,28 @@ +IMAGE="$1" +ARCH="$2" +DOCKER_USER="$3" +DOCKER_PASS="$4" +APPVEYOR_REPO_BRANCH="$5" +APPVEYOR_PULL_REQUEST_NUMBER="$6" + +if [ "${APPVEYOR_PULL_REQUEST_NUMBER}" ]; then + tag="pr${APPVEYOR_PULL_REQUEST_NUMBER}-$IMAGE-$ARCH" + manifest="pr${APPVEYOR_PULL_REQUEST_NUMBER}" +else + tag="${APPVEYOR_REPO_BRANCH}-$IMAGE-$ARCH" + manifest="${APPVEYOR_REPO_BRANCH}" +fi + +docker build -t "portainer/portainer:$tag" -f build/linux/Dockerfile . +docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}" +docker push "portainer/portainer:$tag" + +if [ "${2}" == 'amd64' ] ; then + docker -D manifest create "portainer/portainer:$manifest" \ + "portainer/portainer:$manifest-linux-amd64" \ + "portainer/portainer:$manifest-windows-amd64" \ + "portainer/portainer:$manifest-windows1709-amd64" \ + "portainer/portainer:$manifest-windows1803-amd64" + + docker manifest push "portainer/portainer:$manifest" +fi diff --git a/build/ci-windows.ps1 b/build/ci-windows.ps1 new file mode 100644 index 000000000..73a8720b2 --- /dev/null +++ b/build/ci-windows.ps1 @@ -0,0 +1,36 @@ +$ErrorActionPreference = "Stop"; + +$pull_request_number = $ENV:APPVEYOR_PULL_REQUEST_NUMBER +$branch_name = $ENV:APPVEYOR_REPO_BRANCH +$os = (Get-Item ENV:IMAGE).Value +$arch = (Get-Item ENV:ARCH).Value + +if ($pull_request_number) { + $tag = "pr$($pull_request_number)-$($os)-$($arch)" + $tag_1709 = "pr$($pull_request_number)-$($os)1709-$($arch)" + $tag_1803 = "pr$($pull_request_number)-$($os)1803-$($arch)" +} else { + $tag = "$($branch_name)-$($os)-$($arch)" + $tag_1709 = "$($branch_name)-$($os)1709-$($arch)" + $tag_1803 = "$($branch_name)-$($os)1803-$($arch)" +} + +docker build ` + -t portainer/portainer:$tag ` + -f build\windows2016\nanoserver\Dockerfile . + +docker login ` + -u "$((Get-Item ENV:DOCKER_USER).Value)" ` + -p "$((Get-Item ENV:DOCKER_PASS).Value)" + +docker push portainer/portainer:$tag + +rebase-docker-image ` + portainer/portainer:$tag ` + -t portainer/portainer:$tag_1709 ` + -b microsoft/nanoserver:1709 + +rebase-docker-image ` + portainer/portainer:$tag ` + -t portainer/portainer:$tag_1803 ` + -b microsoft/nanoserver:1803 diff --git a/build/download_docker_binary.ps1 b/build/download_docker_binary.ps1 new file mode 100644 index 000000000..7ebb41ec0 --- /dev/null +++ b/build/download_docker_binary.ps1 @@ -0,0 +1,13 @@ +param ( + [string]$docker_version +) + +$ErrorActionPreference = "Stop"; + +New-Item -Path "docker-binary" -ItemType Directory | Out-Null + +$download_folder = "docker-binary" + +Invoke-WebRequest -O "$($download_folder)/docker-binaries.zip" "https://download.docker.com/win/static/stable/x86_64/docker-$($docker_version).zip" +Expand-Archive -Path "$($download_folder)/docker-binaries.zip" -DestinationPath "$($download_folder)" +Move-Item -Path "$($download_folder)/docker/docker.exe" -Destination "dist" \ No newline at end of file diff --git a/build/download_docker_binary.sh b/build/download_docker_binary.sh index cc9b94b00..bd5e01c10 100755 --- a/build/download_docker_binary.sh +++ b/build/download_docker_binary.sh @@ -19,4 +19,4 @@ else mv "${DOWNLOAD_FOLDER}/docker/docker" dist/ fi -exit 0 +exit 0 \ No newline at end of file diff --git a/build/release-linux.sh b/build/release-linux.sh new file mode 100644 index 000000000..bce48b84d --- /dev/null +++ b/build/release-linux.sh @@ -0,0 +1,45 @@ +IMAGE="$1" +ARCH="$2" +PORTAINER_VERSION="$3" +DOCKER_USER="$4" +DOCKER_PASS="$5" + +mkdir -pv portainer +cp -r dist/* portainer + +tar cvpfz "portainer-$PORTAINER_VERSION-$IMAGE-$ARCH.tar.gz" portainer +sha256sum --tag "portainer-$PORTAINER_VERSION-$IMAGE-$ARCH.tar.gz" > "portainer-$PORTAINER_VERSION-$IMAGE-$ARCH-checksum.txt" + +tag="$IMAGE-$ARCH" + +docker build -t "portainer/portainer:$IMAGE-$ARCH-$PORTAINER_VERSION" -f build/linux/Dockerfile . +docker tag "portainer/portainer:$IMAGE-$ARCH-$PORTAINER_VERSION" "portainer/portainer:$IMAGE-$ARCH" +docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" +docker push "portainer/portainer:$IMAGE-$ARCH-$PORTAINER_VERSION" +docker push "portainer/portainer:$IMAGE-$ARCH" + +if [ "${2}" == 's390x' ] ; then + docker -D manifest create "portainer/portainer:latest" \ + "portainer/portainer:linux-amd64" \ + "portainer/portainer:linux-arm" \ + "portainer/portainer:linux-arm64" \ + "portainer/portainer:linux-ppc64le" \ + "portainer/portainer:linux-s390x" \ + "portainer/portainer:windows-amd64" \ + "portainer/portainer:windows1709-amd64" \ + "portainer/portainer:windows1803-amd64" + + docker manifest push "portainer/portainer:latest" + + docker -D manifest create "portainer/portainer:${PORTAINER_VERSION}" \ + "portainer/portainer:linux-amd64-${PORTAINER_VERSION}" \ + "portainer/portainer:linux-arm-${PORTAINER_VERSION}" \ + "portainer/portainer:linux-arm64-${PORTAINER_VERSION}" \ + "portainer/portainer:linux-ppc64le-${PORTAINER_VERSION}" \ + "portainer/portainer:linux-s390x-${PORTAINER_VERSION}" \ + "portainer/portainer:windows-amd64-${PORTAINER_VERSION}" \ + "portainer/portainer:windows1709-amd64-${PORTAINER_VERSION}" \ + "portainer/portainer:windows1803-amd64-${PORTAINER_VERSION}" + + docker manifest push "portainer/portainer:${PORTAINER_VERSION}" +fi diff --git a/build/release-windows.ps1 b/build/release-windows.ps1 new file mode 100644 index 000000000..a775f24cd --- /dev/null +++ b/build/release-windows.ps1 @@ -0,0 +1,41 @@ +$ErrorActionPreference = "Stop"; +$binary = "portainer-$((Get-Item ENV:PORTAINER_VERSION).Value)-$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value).tar.gz" + +New-Item -Path portainer -ItemType Directory | Out-Null +Copy-Item -Path dist\* -Destination portainer -Recurse +tar cvpfz $binary portainer + +(Get-FileHash $binary).Hash > "portainer-$((Get-Item ENV:PORTAINER_VERSION).Value)-$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value)-checksum.txt" + +docker build ` + -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) ` + -f build\windows2016\nanoserver\Dockerfile . + +docker tag portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) + +docker login ` + -u "$((Get-Item ENV:DOCKER_USER).Value)" ` + -p "$((Get-Item ENV:DOCKER_PASS).Value)" + +docker push portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) +docker push portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) + +rebase-docker-image ` + portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) ` + -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)1709-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) ` + -b microsoft/nanoserver:1709 + +rebase-docker-image ` + portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) ` + -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)1709-$((Get-Item ENV:ARCH).Value) ` + -b microsoft/nanoserver:1709 + +rebase-docker-image ` + portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) ` + -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)1803-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) ` + -b microsoft/nanoserver:1803 + +rebase-docker-image ` + portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) ` + -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)1803-$((Get-Item ENV:ARCH).Value) ` + -b microsoft/nanoserver:1803 diff --git a/gruntfile.js b/gruntfile.js index a73549c7f..e65801918 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -259,14 +259,24 @@ gruntfile_cfg.replace = { }; function shell_buildBinary(p, a) { - var binfile = 'dist/portainer-' + p + '-' + a; - return [ - 'if [ -f ' + ((p === 'windows') ? binfile + '.exe' : binfile) + ' ]; then', - 'echo "Portainer binary exists";', - 'else', - 'build/build_in_container.sh ' + p + ' ' + a + ';', - 'fi' - ].join(' '); + var binfile = 'portainer-'+p+'-'+a; + if (p === "linux") { + return [ + 'if [ -f '+(binfile)+' ]; then', + 'echo "Portainer binary exists";', + 'else', + 'build/build_binary.sh ' + p + ' ' + a + ';', + 'fi' + ].join (' ') + } else { + return [ + 'powershell -Command "& {if (Get-Item -Path '+(binfile+'.exe')+' -ErrorAction:SilentlyContinue) {', + 'Write-Host "Portainer binary exists"', + '} else {', + '& ".\\build\\build_binary.ps1" -platform '+ p +' -arch '+ a +'', + '}}"' + ].join(' ') + } } function shell_run(arch) { @@ -281,14 +291,24 @@ function shell_downloadDockerBinary(p, a) { var as = { 'amd64': 'x86_64', 'arm': 'armhf', 'arm64': 'aarch64' }; var ip = ((ps[p] === undefined) ? p : ps[p]); var ia = ((as[a] === undefined) ? a : as[a]); - var binaryVersion = ((p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>')); - return [ - 'if [ -f ' + ((p === 'windows') ? 'dist/docker.exe' : 'dist/docker') + ' ]; then', - 'echo "Docker binary exists";', - 'else', - 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';', - 'fi' - ].join(' '); + var binaryVersion = (( p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>' )); + if (p === "linux") { + return [ + 'if [ -f '+('dist/docker')+' ]; then', + 'echo "Docker binary exists";', + 'else', + 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';', + 'fi' + ].join (' ') + } else { + return [ + 'powershell -Command "& {if (Get-Item -Path '+('dist/docker.exe')+' -ErrorAction:SilentlyContinue) {', + 'Write-Host "Docker binary exists"', + '} else {', + '& ".\\build\\download_docker_binary.ps1" -docker_version '+ binaryVersion +'', + '}}"' + ].join(' ') + } } gruntfile_cfg.shell = { From 79c24ced96ca4842688068563a247c2e43efa928 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sun, 9 Dec 2018 16:08:36 +1300 Subject: [PATCH 79/93] fix(build-system): fix local build system after appveyor introduction (#2528) --- appveyor-ci.yml | 12 ++--- appveyor-release.yml | 6 +-- build/build_binary.ps1 | 9 +--- build/build_binary.sh | 7 +-- build/build_binary_appveyor.ps1 | 24 +++++++++ build/build_binary_appveyor.sh | 14 ++++++ build/ci-linux.sh | 0 build/ci-windows.ps1 | 0 build/download_docker_binary.ps1 | 0 build/release-linux.sh | 0 build/release-windows.ps1 | 0 gruntfile.js | 85 +++++++++++++++++++++----------- 12 files changed, 106 insertions(+), 51 deletions(-) mode change 100644 => 100755 build/build_binary.ps1 create mode 100755 build/build_binary_appveyor.ps1 create mode 100755 build/build_binary_appveyor.sh mode change 100644 => 100755 build/ci-linux.sh mode change 100644 => 100755 build/ci-windows.ps1 mode change 100644 => 100755 build/download_docker_binary.ps1 mode change 100644 => 100755 build/release-linux.sh mode change 100644 => 100755 build/release-windows.ps1 diff --git a/appveyor-ci.yml b/appveyor-ci.yml index 4cc36adb8..ab1188611 100644 --- a/appveyor-ci.yml +++ b/appveyor-ci.yml @@ -1,11 +1,11 @@ version: 1.0.{build} -image: +image: - Visual Studio 2017 - Ubuntu environment: matrix: - ARCH: amd64 - - ARCH: arm + - ARCH: arm - ARCH: arm64 - ARCH: ppc64le - ARCH: s390x @@ -26,7 +26,7 @@ matrix: branches: except: - master -stack: +stack: - node 9, go 1.10 install: - yarn install @@ -38,7 +38,7 @@ init: if (!(Test-Path ~/.docker)) { mkdir ~/.docker }; Set-Content -Value '{ "experimental": "enabled" }' -Path ~/.docker/config.json -Encoding Ascii build_script: - - sh: yarn grunt release:$IMAGE:$ARCH - - cmd: yarn grunt release:%IMAGE%:%ARCH% + - sh: yarn grunt appveyorbuild:$IMAGE:$ARCH + - cmd: yarn grunt appveyorbuild:%IMAGE%:%ARCH% - sh: sudo bash build/ci-linux.sh $IMAGE $ARCH $DOCKER_USER $DOCKER_PASS $APPVEYOR_REPO_BRANCH $APPVEYOR_PULL_REQUEST_NUMBER - - cmd: powershell -Command "& .\\build\\ci-windows.ps1" \ No newline at end of file + - cmd: powershell -Command "& .\\build\\ci-windows.ps1" diff --git a/appveyor-release.yml b/appveyor-release.yml index 348897690..6293e6c90 100644 --- a/appveyor-release.yml +++ b/appveyor-release.yml @@ -5,7 +5,7 @@ image: environment: matrix: - ARCH: amd64 - - ARCH: arm + - ARCH: arm - ARCH: arm64 - ARCH: ppc64le - ARCH: s390x @@ -43,8 +43,8 @@ init: if (!(Test-Path ~/.docker)) { mkdir ~/.docker } Set-Content -Value '{ "experimental": "enabled" }' -Path ~/.docker/config.json -Encoding Ascii build_script: - - sh: yarn grunt release:$IMAGE:$ARCH - - cmd: yarn grunt release:%IMAGE%:%ARCH% + - sh: yarn grunt appveyorbuild:$IMAGE:$ARCH + - cmd: yarn grunt appveyorbuild:%IMAGE%:%ARCH% - sh: sudo bash build/release-linux.sh $IMAGE $ARCH $PORTAINER_VERSION $DOCKER_USER $DOCKER_PASS - cmd: powershell -Command "& .\\build\\release-windows.ps1" test: off diff --git a/build/build_binary.ps1 b/build/build_binary.ps1 old mode 100644 new mode 100755 index 5d486c1f4..f444f776e --- a/build/build_binary.ps1 +++ b/build/build_binary.ps1 @@ -8,17 +8,10 @@ $ErrorActionPreference = "Stop"; $binary = "portainer.exe" $project_path = (Get-ITEM -Path env:APPVEYOR_BUILD_FOLDER).Value -Set-Item env:GOPATH "$project_path\api" - New-Item -Name dist -Path "$project_path" -ItemType Directory | Out-Null -New-Item -Name portainer -Path "$project_path\api\src\github.com\" -ItemType Directory | Out-Null - -Copy-Item -Path "$project_path\api" -Destination "$project_path\api\src\github.com\portainer" -Recurse -Force -ErrorAction:SilentlyContinue -Rename-Item -Path "$project_path\api\src\github.com\portainer\api" -NewName "portainer" -ErrorAction:SilentlyContinue - Set-Location -Path "$project_path\api\cmd\portainer" C:\go\bin\go.exe get -t -d -v ./... C:\go\bin\go.exe build -v -Move-Item -Path "$project_path\api\cmd\portainer\$($binary)" -Destination "$project_path\dist" +Move-Item -Path "$($binary)" -Destination "..\..\..\dist" diff --git a/build/build_binary.sh b/build/build_binary.sh index ae57b007b..124e3fa33 100755 --- a/build/build_binary.sh +++ b/build/build_binary.sh @@ -1,14 +1,9 @@ -export GOPATH="$APPVEYOR_BUILD_FOLDER/api" binary="portainer" - mkdir -p dist -mkdir -p api/src/github.com/portainer/ - -cp -R api/ api/src/github.com/portainer/portainer/ cd 'api/cmd/portainer' go get -t -d -v ./... GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' -mv "$APPVEYOR_BUILD_FOLDER/api/cmd/portainer/$binary" "$APPVEYOR_BUILD_FOLDER/dist/portainer" +mv "${binary}" "../../../dist/portainer" diff --git a/build/build_binary_appveyor.ps1 b/build/build_binary_appveyor.ps1 new file mode 100755 index 000000000..5d486c1f4 --- /dev/null +++ b/build/build_binary_appveyor.ps1 @@ -0,0 +1,24 @@ +param ( + [string]$platform, + [string]$arch +) + +$ErrorActionPreference = "Stop"; + +$binary = "portainer.exe" +$project_path = (Get-ITEM -Path env:APPVEYOR_BUILD_FOLDER).Value + +Set-Item env:GOPATH "$project_path\api" + +New-Item -Name dist -Path "$project_path" -ItemType Directory | Out-Null +New-Item -Name portainer -Path "$project_path\api\src\github.com\" -ItemType Directory | Out-Null + +Copy-Item -Path "$project_path\api" -Destination "$project_path\api\src\github.com\portainer" -Recurse -Force -ErrorAction:SilentlyContinue +Rename-Item -Path "$project_path\api\src\github.com\portainer\api" -NewName "portainer" -ErrorAction:SilentlyContinue + +Set-Location -Path "$project_path\api\cmd\portainer" + +C:\go\bin\go.exe get -t -d -v ./... +C:\go\bin\go.exe build -v + +Move-Item -Path "$project_path\api\cmd\portainer\$($binary)" -Destination "$project_path\dist" diff --git a/build/build_binary_appveyor.sh b/build/build_binary_appveyor.sh new file mode 100755 index 000000000..ae57b007b --- /dev/null +++ b/build/build_binary_appveyor.sh @@ -0,0 +1,14 @@ +export GOPATH="$APPVEYOR_BUILD_FOLDER/api" +binary="portainer" + +mkdir -p dist +mkdir -p api/src/github.com/portainer/ + +cp -R api/ api/src/github.com/portainer/portainer/ + +cd 'api/cmd/portainer' + +go get -t -d -v ./... +GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' + +mv "$APPVEYOR_BUILD_FOLDER/api/cmd/portainer/$binary" "$APPVEYOR_BUILD_FOLDER/dist/portainer" diff --git a/build/ci-linux.sh b/build/ci-linux.sh old mode 100644 new mode 100755 diff --git a/build/ci-windows.ps1 b/build/ci-windows.ps1 old mode 100644 new mode 100755 diff --git a/build/download_docker_binary.ps1 b/build/download_docker_binary.ps1 old mode 100644 new mode 100755 diff --git a/build/release-linux.sh b/build/release-linux.sh old mode 100644 new mode 100755 diff --git a/build/release-windows.ps1 b/build/release-windows.ps1 old mode 100644 new mode 100755 diff --git a/gruntfile.js b/gruntfile.js index e65801918..665e669a3 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -50,6 +50,11 @@ module.exports = function(grunt) { grunt.task.registerTask('release', 'release::', function(p, a) { grunt.task.run(['config:prod', 'clean:all', 'shell:buildBinary:' + p + ':' + a, 'shell:downloadDockerBinary:' + p + ':' + a, 'before-copy', 'copy:assets', 'after-copy']); }); + + grunt.task.registerTask('appveyorbuild', 'appveyorbuild::', function(p, a) { + grunt.task.run(['config:prod', 'clean:all', 'shell:buildBinaryOnAppveyor:' + p + ':' + a, 'shell:downloadDockerBinary:' + p + ':' + a, 'before-copy', 'copy:assets', 'after-copy']); + }); + grunt.registerTask('lint', ['eslint']); grunt.registerTask('run-dev', ['build', 'shell:run:' + arch, 'watch:build']); grunt.registerTask('clear', ['clean:app']); @@ -259,26 +264,49 @@ gruntfile_cfg.replace = { }; function shell_buildBinary(p, a) { - var binfile = 'portainer-'+p+'-'+a; - if (p === "linux") { - return [ - 'if [ -f '+(binfile)+' ]; then', - 'echo "Portainer binary exists";', - 'else', - 'build/build_binary.sh ' + p + ' ' + a + ';', - 'fi' - ].join (' ') - } else { - return [ - 'powershell -Command "& {if (Get-Item -Path '+(binfile+'.exe')+' -ErrorAction:SilentlyContinue) {', - 'Write-Host "Portainer binary exists"', - '} else {', - '& ".\\build\\build_binary.ps1" -platform '+ p +' -arch '+ a +'', - '}}"' - ].join(' ') - } + var binfile = 'portainer-' + p + '-' + a; + if (p === 'linux') { + return [ + 'if [ -f ' + (binfile) + ' ]; then', + 'echo "Portainer binary exists";', + 'else', + 'build/build_binary.sh ' + p + ' ' + a + ';', + 'fi' + ].join(' '); + } else { + return [ + 'powershell -Command "& {if (Get-Item -Path ' + binfile + '.exe -ErrorAction:SilentlyContinue) {', + 'Write-Host "Portainer binary exists"', + '} else {', + '& ".\\build\\build_binary.ps1" -platform ' + p + ' -arch ' + a + '', + '}}"' + ].join(' '); + } } +function shell_buildBinaryOnAppveyor(p, a) { + var binfile = 'portainer-' + p + '-' + a; + if (p === 'linux') { + return [ + 'if [ -f ' + (binfile) + ' ]; then', + 'echo "Portainer binary exists";', + 'else', + 'build/build_binary_appveyor.sh ' + p + ' ' + a + ';', + 'fi' + ].join(' '); + } else { + return [ + 'powershell -Command "& {if (Get-Item -Path ' + binfile + '.exe -ErrorAction:SilentlyContinue) {', + 'Write-Host "Portainer binary exists"', + '} else {', + '& ".\\build\\build_binary_appveyor.ps1" -platform ' + p + ' -arch ' + a + '', + '}}"' + ].join(' '); + } +} + + + function shell_run(arch) { return [ 'docker rm -f portainer', @@ -291,28 +319,29 @@ function shell_downloadDockerBinary(p, a) { var as = { 'amd64': 'x86_64', 'arm': 'armhf', 'arm64': 'aarch64' }; var ip = ((ps[p] === undefined) ? p : ps[p]); var ia = ((as[a] === undefined) ? a : as[a]); - var binaryVersion = (( p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>' )); - if (p === "linux") { + var binaryVersion = ((p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>')); + if (p === 'linux') { return [ - 'if [ -f '+('dist/docker')+' ]; then', - 'echo "Docker binary exists";', + 'if [ -f dist/docker ]; then', + 'echo "Docker binary exists";', 'else', - 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';', + 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';', 'fi' - ].join (' ') + ].join(' '); } else { return [ - 'powershell -Command "& {if (Get-Item -Path '+('dist/docker.exe')+' -ErrorAction:SilentlyContinue) {', - 'Write-Host "Docker binary exists"', + 'powershell -Command "& {if (Get-Item -Path dist/docker.exe -ErrorAction:SilentlyContinue) {', + 'Write-Host "Docker binary exists"', '} else {', - '& ".\\build\\download_docker_binary.ps1" -docker_version '+ binaryVersion +'', + '& ".\\build\\download_docker_binary.ps1" -docker_version ' + binaryVersion + '', '}}"' - ].join(' ') + ].join(' '); } } gruntfile_cfg.shell = { buildBinary: { command: shell_buildBinary }, + buildBinaryOnAppveyor: { command: shell_buildBinaryOnAppveyor }, run: { command: shell_run }, downloadDockerBinary: { command: shell_downloadDockerBinary } }; From f5dc66387902419acfd33e1fee6f878f1e91703a Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sun, 9 Dec 2018 16:32:12 +1300 Subject: [PATCH 80/93] fix(build-system): revert appveyor integration * Revert "fix(build-system): fix local build system after appveyor introduction (#2528)" This reverts commit 79c24ced96ca4842688068563a247c2e43efa928. * Revert "feat(build-system): add support for AppVeyor CI (#2449)" This reverts commit 65979709e94270b8d07f06f8e6a343f25c12e6b9. --- build/build_binary.ps1 | 17 ------- build/build_binary.sh | 9 ---- build/build_binary_appveyor.ps1 | 24 ---------- build/build_binary_appveyor.sh | 14 ------ build/build_in_container.sh | 10 ++++ build/ci-linux.sh | 28 ------------ build/ci-windows.ps1 | 36 --------------- build/download_docker_binary.ps1 | 13 ------ build/download_docker_binary.sh | 2 +- build/release-linux.sh | 45 ------------------ build/release-windows.ps1 | 41 ----------------- gruntfile.js | 78 ++++++-------------------------- 12 files changed, 26 insertions(+), 291 deletions(-) delete mode 100755 build/build_binary.ps1 delete mode 100755 build/build_binary.sh delete mode 100755 build/build_binary_appveyor.ps1 delete mode 100755 build/build_binary_appveyor.sh create mode 100755 build/build_in_container.sh delete mode 100755 build/ci-linux.sh delete mode 100755 build/ci-windows.ps1 delete mode 100755 build/download_docker_binary.ps1 delete mode 100755 build/release-linux.sh delete mode 100755 build/release-windows.ps1 diff --git a/build/build_binary.ps1 b/build/build_binary.ps1 deleted file mode 100755 index f444f776e..000000000 --- a/build/build_binary.ps1 +++ /dev/null @@ -1,17 +0,0 @@ -param ( - [string]$platform, - [string]$arch -) - -$ErrorActionPreference = "Stop"; - -$binary = "portainer.exe" -$project_path = (Get-ITEM -Path env:APPVEYOR_BUILD_FOLDER).Value - -New-Item -Name dist -Path "$project_path" -ItemType Directory | Out-Null -Set-Location -Path "$project_path\api\cmd\portainer" - -C:\go\bin\go.exe get -t -d -v ./... -C:\go\bin\go.exe build -v - -Move-Item -Path "$($binary)" -Destination "..\..\..\dist" diff --git a/build/build_binary.sh b/build/build_binary.sh deleted file mode 100755 index 124e3fa33..000000000 --- a/build/build_binary.sh +++ /dev/null @@ -1,9 +0,0 @@ -binary="portainer" -mkdir -p dist - -cd 'api/cmd/portainer' - -go get -t -d -v ./... -GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' - -mv "${binary}" "../../../dist/portainer" diff --git a/build/build_binary_appveyor.ps1 b/build/build_binary_appveyor.ps1 deleted file mode 100755 index 5d486c1f4..000000000 --- a/build/build_binary_appveyor.ps1 +++ /dev/null @@ -1,24 +0,0 @@ -param ( - [string]$platform, - [string]$arch -) - -$ErrorActionPreference = "Stop"; - -$binary = "portainer.exe" -$project_path = (Get-ITEM -Path env:APPVEYOR_BUILD_FOLDER).Value - -Set-Item env:GOPATH "$project_path\api" - -New-Item -Name dist -Path "$project_path" -ItemType Directory | Out-Null -New-Item -Name portainer -Path "$project_path\api\src\github.com\" -ItemType Directory | Out-Null - -Copy-Item -Path "$project_path\api" -Destination "$project_path\api\src\github.com\portainer" -Recurse -Force -ErrorAction:SilentlyContinue -Rename-Item -Path "$project_path\api\src\github.com\portainer\api" -NewName "portainer" -ErrorAction:SilentlyContinue - -Set-Location -Path "$project_path\api\cmd\portainer" - -C:\go\bin\go.exe get -t -d -v ./... -C:\go\bin\go.exe build -v - -Move-Item -Path "$project_path\api\cmd\portainer\$($binary)" -Destination "$project_path\dist" diff --git a/build/build_binary_appveyor.sh b/build/build_binary_appveyor.sh deleted file mode 100755 index ae57b007b..000000000 --- a/build/build_binary_appveyor.sh +++ /dev/null @@ -1,14 +0,0 @@ -export GOPATH="$APPVEYOR_BUILD_FOLDER/api" -binary="portainer" - -mkdir -p dist -mkdir -p api/src/github.com/portainer/ - -cp -R api/ api/src/github.com/portainer/portainer/ - -cd 'api/cmd/portainer' - -go get -t -d -v ./... -GOOS=$1 GOARCH=$2 CGO_ENABLED=0 go build -a --installsuffix cgo --ldflags '-s' - -mv "$APPVEYOR_BUILD_FOLDER/api/cmd/portainer/$binary" "$APPVEYOR_BUILD_FOLDER/dist/portainer" diff --git a/build/build_in_container.sh b/build/build_in_container.sh new file mode 100755 index 000000000..a827bddfd --- /dev/null +++ b/build/build_in_container.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env sh + +binary="portainer-$1-$2" + +mkdir -p dist + +docker run --rm -tv "$(pwd)/api:/src" -e BUILD_GOOS="$1" -e BUILD_GOARCH="$2" portainer/golang-builder:cross-platform /src/cmd/portainer + +mv "api/cmd/portainer/$binary" dist/ +#sha256sum "dist/$binary" > portainer-checksum.txt diff --git a/build/ci-linux.sh b/build/ci-linux.sh deleted file mode 100755 index 1308d568d..000000000 --- a/build/ci-linux.sh +++ /dev/null @@ -1,28 +0,0 @@ -IMAGE="$1" -ARCH="$2" -DOCKER_USER="$3" -DOCKER_PASS="$4" -APPVEYOR_REPO_BRANCH="$5" -APPVEYOR_PULL_REQUEST_NUMBER="$6" - -if [ "${APPVEYOR_PULL_REQUEST_NUMBER}" ]; then - tag="pr${APPVEYOR_PULL_REQUEST_NUMBER}-$IMAGE-$ARCH" - manifest="pr${APPVEYOR_PULL_REQUEST_NUMBER}" -else - tag="${APPVEYOR_REPO_BRANCH}-$IMAGE-$ARCH" - manifest="${APPVEYOR_REPO_BRANCH}" -fi - -docker build -t "portainer/portainer:$tag" -f build/linux/Dockerfile . -docker login -u "${DOCKER_USER}" -p "${DOCKER_PASS}" -docker push "portainer/portainer:$tag" - -if [ "${2}" == 'amd64' ] ; then - docker -D manifest create "portainer/portainer:$manifest" \ - "portainer/portainer:$manifest-linux-amd64" \ - "portainer/portainer:$manifest-windows-amd64" \ - "portainer/portainer:$manifest-windows1709-amd64" \ - "portainer/portainer:$manifest-windows1803-amd64" - - docker manifest push "portainer/portainer:$manifest" -fi diff --git a/build/ci-windows.ps1 b/build/ci-windows.ps1 deleted file mode 100755 index 73a8720b2..000000000 --- a/build/ci-windows.ps1 +++ /dev/null @@ -1,36 +0,0 @@ -$ErrorActionPreference = "Stop"; - -$pull_request_number = $ENV:APPVEYOR_PULL_REQUEST_NUMBER -$branch_name = $ENV:APPVEYOR_REPO_BRANCH -$os = (Get-Item ENV:IMAGE).Value -$arch = (Get-Item ENV:ARCH).Value - -if ($pull_request_number) { - $tag = "pr$($pull_request_number)-$($os)-$($arch)" - $tag_1709 = "pr$($pull_request_number)-$($os)1709-$($arch)" - $tag_1803 = "pr$($pull_request_number)-$($os)1803-$($arch)" -} else { - $tag = "$($branch_name)-$($os)-$($arch)" - $tag_1709 = "$($branch_name)-$($os)1709-$($arch)" - $tag_1803 = "$($branch_name)-$($os)1803-$($arch)" -} - -docker build ` - -t portainer/portainer:$tag ` - -f build\windows2016\nanoserver\Dockerfile . - -docker login ` - -u "$((Get-Item ENV:DOCKER_USER).Value)" ` - -p "$((Get-Item ENV:DOCKER_PASS).Value)" - -docker push portainer/portainer:$tag - -rebase-docker-image ` - portainer/portainer:$tag ` - -t portainer/portainer:$tag_1709 ` - -b microsoft/nanoserver:1709 - -rebase-docker-image ` - portainer/portainer:$tag ` - -t portainer/portainer:$tag_1803 ` - -b microsoft/nanoserver:1803 diff --git a/build/download_docker_binary.ps1 b/build/download_docker_binary.ps1 deleted file mode 100755 index 7ebb41ec0..000000000 --- a/build/download_docker_binary.ps1 +++ /dev/null @@ -1,13 +0,0 @@ -param ( - [string]$docker_version -) - -$ErrorActionPreference = "Stop"; - -New-Item -Path "docker-binary" -ItemType Directory | Out-Null - -$download_folder = "docker-binary" - -Invoke-WebRequest -O "$($download_folder)/docker-binaries.zip" "https://download.docker.com/win/static/stable/x86_64/docker-$($docker_version).zip" -Expand-Archive -Path "$($download_folder)/docker-binaries.zip" -DestinationPath "$($download_folder)" -Move-Item -Path "$($download_folder)/docker/docker.exe" -Destination "dist" \ No newline at end of file diff --git a/build/download_docker_binary.sh b/build/download_docker_binary.sh index bd5e01c10..cc9b94b00 100755 --- a/build/download_docker_binary.sh +++ b/build/download_docker_binary.sh @@ -19,4 +19,4 @@ else mv "${DOWNLOAD_FOLDER}/docker/docker" dist/ fi -exit 0 \ No newline at end of file +exit 0 diff --git a/build/release-linux.sh b/build/release-linux.sh deleted file mode 100755 index bce48b84d..000000000 --- a/build/release-linux.sh +++ /dev/null @@ -1,45 +0,0 @@ -IMAGE="$1" -ARCH="$2" -PORTAINER_VERSION="$3" -DOCKER_USER="$4" -DOCKER_PASS="$5" - -mkdir -pv portainer -cp -r dist/* portainer - -tar cvpfz "portainer-$PORTAINER_VERSION-$IMAGE-$ARCH.tar.gz" portainer -sha256sum --tag "portainer-$PORTAINER_VERSION-$IMAGE-$ARCH.tar.gz" > "portainer-$PORTAINER_VERSION-$IMAGE-$ARCH-checksum.txt" - -tag="$IMAGE-$ARCH" - -docker build -t "portainer/portainer:$IMAGE-$ARCH-$PORTAINER_VERSION" -f build/linux/Dockerfile . -docker tag "portainer/portainer:$IMAGE-$ARCH-$PORTAINER_VERSION" "portainer/portainer:$IMAGE-$ARCH" -docker login -u "$DOCKER_USER" -p "$DOCKER_PASS" -docker push "portainer/portainer:$IMAGE-$ARCH-$PORTAINER_VERSION" -docker push "portainer/portainer:$IMAGE-$ARCH" - -if [ "${2}" == 's390x' ] ; then - docker -D manifest create "portainer/portainer:latest" \ - "portainer/portainer:linux-amd64" \ - "portainer/portainer:linux-arm" \ - "portainer/portainer:linux-arm64" \ - "portainer/portainer:linux-ppc64le" \ - "portainer/portainer:linux-s390x" \ - "portainer/portainer:windows-amd64" \ - "portainer/portainer:windows1709-amd64" \ - "portainer/portainer:windows1803-amd64" - - docker manifest push "portainer/portainer:latest" - - docker -D manifest create "portainer/portainer:${PORTAINER_VERSION}" \ - "portainer/portainer:linux-amd64-${PORTAINER_VERSION}" \ - "portainer/portainer:linux-arm-${PORTAINER_VERSION}" \ - "portainer/portainer:linux-arm64-${PORTAINER_VERSION}" \ - "portainer/portainer:linux-ppc64le-${PORTAINER_VERSION}" \ - "portainer/portainer:linux-s390x-${PORTAINER_VERSION}" \ - "portainer/portainer:windows-amd64-${PORTAINER_VERSION}" \ - "portainer/portainer:windows1709-amd64-${PORTAINER_VERSION}" \ - "portainer/portainer:windows1803-amd64-${PORTAINER_VERSION}" - - docker manifest push "portainer/portainer:${PORTAINER_VERSION}" -fi diff --git a/build/release-windows.ps1 b/build/release-windows.ps1 deleted file mode 100755 index a775f24cd..000000000 --- a/build/release-windows.ps1 +++ /dev/null @@ -1,41 +0,0 @@ -$ErrorActionPreference = "Stop"; -$binary = "portainer-$((Get-Item ENV:PORTAINER_VERSION).Value)-$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value).tar.gz" - -New-Item -Path portainer -ItemType Directory | Out-Null -Copy-Item -Path dist\* -Destination portainer -Recurse -tar cvpfz $binary portainer - -(Get-FileHash $binary).Hash > "portainer-$((Get-Item ENV:PORTAINER_VERSION).Value)-$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value)-checksum.txt" - -docker build ` - -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) ` - -f build\windows2016\nanoserver\Dockerfile . - -docker tag portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) - -docker login ` - -u "$((Get-Item ENV:DOCKER_USER).Value)" ` - -p "$((Get-Item ENV:DOCKER_PASS).Value)" - -docker push portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) -docker push portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) - -rebase-docker-image ` - portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) ` - -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)1709-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) ` - -b microsoft/nanoserver:1709 - -rebase-docker-image ` - portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) ` - -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)1709-$((Get-Item ENV:ARCH).Value) ` - -b microsoft/nanoserver:1709 - -rebase-docker-image ` - portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) ` - -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)1803-$((Get-Item ENV:ARCH).Value)-$((Get-Item ENV:PORTAINER_VERSION).Value) ` - -b microsoft/nanoserver:1803 - -rebase-docker-image ` - portainer/portainer:$((Get-Item ENV:IMAGE).Value)-$((Get-Item ENV:ARCH).Value) ` - -t portainer/portainer:$((Get-Item ENV:IMAGE).Value)1803-$((Get-Item ENV:ARCH).Value) ` - -b microsoft/nanoserver:1803 diff --git a/gruntfile.js b/gruntfile.js index 665e669a3..8379d98f3 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -51,10 +51,6 @@ module.exports = function(grunt) { grunt.task.run(['config:prod', 'clean:all', 'shell:buildBinary:' + p + ':' + a, 'shell:downloadDockerBinary:' + p + ':' + a, 'before-copy', 'copy:assets', 'after-copy']); }); - grunt.task.registerTask('appveyorbuild', 'appveyorbuild::', function(p, a) { - grunt.task.run(['config:prod', 'clean:all', 'shell:buildBinaryOnAppveyor:' + p + ':' + a, 'shell:downloadDockerBinary:' + p + ':' + a, 'before-copy', 'copy:assets', 'after-copy']); - }); - grunt.registerTask('lint', ['eslint']); grunt.registerTask('run-dev', ['build', 'shell:run:' + arch, 'watch:build']); grunt.registerTask('clear', ['clean:app']); @@ -264,49 +260,16 @@ gruntfile_cfg.replace = { }; function shell_buildBinary(p, a) { - var binfile = 'portainer-' + p + '-' + a; - if (p === 'linux') { - return [ - 'if [ -f ' + (binfile) + ' ]; then', - 'echo "Portainer binary exists";', - 'else', - 'build/build_binary.sh ' + p + ' ' + a + ';', - 'fi' - ].join(' '); - } else { - return [ - 'powershell -Command "& {if (Get-Item -Path ' + binfile + '.exe -ErrorAction:SilentlyContinue) {', - 'Write-Host "Portainer binary exists"', - '} else {', - '& ".\\build\\build_binary.ps1" -platform ' + p + ' -arch ' + a + '', - '}}"' - ].join(' '); - } + var binfile = 'dist/portainer-' + p + '-' + a; + return [ + 'if [ -f ' + ((p === 'windows') ? binfile + '.exe' : binfile) + ' ]; then', + 'echo "Portainer binary exists";', + 'else', + 'build/build_in_container.sh ' + p + ' ' + a + ';', + 'fi' + ].join(' '); } -function shell_buildBinaryOnAppveyor(p, a) { - var binfile = 'portainer-' + p + '-' + a; - if (p === 'linux') { - return [ - 'if [ -f ' + (binfile) + ' ]; then', - 'echo "Portainer binary exists";', - 'else', - 'build/build_binary_appveyor.sh ' + p + ' ' + a + ';', - 'fi' - ].join(' '); - } else { - return [ - 'powershell -Command "& {if (Get-Item -Path ' + binfile + '.exe -ErrorAction:SilentlyContinue) {', - 'Write-Host "Portainer binary exists"', - '} else {', - '& ".\\build\\build_binary_appveyor.ps1" -platform ' + p + ' -arch ' + a + '', - '}}"' - ].join(' '); - } -} - - - function shell_run(arch) { return [ 'docker rm -f portainer', @@ -320,28 +283,17 @@ function shell_downloadDockerBinary(p, a) { var ip = ((ps[p] === undefined) ? p : ps[p]); var ia = ((as[a] === undefined) ? a : as[a]); var binaryVersion = ((p === 'windows' ? '<%= shippedDockerVersionWindows %>' : '<%= shippedDockerVersion %>')); - if (p === 'linux') { - return [ - 'if [ -f dist/docker ]; then', - 'echo "Docker binary exists";', - 'else', - 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';', - 'fi' - ].join(' '); - } else { - return [ - 'powershell -Command "& {if (Get-Item -Path dist/docker.exe -ErrorAction:SilentlyContinue) {', - 'Write-Host "Docker binary exists"', - '} else {', - '& ".\\build\\download_docker_binary.ps1" -docker_version ' + binaryVersion + '', - '}}"' - ].join(' '); - } + return [ + 'if [ -f ' + ((p === 'windows') ? 'dist/docker.exe' : 'dist/docker') + ' ]; then', + 'echo "Docker binary exists";', + 'else', + 'build/download_docker_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';', + 'fi' + ].join(' '); } gruntfile_cfg.shell = { buildBinary: { command: shell_buildBinary }, - buildBinaryOnAppveyor: { command: shell_buildBinaryOnAppveyor }, run: { command: shell_run }, downloadDockerBinary: { command: shell_downloadDockerBinary } }; From 6fd5ddc80237e0d59df68977c0101eee07d385aa Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Sun, 9 Dec 2018 16:49:27 +1300 Subject: [PATCH 81/93] feat(extensions): introduce extension support (#2527) * wip * wip: missing repository & tags removal * feat(registry): private registry management * style(plugin-details): update view * wip * wip * wip * feat(plugins): add license info * feat(plugins): browse feature preview * feat(registry-configure): add the ability to configure registry management * style(app): update text in app * feat(plugins): add plugin version number * feat(plugins): wip plugin upgrade process * feat(plugins): wip plugin upgrade * feat(plugins): add the ability to update a plugin * feat(plugins): init plugins at startup time * feat(plugins): add the ability to remove a plugin * feat(plugins): update to latest plugin definitions * feat(plugins): introduce plugin-tooltip component * refactor(app): relocate plugin files to app/plugins * feat(plugins): introduce PluginDefinitionsURL constant * feat(plugins): update the flags used by the plugins * feat(plugins): wip * feat(plugins): display a label when a plugin has expired * wip * feat(registry-creation): update registry creation logic * refactor(registry-creation): change name/ids for inputs * feat(api): pass registry type to management configuration * feat(api): unstrip /v2 in regsitry proxy * docs(api): add TODO * feat(store): mockup-1 * feat(store): mockup 2 * feat(store): mockup 2 * feat(store): update mockup-2 * feat(app): add unauthenticated event check * update gruntfile * style(support): update support views * style(support): update product views * refactor(extensions): refactor plugins to extensions * feat(extensions): add a deal property * feat(extensions): introduce ExtensionManager * style(extensions): update extension details style * feat(extensions): display license/company when enabling extension * feat(extensions): update extensions views * feat(extensions): use ProductId defined in extension schema * style(app): remove padding left for form section title elements * style(support): use per host model * refactor(extensions): multiple refactors related to extensions mecanism * feat(extensions): update tls file path for registry extension * feat(extensions): update registry management configuration * feat(extensions): send license in header to extension proxy * fix(proxy): fix invalid default loopback address * feat(extensions): add header X-RegistryManagement-ForceNew for specific operations * feat(extensions): add the ability to display screenshots * feat(extensions): center screenshots * style(extensions): tune style * feat(extensions-details): open full screen image on click (#2517) * feat(extension-details): show magnifying glass on images * feat(extensions): support extension logo * feat(extensions): update support logos * refactor(lint): fix lint issues --- api/archive/zip.go | 48 ++++ api/bolt/datastore.go | 8 + api/bolt/extension/extension.go | 86 ++++++++ api/cmd/portainer/main.go | 25 +++ api/errors.go | 5 + api/exec/extension.go | 205 ++++++++++++++++++ api/filesystem/filesystem.go | 48 ++++ .../handler/endpointproxy/proxy_storidge.go | 6 +- api/http/handler/endpoints/endpoint_delete.go | 1 - .../endpoints/endpoint_extension_add.go | 2 + .../endpoints/endpoint_extension_remove.go | 2 + .../handler/extensions/extension_create.go | 79 +++++++ .../handler/extensions/extension_delete.go | 38 ++++ .../handler/extensions/extension_inspect.go | 59 +++++ api/http/handler/extensions/extension_list.go | 55 +++++ .../handler/extensions/extension_update.go | 56 +++++ api/http/handler/extensions/handler.go | 37 ++++ api/http/handler/handler.go | 4 + api/http/handler/registries/handler.go | 18 +- api/http/handler/registries/proxy.go | 78 +++++++ .../handler/registries/registry_configure.go | 137 ++++++++++++ .../handler/registries/registry_create.go | 5 + api/http/proxy/factory.go | 2 +- api/http/proxy/manager.go | 153 +++++++------ api/http/server.go | 11 + api/portainer.go | 100 ++++++++- app/__module.js | 1 + app/app.js | 6 +- app/constants.js | 1 + app/extensions/_module.js | 3 + app/extensions/registry-management/_module.js | 41 ++++ .../registryRepositoriesDatatable.html | 83 +++++++ .../registryRepositoriesDatatable.js | 13 ++ .../registriesRepositoryTagsDatatable.html | 112 ++++++++++ .../registriesRepositoryTagsDatatable.js | 14 ++ .../helpers/localRegistryHelper.js | 38 ++++ .../models/registryRepository.js | 4 + .../models/repositoryTag.js | 12 + .../registry-management/rest/catalog.js | 23 ++ .../registry-management/rest/manifest.js | 61 ++++++ .../registry-management/rest/tags.js | 10 + .../services/registryAPIService.js | 118 ++++++++++ .../configure/configureRegistryController.js | 66 ++++++ .../views/configure/configureregistry.html | 161 ++++++++++++++ .../repositories/edit/registryRepository.html | 88 ++++++++ .../edit/registryRepositoryController.js | 150 +++++++++++++ .../repositories/registryRepositories.html | 37 ++++ .../registryRepositoriesController.js | 33 +++ app/extensions/storidge/__module.js | 1 + app/portainer/__module.js | 42 +++- .../registriesDatatable.html | 6 + .../registriesDatatable.js | 3 +- .../extension-item/extension-item.js | 8 + .../extension-item/extensionItem.html | 46 ++++ .../extension-item/extensionItemController.js | 18 ++ .../extension-list/extension-list.js | 7 + .../extension-list/extensionList.html | 20 ++ .../extension-tooltip/extension-tooltip.html | 1 + .../extension-tooltip/extension-tooltip.js | 3 + .../registry-form-azure.html | 81 +++++++ .../registry-form-azure.js | 9 + .../registry-form-custom.html | 105 +++++++++ .../registry-form-custom.js | 9 + .../registry-form-quay.html | 48 ++++ .../registry-form-quay/registry-form-quay.js | 9 + .../product-list/product-item/product-item.js | 9 + .../product-item/productItem.html | 41 ++++ .../product-item/productItemController.js | 18 ++ .../components/product-list/product-list.js | 10 + .../components/product-list/productList.html | 21 ++ app/portainer/models/extension.js | 17 ++ app/portainer/models/registry.js | 42 ++++ app/portainer/models/status.js | 1 + app/portainer/rest/extension.js | 15 +- app/portainer/rest/legacyExtension.js | 12 + app/portainer/rest/registry.js | 3 +- .../services/api/extensionService.js | 66 +++++- .../services/api/legacyExtensionService.js | 21 ++ app/portainer/services/api/registryService.js | 20 +- app/portainer/services/fileUpload.js | 7 + ...onManager.js => legacyExtensionManager.js} | 9 +- app/portainer/services/modalService.js | 8 + .../views/extensions/extensions.html | 71 ++++++ .../views/extensions/extensionsController.js | 58 +++++ .../views/extensions/inspect/extension.html | 122 +++++++++++ .../extensions/inspect/extensionController.js | 63 ++++++ app/portainer/views/home/home.html | 15 +- app/portainer/views/home/homeController.js | 6 +- .../create/createRegistryController.js | 56 ++--- .../registries/create/createregistry.html | 113 +++------- .../views/registries/registries.html | 3 +- .../views/registries/registriesController.js | 8 +- app/portainer/views/sidebar/sidebar.html | 3 + .../views/support/product/product.html | 84 +++++++ .../support/product/productController.js | 14 ++ app/portainer/views/support/support.html | 52 ++--- .../views/support/supportController.js | 35 +++ assets/css/app.css | 5 + assets/images/support_1.png | Bin 0 -> 4733 bytes assets/images/support_2.png | Bin 0 -> 5753 bytes 100 files changed, 3519 insertions(+), 268 deletions(-) create mode 100644 api/archive/zip.go create mode 100644 api/bolt/extension/extension.go create mode 100644 api/exec/extension.go create mode 100644 api/http/handler/extensions/extension_create.go create mode 100644 api/http/handler/extensions/extension_delete.go create mode 100644 api/http/handler/extensions/extension_inspect.go create mode 100644 api/http/handler/extensions/extension_list.go create mode 100644 api/http/handler/extensions/extension_update.go create mode 100644 api/http/handler/extensions/handler.go create mode 100644 api/http/handler/registries/proxy.go create mode 100644 api/http/handler/registries/registry_configure.go create mode 100644 app/extensions/_module.js create mode 100644 app/extensions/registry-management/_module.js create mode 100644 app/extensions/registry-management/components/registries-repositories-datatable/registryRepositoriesDatatable.html create mode 100644 app/extensions/registry-management/components/registries-repositories-datatable/registryRepositoriesDatatable.js create mode 100644 app/extensions/registry-management/components/registries-repository-tags-datatable/registriesRepositoryTagsDatatable.html create mode 100644 app/extensions/registry-management/components/registries-repository-tags-datatable/registriesRepositoryTagsDatatable.js create mode 100644 app/extensions/registry-management/helpers/localRegistryHelper.js create mode 100644 app/extensions/registry-management/models/registryRepository.js create mode 100644 app/extensions/registry-management/models/repositoryTag.js create mode 100644 app/extensions/registry-management/rest/catalog.js create mode 100644 app/extensions/registry-management/rest/manifest.js create mode 100644 app/extensions/registry-management/rest/tags.js create mode 100644 app/extensions/registry-management/services/registryAPIService.js create mode 100644 app/extensions/registry-management/views/configure/configureRegistryController.js create mode 100644 app/extensions/registry-management/views/configure/configureregistry.html create mode 100644 app/extensions/registry-management/views/repositories/edit/registryRepository.html create mode 100644 app/extensions/registry-management/views/repositories/edit/registryRepositoryController.js create mode 100644 app/extensions/registry-management/views/repositories/registryRepositories.html create mode 100644 app/extensions/registry-management/views/repositories/registryRepositoriesController.js create mode 100644 app/portainer/components/extension-list/extension-item/extension-item.js create mode 100644 app/portainer/components/extension-list/extension-item/extensionItem.html create mode 100644 app/portainer/components/extension-list/extension-item/extensionItemController.js create mode 100644 app/portainer/components/extension-list/extension-list.js create mode 100644 app/portainer/components/extension-list/extensionList.html create mode 100644 app/portainer/components/extension-tooltip/extension-tooltip.html create mode 100644 app/portainer/components/extension-tooltip/extension-tooltip.js create mode 100644 app/portainer/components/forms/registry-form-azure/registry-form-azure.html create mode 100644 app/portainer/components/forms/registry-form-azure/registry-form-azure.js create mode 100644 app/portainer/components/forms/registry-form-custom/registry-form-custom.html create mode 100644 app/portainer/components/forms/registry-form-custom/registry-form-custom.js create mode 100644 app/portainer/components/forms/registry-form-quay/registry-form-quay.html create mode 100644 app/portainer/components/forms/registry-form-quay/registry-form-quay.js create mode 100644 app/portainer/components/product-list/product-item/product-item.js create mode 100644 app/portainer/components/product-list/product-item/productItem.html create mode 100644 app/portainer/components/product-list/product-item/productItemController.js create mode 100644 app/portainer/components/product-list/product-list.js create mode 100644 app/portainer/components/product-list/productList.html create mode 100644 app/portainer/models/extension.js create mode 100644 app/portainer/rest/legacyExtension.js create mode 100644 app/portainer/services/api/legacyExtensionService.js rename app/portainer/services/{extensionManager.js => legacyExtensionManager.js} (86%) create mode 100644 app/portainer/views/extensions/extensions.html create mode 100644 app/portainer/views/extensions/extensionsController.js create mode 100644 app/portainer/views/extensions/inspect/extension.html create mode 100644 app/portainer/views/extensions/inspect/extensionController.js create mode 100644 app/portainer/views/support/product/product.html create mode 100644 app/portainer/views/support/product/productController.js create mode 100644 app/portainer/views/support/supportController.js create mode 100644 assets/images/support_1.png create mode 100644 assets/images/support_2.png diff --git a/api/archive/zip.go b/api/archive/zip.go new file mode 100644 index 000000000..1c46c9f10 --- /dev/null +++ b/api/archive/zip.go @@ -0,0 +1,48 @@ +package archive + +import ( + "archive/zip" + "bytes" + "io" + "io/ioutil" + "os" + "path/filepath" +) + +// UnzipArchive will unzip an archive from bytes into the dest destination folder on disk +func UnzipArchive(archiveData []byte, dest string) error { + zipReader, err := zip.NewReader(bytes.NewReader(archiveData), int64(len(archiveData))) + if err != nil { + return err + } + + for _, zipFile := range zipReader.File { + + f, err := zipFile.Open() + if err != nil { + return err + } + defer f.Close() + + data, err := ioutil.ReadAll(f) + if err != nil { + return err + } + + fpath := filepath.Join(dest, zipFile.Name) + + outFile, err := os.OpenFile(fpath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, zipFile.Mode()) + if err != nil { + return err + } + + _, err = io.Copy(outFile, bytes.NewReader(data)) + if err != nil { + return err + } + + outFile.Close() + } + + return nil +} diff --git a/api/bolt/datastore.go b/api/bolt/datastore.go index ccce5576c..bc899c526 100644 --- a/api/bolt/datastore.go +++ b/api/bolt/datastore.go @@ -10,6 +10,7 @@ import ( "github.com/portainer/portainer/bolt/dockerhub" "github.com/portainer/portainer/bolt/endpoint" "github.com/portainer/portainer/bolt/endpointgroup" + "github.com/portainer/portainer/bolt/extension" "github.com/portainer/portainer/bolt/migrator" "github.com/portainer/portainer/bolt/registry" "github.com/portainer/portainer/bolt/resourcecontrol" @@ -39,6 +40,7 @@ type Store struct { DockerHubService *dockerhub.Service EndpointGroupService *endpointgroup.Service EndpointService *endpoint.Service + ExtensionService *extension.Service RegistryService *registry.Service ResourceControlService *resourcecontrol.Service SettingsService *settings.Service @@ -176,6 +178,12 @@ func (store *Store) initServices() error { } store.EndpointService = endpointService + extensionService, err := extension.NewService(store.db) + if err != nil { + return err + } + store.ExtensionService = extensionService + registryService, err := registry.NewService(store.db) if err != nil { return err diff --git a/api/bolt/extension/extension.go b/api/bolt/extension/extension.go new file mode 100644 index 000000000..e60963f97 --- /dev/null +++ b/api/bolt/extension/extension.go @@ -0,0 +1,86 @@ +package extension + +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 = "extension" +) + +// 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 +} + +// Extension returns a extension by ID +func (service *Service) Extension(ID portainer.ExtensionID) (*portainer.Extension, error) { + var extension portainer.Extension + identifier := internal.Itob(int(ID)) + + err := internal.GetObject(service.db, BucketName, identifier, &extension) + if err != nil { + return nil, err + } + + return &extension, nil +} + +// Extensions return an array containing all the extensions. +func (service *Service) Extensions() ([]portainer.Extension, error) { + var extensions = make([]portainer.Extension, 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 extension portainer.Extension + err := internal.UnmarshalObject(v, &extension) + if err != nil { + return err + } + extensions = append(extensions, extension) + } + + return nil + }) + + return extensions, err +} + +// Persist persists a extension inside the database. +func (service *Service) Persist(extension *portainer.Extension) error { + return service.db.Update(func(tx *bolt.Tx) error { + bucket := tx.Bucket([]byte(BucketName)) + + data, err := internal.MarshalObject(extension) + if err != nil { + return err + } + + return bucket.Put(internal.Itob(int(extension.ID)), data) + }) +} + +// DeleteExtension deletes a Extension. +func (service *Service) DeleteExtension(ID portainer.ExtensionID) error { + identifier := internal.Itob(int(ID)) + return internal.DeleteObject(service.db, BucketName, identifier) +} diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index cd1106159..f4f366d5f 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -471,6 +471,24 @@ func initJobService(dockerClientFactory *docker.ClientFactory) portainer.JobServ return docker.NewJobService(dockerClientFactory) } +func initExtensionManager(fileService portainer.FileService, extensionService portainer.ExtensionService) (portainer.ExtensionManager, error) { + extensionManager := exec.NewExtensionManager(fileService, extensionService) + + extensions, err := extensionService.Extensions() + if err != nil { + return nil, err + } + + for _, extension := range extensions { + err := extensionManager.EnableExtension(&extension, extension.License.LicenseKey) + if err != nil { + return nil, err + } + } + + return extensionManager, nil +} + func terminateIfNoAdminCreated(userService portainer.UserService) { timer1 := time.NewTimer(5 * time.Minute) <-timer1.C @@ -509,6 +527,11 @@ func main() { log.Fatal(err) } + extensionManager, err := initExtensionManager(fileService, store.ExtensionService) + if err != nil { + log.Fatal(err) + } + clientFactory := initClientFactory(digitalSignatureService) jobService := initJobService(clientFactory) @@ -619,6 +642,7 @@ func main() { TeamMembershipService: store.TeamMembershipService, EndpointService: store.EndpointService, EndpointGroupService: store.EndpointGroupService, + ExtensionService: store.ExtensionService, ResourceControlService: store.ResourceControlService, SettingsService: store.SettingsService, RegistryService: store.RegistryService, @@ -630,6 +654,7 @@ func main() { WebhookService: store.WebhookService, SwarmStackManager: swarmStackManager, ComposeStackManager: composeStackManager, + ExtensionManager: extensionManager, CryptoService: cryptoService, JWTService: jwtService, FileService: fileService, diff --git a/api/errors.go b/api/errors.go index 6aeec542e..ef11d5522 100644 --- a/api/errors.go +++ b/api/errors.go @@ -88,6 +88,11 @@ const ( ErrUndefinedTLSFileType = Error("Undefined TLS file type") ) +// Extension errors. +const ( + ErrExtensionAlreadyEnabled = Error("This extension is already enabled") +) + // Docker errors. const ( ErrUnableToPingEndpoint = Error("Unable to communicate with the endpoint") diff --git a/api/exec/extension.go b/api/exec/extension.go new file mode 100644 index 000000000..14dfba49e --- /dev/null +++ b/api/exec/extension.go @@ -0,0 +1,205 @@ +package exec + +import ( + "bytes" + "encoding/json" + "errors" + "os/exec" + "path" + "runtime" + "strconv" + "strings" + + "github.com/orcaman/concurrent-map" + "github.com/portainer/portainer" + "github.com/portainer/portainer/http/client" +) + +var extensionDownloadBaseURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com/extensions/" + +var extensionBinaryMap = map[portainer.ExtensionID]string{ + portainer.RegistryManagementExtension: "extension-registry-management", +} + +// ExtensionManager represents a service used to +// manage extension processes. +type ExtensionManager struct { + processes cmap.ConcurrentMap + fileService portainer.FileService + extensionService portainer.ExtensionService +} + +// NewExtensionManager returns a pointer to an ExtensionManager +func NewExtensionManager(fileService portainer.FileService, extensionService portainer.ExtensionService) *ExtensionManager { + return &ExtensionManager{ + processes: cmap.New(), + fileService: fileService, + extensionService: extensionService, + } +} + +func processKey(ID portainer.ExtensionID) string { + return strconv.Itoa(int(ID)) +} + +func buildExtensionURL(extension *portainer.Extension) string { + extensionURL := extensionDownloadBaseURL + extensionURL += extensionBinaryMap[extension.ID] + extensionURL += "-" + runtime.GOOS + "-" + runtime.GOARCH + extensionURL += "-" + extension.Version + extensionURL += ".zip" + return extensionURL +} + +func buildExtensionPath(binaryPath string, extension *portainer.Extension) string { + + extensionFilename := extensionBinaryMap[extension.ID] + extensionFilename += "-" + runtime.GOOS + "-" + runtime.GOARCH + extensionFilename += "-" + extension.Version + + extensionPath := path.Join( + binaryPath, + extensionFilename) + + return extensionPath +} + +// FetchExtensionDefinitions will fetch the list of available +// extension definitions from the official Portainer assets server +func (manager *ExtensionManager) FetchExtensionDefinitions() ([]portainer.Extension, error) { + extensionData, err := client.Get(portainer.ExtensionDefinitionsURL, 30) + if err != nil { + return nil, err + } + + var extensions []portainer.Extension + err = json.Unmarshal(extensionData, &extensions) + if err != nil { + return nil, err + } + + return extensions, nil +} + +// EnableExtension will check for the existence of the extension binary on the filesystem +// first. If it does not exist, it will download it from the official Portainer assets server. +// After installing the binary on the filesystem, it will execute the binary in license check +// mode to validate the extension license. If the license is valid, it will then start +// the extension process and register it in the processes map. +func (manager *ExtensionManager) EnableExtension(extension *portainer.Extension, licenseKey string) error { + extensionBinaryPath := buildExtensionPath(manager.fileService.GetBinaryFolder(), extension) + extensionBinaryExists, err := manager.fileService.FileExists(extensionBinaryPath) + if err != nil { + return err + } + + if !extensionBinaryExists { + err := manager.downloadExtension(extension) + if err != nil { + return err + } + } + + licenseDetails, err := validateLicense(extensionBinaryPath, licenseKey) + if err != nil { + return err + } + + extension.License = portainer.LicenseInformation{ + LicenseKey: licenseKey, + Company: licenseDetails[0], + Expiration: licenseDetails[1], + } + extension.Version = licenseDetails[2] + + return manager.startExtensionProcess(extension, extensionBinaryPath) +} + +// DisableExtension will retrieve the process associated to the extension +// from the processes map and kill the process. It will then remove the process +// from the processes map and remove the binary associated to the extension +// from the filesystem +func (manager *ExtensionManager) DisableExtension(extension *portainer.Extension) error { + process, ok := manager.processes.Get(processKey(extension.ID)) + if !ok { + return nil + } + + err := process.(*exec.Cmd).Process.Kill() + if err != nil { + return err + } + + manager.processes.Remove(processKey(extension.ID)) + + extensionBinaryPath := buildExtensionPath(manager.fileService.GetBinaryFolder(), extension) + return manager.fileService.RemoveDirectory(extensionBinaryPath) +} + +// UpdateExtension will download the new extension binary from the official Portainer assets +// server, disable the previous extension via DisableExtension, trigger a license check +// and then start the extension process and add it to the processes map +func (manager *ExtensionManager) UpdateExtension(extension *portainer.Extension, version string) error { + oldVersion := extension.Version + + extension.Version = version + err := manager.downloadExtension(extension) + if err != nil { + return err + } + + extension.Version = oldVersion + err = manager.DisableExtension(extension) + if err != nil { + return err + } + + extension.Version = version + extensionBinaryPath := buildExtensionPath(manager.fileService.GetBinaryFolder(), extension) + + licenseDetails, err := validateLicense(extensionBinaryPath, extension.License.LicenseKey) + if err != nil { + return err + } + + extension.Version = licenseDetails[2] + + return manager.startExtensionProcess(extension, extensionBinaryPath) +} + +func (manager *ExtensionManager) downloadExtension(extension *portainer.Extension) error { + extensionURL := buildExtensionURL(extension) + + data, err := client.Get(extensionURL, 30) + if err != nil { + return err + } + + return manager.fileService.ExtractExtensionArchive(data) +} + +func validateLicense(binaryPath, licenseKey string) ([]string, error) { + licenseCheckProcess := exec.Command(binaryPath, "-license", licenseKey, "-check") + cmdOutput := &bytes.Buffer{} + licenseCheckProcess.Stdout = cmdOutput + + err := licenseCheckProcess.Run() + if err != nil { + return nil, errors.New("Invalid extension license key") + } + + output := string(cmdOutput.Bytes()) + + return strings.Split(output, "|"), nil +} + +func (manager *ExtensionManager) startExtensionProcess(extension *portainer.Extension, binaryPath string) error { + extensionProcess := exec.Command(binaryPath, "-license", extension.License.LicenseKey) + err := extensionProcess.Start() + if err != nil { + return err + } + + manager.processes.Set(processKey(extension.ID), extensionProcess) + return nil +} diff --git a/api/filesystem/filesystem.go b/api/filesystem/filesystem.go index acbb12db5..dcb397eac 100644 --- a/api/filesystem/filesystem.go +++ b/api/filesystem/filesystem.go @@ -7,6 +7,7 @@ import ( "io/ioutil" "github.com/portainer/portainer" + "github.com/portainer/portainer/archive" "io" "os" @@ -32,8 +33,13 @@ const ( PrivateKeyFile = "portainer.key" // PublicKeyFile represents the name on disk of the file containing the public key. PublicKeyFile = "portainer.pub" + // BinaryStorePath represents the subfolder where binaries are stored in the file store folder. + BinaryStorePath = "bin" // ScheduleStorePath represents the subfolder where schedule files are stored. ScheduleStorePath = "schedules" + // ExtensionRegistryManagementStorePath represents the subfolder where files related to the + // registry management extension are stored. + ExtensionRegistryManagementStorePath = "extensions" ) // Service represents a service for managing files and directories. @@ -65,9 +71,30 @@ func NewService(dataStorePath, fileStorePath string) (*Service, error) { return nil, err } + err = service.createDirectoryInStore(BinaryStorePath) + if err != nil { + return nil, err + } + return service, nil } +// GetBinaryFolder returns the full path to the binary store on the filesystem +func (service *Service) GetBinaryFolder() string { + return path.Join(service.fileStorePath, BinaryStorePath) +} + +// ExtractExtensionArchive extracts the content of an extension archive +// specified as raw data into the binary store on the filesystem +func (service *Service) ExtractExtensionArchive(data []byte) error { + err := archive.UnzipArchive(data, path.Join(service.fileStorePath, BinaryStorePath)) + if err != nil { + return err + } + + return nil +} + // RemoveDirectory removes a directory on the filesystem. func (service *Service) RemoveDirectory(directoryPath string) error { return os.RemoveAll(directoryPath) @@ -99,6 +126,27 @@ func (service *Service) StoreStackFileFromBytes(stackIdentifier, fileName string return path.Join(service.fileStorePath, stackStorePath), nil } +// StoreRegistryManagementFileFromBytes creates a subfolder in the +// ExtensionRegistryManagementStorePath and stores a new file from bytes. +// It returns the path to the folder where the file is stored. +func (service *Service) StoreRegistryManagementFileFromBytes(folder, fileName string, data []byte) (string, error) { + extensionStorePath := path.Join(ExtensionRegistryManagementStorePath, folder) + err := service.createDirectoryInStore(extensionStorePath) + if err != nil { + return "", err + } + + file := path.Join(extensionStorePath, fileName) + r := bytes.NewReader(data) + + err = service.createFileInStore(file, r) + if err != nil { + return "", err + } + + return path.Join(service.fileStorePath, file), nil +} + // StoreTLSFileFromBytes creates a folder in the TLSStorePath and stores a new file from bytes. // It returns the path to the newly created file. func (service *Service) StoreTLSFileFromBytes(folder string, fileType portainer.TLSFileType, data []byte) (string, error) { diff --git a/api/http/handler/endpointproxy/proxy_storidge.go b/api/http/handler/endpointproxy/proxy_storidge.go index 86375f091..697d74ff5 100644 --- a/api/http/handler/endpointproxy/proxy_storidge.go +++ b/api/http/handler/endpointproxy/proxy_storidge.go @@ -1,5 +1,7 @@ package endpointproxy +// TODO: legacy extension management + import ( "strconv" @@ -42,9 +44,9 @@ func (handler *Handler) proxyRequestsToStoridgeAPI(w http.ResponseWriter, r *htt proxyExtensionKey := string(endpoint.ID) + "_" + string(portainer.StoridgeEndpointExtension) var proxy http.Handler - proxy = handler.ProxyManager.GetExtensionProxy(proxyExtensionKey) + proxy = handler.ProxyManager.GetLegacyExtensionProxy(proxyExtensionKey) if proxy == nil { - proxy, err = handler.ProxyManager.CreateAndRegisterExtensionProxy(proxyExtensionKey, storidgeExtension.URL) + proxy, err = handler.ProxyManager.CreateLegacyExtensionProxy(proxyExtensionKey, storidgeExtension.URL) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to create extension proxy", err} } diff --git a/api/http/handler/endpoints/endpoint_delete.go b/api/http/handler/endpoints/endpoint_delete.go index 865c2055b..3b34db01e 100644 --- a/api/http/handler/endpoints/endpoint_delete.go +++ b/api/http/handler/endpoints/endpoint_delete.go @@ -42,7 +42,6 @@ func (handler *Handler) endpointDelete(w http.ResponseWriter, r *http.Request) * } handler.ProxyManager.DeleteProxy(string(endpointID)) - handler.ProxyManager.DeleteExtensionProxies(string(endpointID)) return response.Empty(w) } diff --git a/api/http/handler/endpoints/endpoint_extension_add.go b/api/http/handler/endpoints/endpoint_extension_add.go index 9a9eebbda..7c2f69e3a 100644 --- a/api/http/handler/endpoints/endpoint_extension_add.go +++ b/api/http/handler/endpoints/endpoint_extension_add.go @@ -1,5 +1,7 @@ package endpoints +// TODO: legacy extension management + import ( "net/http" diff --git a/api/http/handler/endpoints/endpoint_extension_remove.go b/api/http/handler/endpoints/endpoint_extension_remove.go index 8b265dc6c..3f68955cc 100644 --- a/api/http/handler/endpoints/endpoint_extension_remove.go +++ b/api/http/handler/endpoints/endpoint_extension_remove.go @@ -1,5 +1,7 @@ package endpoints +// TODO: legacy extension management + import ( "net/http" diff --git a/api/http/handler/extensions/extension_create.go b/api/http/handler/extensions/extension_create.go new file mode 100644 index 000000000..b0ce72406 --- /dev/null +++ b/api/http/handler/extensions/extension_create.go @@ -0,0 +1,79 @@ +package extensions + +import ( + "net/http" + "strconv" + + "github.com/asaskevich/govalidator" + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" +) + +type extensionCreatePayload struct { + License string +} + +func (payload *extensionCreatePayload) Validate(r *http.Request) error { + if govalidator.IsNull(payload.License) { + return portainer.Error("Invalid license") + } + + return nil +} + +func (handler *Handler) extensionCreate(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + var payload extensionCreatePayload + err := request.DecodeAndValidateJSONPayload(r, &payload) + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} + } + + extensionIdentifier, err := strconv.Atoi(string(payload.License[0])) + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid license format", err} + } + extensionID := portainer.ExtensionID(extensionIdentifier) + + extensions, err := handler.ExtensionService.Extensions() + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve extensions status from the database", err} + } + + for _, existingExtension := range extensions { + if existingExtension.ID == extensionID { + return &httperror.HandlerError{http.StatusConflict, "Unable to enable extension", portainer.ErrExtensionAlreadyEnabled} + } + } + + extension := &portainer.Extension{ + ID: extensionID, + } + + extensionDefinitions, err := handler.ExtensionManager.FetchExtensionDefinitions() + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve extension definitions", err} + } + + for _, def := range extensionDefinitions { + if def.ID == extension.ID { + extension.Version = def.Version + break + } + } + + err = handler.ExtensionManager.EnableExtension(extension, payload.License) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to enable extension", err} + } + + extension.Enabled = true + + err = handler.ExtensionService.Persist(extension) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist extension status inside the database", err} + } + + return response.Empty(w) +} diff --git a/api/http/handler/extensions/extension_delete.go b/api/http/handler/extensions/extension_delete.go new file mode 100644 index 000000000..be9d72bb3 --- /dev/null +++ b/api/http/handler/extensions/extension_delete.go @@ -0,0 +1,38 @@ +package extensions + +import ( + "net/http" + + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" +) + +// DELETE request on /api/extensions/:id +func (handler *Handler) extensionDelete(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + extensionIdentifier, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid extension identifier route variable", err} + } + extensionID := portainer.ExtensionID(extensionIdentifier) + + extension, err := handler.ExtensionService.Extension(extensionID) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find a extension with the specified identifier inside the database", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a extension with the specified identifier inside the database", err} + } + + err = handler.ExtensionManager.DisableExtension(extension) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to delete extension", err} + } + + err = handler.ExtensionService.DeleteExtension(extensionID) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to delete the extension from the database", err} + } + + return response.Empty(w) +} diff --git a/api/http/handler/extensions/extension_inspect.go b/api/http/handler/extensions/extension_inspect.go new file mode 100644 index 000000000..ea5fa0e90 --- /dev/null +++ b/api/http/handler/extensions/extension_inspect.go @@ -0,0 +1,59 @@ +package extensions + +import ( + "encoding/json" + "net/http" + + "github.com/coreos/go-semver/semver" + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" + "github.com/portainer/portainer/http/client" +) + +// GET request on /api/extensions/:id +func (handler *Handler) extensionInspect(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + extensionIdentifier, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid extension identifier route variable", err} + } + extensionID := portainer.ExtensionID(extensionIdentifier) + + extensionData, err := client.Get(portainer.ExtensionDefinitionsURL, 30) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve extension definitions", err} + } + + var extensions []portainer.Extension + err = json.Unmarshal(extensionData, &extensions) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to parse external extension definitions", err} + } + + var extension portainer.Extension + for _, p := range extensions { + if p.ID == extensionID { + extension = p + break + } + } + + storedExtension, err := handler.ExtensionService.Extension(extensionID) + if err == portainer.ErrObjectNotFound { + return response.JSON(w, extension) + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a extension with the specified identifier inside the database", err} + } + + extension.Enabled = storedExtension.Enabled + + extensionVer := semver.New(extension.Version) + pVer := semver.New(storedExtension.Version) + + if pVer.LessThan(*extensionVer) { + extension.UpdateAvailable = true + } + + return response.JSON(w, extension) +} diff --git a/api/http/handler/extensions/extension_list.go b/api/http/handler/extensions/extension_list.go new file mode 100644 index 000000000..8f6cacb77 --- /dev/null +++ b/api/http/handler/extensions/extension_list.go @@ -0,0 +1,55 @@ +package extensions + +import ( + "net/http" + + "github.com/coreos/go-semver/semver" + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" +) + +// GET request on /api/extensions?store= +func (handler *Handler) extensionList(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + storeDetails, _ := request.RetrieveBooleanQueryParameter(r, "store", true) + + extensions, err := handler.ExtensionService.Extensions() + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve extensions from the database", err} + } + + if storeDetails { + definitions, err := handler.ExtensionManager.FetchExtensionDefinitions() + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve extension definitions", err} + } + + for idx := range definitions { + associateExtensionData(&definitions[idx], extensions) + } + + extensions = definitions + } + + return response.JSON(w, extensions) +} + +func associateExtensionData(definition *portainer.Extension, extensions []portainer.Extension) { + for _, extension := range extensions { + if extension.ID == definition.ID { + + definition.Enabled = extension.Enabled + definition.License.Company = extension.License.Company + definition.License.Expiration = extension.License.Expiration + + definitionVersion := semver.New(definition.Version) + extensionVersion := semver.New(extension.Version) + if extensionVersion.LessThan(*definitionVersion) { + definition.UpdateAvailable = true + } + + break + } + } +} diff --git a/api/http/handler/extensions/extension_update.go b/api/http/handler/extensions/extension_update.go new file mode 100644 index 000000000..4e80ea1bc --- /dev/null +++ b/api/http/handler/extensions/extension_update.go @@ -0,0 +1,56 @@ +package extensions + +import ( + "net/http" + + "github.com/asaskevich/govalidator" + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" +) + +type extensionUpdatePayload struct { + Version string +} + +func (payload *extensionUpdatePayload) Validate(r *http.Request) error { + if govalidator.IsNull(payload.Version) { + return portainer.Error("Invalid extension version") + } + + return nil +} + +func (handler *Handler) extensionUpdate(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + extensionIdentifier, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid extension identifier route variable", err} + } + extensionID := portainer.ExtensionID(extensionIdentifier) + + var payload extensionUpdatePayload + err = request.DecodeAndValidateJSONPayload(r, &payload) + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} + } + + extension, err := handler.ExtensionService.Extension(extensionID) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find a extension with the specified identifier inside the database", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a extension with the specified identifier inside the database", err} + } + + err = handler.ExtensionManager.UpdateExtension(extension, payload.Version) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to update extension", err} + } + + err = handler.ExtensionService.Persist(extension) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist extension status inside the database", err} + } + + return response.Empty(w) +} diff --git a/api/http/handler/extensions/handler.go b/api/http/handler/extensions/handler.go new file mode 100644 index 000000000..b7ebbd06b --- /dev/null +++ b/api/http/handler/extensions/handler.go @@ -0,0 +1,37 @@ +package extensions + +import ( + "net/http" + + "github.com/gorilla/mux" + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/portainer" + "github.com/portainer/portainer/http/security" +) + +// Handler is the HTTP handler used to handle extension operations. +type Handler struct { + *mux.Router + ExtensionService portainer.ExtensionService + ExtensionManager portainer.ExtensionManager +} + +// NewHandler creates a handler to manage extension operations. +func NewHandler(bouncer *security.RequestBouncer) *Handler { + h := &Handler{ + Router: mux.NewRouter(), + } + + h.Handle("/extensions", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.extensionList))).Methods(http.MethodGet) + h.Handle("/extensions", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.extensionCreate))).Methods(http.MethodPost) + h.Handle("/extensions/{id}", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.extensionInspect))).Methods(http.MethodGet) + h.Handle("/extensions/{id}", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.extensionDelete))).Methods(http.MethodDelete) + h.Handle("/extensions/{id}/update", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.extensionUpdate))).Methods(http.MethodPost) + + return h +} diff --git a/api/http/handler/handler.go b/api/http/handler/handler.go index f58a290aa..9cb3059df 100644 --- a/api/http/handler/handler.go +++ b/api/http/handler/handler.go @@ -9,6 +9,7 @@ import ( "github.com/portainer/portainer/http/handler/endpointgroups" "github.com/portainer/portainer/http/handler/endpointproxy" "github.com/portainer/portainer/http/handler/endpoints" + "github.com/portainer/portainer/http/handler/extensions" "github.com/portainer/portainer/http/handler/file" "github.com/portainer/portainer/http/handler/motd" "github.com/portainer/portainer/http/handler/registries" @@ -37,6 +38,7 @@ type Handler struct { EndpointProxyHandler *endpointproxy.Handler FileHandler *file.Handler MOTDHandler *motd.Handler + ExtensionHandler *extensions.Handler RegistryHandler *registries.Handler ResourceControlHandler *resourcecontrols.Handler SettingsHandler *settings.Handler @@ -75,6 +77,8 @@ func (h *Handler) ServeHTTP(w http.ResponseWriter, r *http.Request) { } case strings.HasPrefix(r.URL.Path, "/api/motd"): http.StripPrefix("/api", h.MOTDHandler).ServeHTTP(w, r) + case strings.HasPrefix(r.URL.Path, "/api/extensions"): + http.StripPrefix("/api", h.ExtensionHandler).ServeHTTP(w, r) case strings.HasPrefix(r.URL.Path, "/api/registries"): http.StripPrefix("/api", h.RegistryHandler).ServeHTTP(w, r) case strings.HasPrefix(r.URL.Path, "/api/resource_controls"): diff --git a/api/http/handler/registries/handler.go b/api/http/handler/registries/handler.go index 33a161932..a8f3ae24c 100644 --- a/api/http/handler/registries/handler.go +++ b/api/http/handler/registries/handler.go @@ -1,23 +1,27 @@ package registries import ( - httperror "github.com/portainer/libhttp/error" - "github.com/portainer/portainer" - "github.com/portainer/portainer/http/security" - "net/http" "github.com/gorilla/mux" + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/portainer" + "github.com/portainer/portainer/http/proxy" + "github.com/portainer/portainer/http/security" ) func hideFields(registry *portainer.Registry) { registry.Password = "" + registry.ManagementConfiguration = nil } // Handler is the HTTP handler used to handle registry operations. type Handler struct { *mux.Router - RegistryService portainer.RegistryService + RegistryService portainer.RegistryService + ExtensionService portainer.ExtensionService + FileService portainer.FileService + ProxyManager *proxy.Manager } // NewHandler creates a handler to manage registry operations. @@ -36,8 +40,12 @@ func NewHandler(bouncer *security.RequestBouncer) *Handler { bouncer.AdministratorAccess(httperror.LoggerHandler(h.registryUpdate))).Methods(http.MethodPut) h.Handle("/registries/{id}/access", bouncer.AdministratorAccess(httperror.LoggerHandler(h.registryUpdateAccess))).Methods(http.MethodPut) + h.Handle("/registries/{id}/configure", + bouncer.AdministratorAccess(httperror.LoggerHandler(h.registryConfigure))).Methods(http.MethodPost) h.Handle("/registries/{id}", bouncer.AdministratorAccess(httperror.LoggerHandler(h.registryDelete))).Methods(http.MethodDelete) + h.PathPrefix("/registries/{id}/v2").Handler( + bouncer.AdministratorAccess(httperror.LoggerHandler(h.proxyRequestsToRegistryAPI))) return h } diff --git a/api/http/handler/registries/proxy.go b/api/http/handler/registries/proxy.go new file mode 100644 index 000000000..b83bcc549 --- /dev/null +++ b/api/http/handler/registries/proxy.go @@ -0,0 +1,78 @@ +package registries + +import ( + "encoding/json" + "net/http" + "strconv" + + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/portainer" +) + +// request on /api/registries/:id/v2 +func (handler *Handler) proxyRequestsToRegistryAPI(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + registryID, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid registry identifier route variable", err} + } + + registry, err := handler.RegistryService.Registry(portainer.RegistryID(registryID)) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find a registry with the specified identifier inside the database", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a registry with the specified identifier inside the database", err} + } + + extension, err := handler.ExtensionService.Extension(portainer.RegistryManagementExtension) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Registry management extension is not enabled", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a extension with the specified identifier inside the database", err} + } + + var proxy http.Handler + proxy = handler.ProxyManager.GetExtensionProxy(portainer.RegistryManagementExtension) + if proxy == nil { + proxy, err = handler.ProxyManager.CreateExtensionProxy(portainer.RegistryManagementExtension) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to register registry proxy", err} + } + } + + managementConfiguration := registry.ManagementConfiguration + if managementConfiguration == nil { + managementConfiguration = createDefaultManagementConfiguration(registry) + } + + encodedConfiguration, err := json.Marshal(managementConfiguration) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to encode management configuration", err} + } + + id := strconv.Itoa(int(registryID)) + r.Header.Set("X-RegistryManagement-Key", id) + r.Header.Set("X-RegistryManagement-URI", registry.URL) + r.Header.Set("X-RegistryManagement-Config", string(encodedConfiguration)) + r.Header.Set("X-PortainerExtension-License", extension.License.LicenseKey) + + http.StripPrefix("/registries/"+id, proxy).ServeHTTP(w, r) + return nil +} + +func createDefaultManagementConfiguration(registry *portainer.Registry) *portainer.RegistryManagementConfiguration { + config := &portainer.RegistryManagementConfiguration{ + Type: registry.Type, + TLSConfig: portainer.TLSConfiguration{ + TLS: false, + }, + } + + if registry.Authentication { + config.Authentication = true + config.Username = registry.Username + config.Password = registry.Password + } + + return config +} diff --git a/api/http/handler/registries/registry_configure.go b/api/http/handler/registries/registry_configure.go new file mode 100644 index 000000000..0f5569141 --- /dev/null +++ b/api/http/handler/registries/registry_configure.go @@ -0,0 +1,137 @@ +package registries + +import ( + "net/http" + "strconv" + + httperror "github.com/portainer/libhttp/error" + "github.com/portainer/libhttp/request" + "github.com/portainer/libhttp/response" + "github.com/portainer/portainer" +) + +type registryConfigurePayload struct { + Authentication bool + Username string + Password string + TLS bool + TLSSkipVerify bool + TLSCertFile []byte + TLSKeyFile []byte + TLSCACertFile []byte +} + +func (payload *registryConfigurePayload) Validate(r *http.Request) error { + useAuthentication, _ := request.RetrieveBooleanMultiPartFormValue(r, "Authentication", true) + payload.Authentication = useAuthentication + + if useAuthentication { + username, err := request.RetrieveMultiPartFormValue(r, "Username", false) + if err != nil { + return portainer.Error("Invalid username") + } + payload.Username = username + + password, _ := request.RetrieveMultiPartFormValue(r, "Password", true) + payload.Password = password + } + + useTLS, _ := request.RetrieveBooleanMultiPartFormValue(r, "TLS", true) + payload.TLS = useTLS + + skipTLSVerify, _ := request.RetrieveBooleanMultiPartFormValue(r, "TLSSkipVerify", true) + payload.TLSSkipVerify = skipTLSVerify + + if useTLS && !skipTLSVerify { + cert, _, err := request.RetrieveMultiPartFormFile(r, "TLSCertFile") + if err != nil { + return portainer.Error("Invalid certificate file. Ensure that the file is uploaded correctly") + } + payload.TLSCertFile = cert + + key, _, err := request.RetrieveMultiPartFormFile(r, "TLSKeyFile") + if err != nil { + return portainer.Error("Invalid key file. Ensure that the file is uploaded correctly") + } + payload.TLSKeyFile = key + + ca, _, err := request.RetrieveMultiPartFormFile(r, "TLSCACertFile") + if err != nil { + return portainer.Error("Invalid CA certificate file. Ensure that the file is uploaded correctly") + } + payload.TLSCACertFile = ca + } + + return nil +} + +// POST request on /api/registries/:id/configure +func (handler *Handler) registryConfigure(w http.ResponseWriter, r *http.Request) *httperror.HandlerError { + registryID, err := request.RetrieveNumericRouteVariableValue(r, "id") + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid registry identifier route variable", err} + } + + payload := ®istryConfigurePayload{} + err = payload.Validate(r) + if err != nil { + return &httperror.HandlerError{http.StatusBadRequest, "Invalid request payload", err} + } + + registry, err := handler.RegistryService.Registry(portainer.RegistryID(registryID)) + if err == portainer.ErrObjectNotFound { + return &httperror.HandlerError{http.StatusNotFound, "Unable to find a registry with the specified identifier inside the database", err} + } else if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to find a registry with the specified identifier inside the database", err} + } + + registry.ManagementConfiguration = &portainer.RegistryManagementConfiguration{ + Type: registry.Type, + } + + if payload.Authentication { + registry.ManagementConfiguration.Authentication = true + registry.ManagementConfiguration.Username = payload.Username + if payload.Username == registry.Username && payload.Password == "" { + registry.ManagementConfiguration.Password = registry.Password + } else { + registry.ManagementConfiguration.Password = payload.Password + } + } + + if payload.TLS { + registry.ManagementConfiguration.TLSConfig = portainer.TLSConfiguration{ + TLS: true, + TLSSkipVerify: payload.TLSSkipVerify, + } + + if !payload.TLSSkipVerify { + folder := strconv.Itoa(int(registry.ID)) + + certPath, err := handler.FileService.StoreRegistryManagementFileFromBytes(folder, "cert.pem", payload.TLSCertFile) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist TLS certificate file on disk", err} + } + registry.ManagementConfiguration.TLSConfig.TLSCertPath = certPath + + keyPath, err := handler.FileService.StoreRegistryManagementFileFromBytes(folder, "key.pem", payload.TLSKeyFile) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist TLS key file on disk", err} + } + registry.ManagementConfiguration.TLSConfig.TLSKeyPath = keyPath + + cacertPath, err := handler.FileService.StoreRegistryManagementFileFromBytes(folder, "ca.pem", payload.TLSCACertFile) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist TLS CA certificate file on disk", err} + } + registry.ManagementConfiguration.TLSConfig.TLSCACertPath = cacertPath + } + } + + err = handler.RegistryService.UpdateRegistry(registry.ID, registry) + if err != nil { + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist registry changes inside the database", err} + } + + return response.Empty(w) +} diff --git a/api/http/handler/registries/registry_create.go b/api/http/handler/registries/registry_create.go index ad4acb58a..082f61352 100644 --- a/api/http/handler/registries/registry_create.go +++ b/api/http/handler/registries/registry_create.go @@ -12,6 +12,7 @@ import ( type registryCreatePayload struct { Name string + Type int URL string Authentication bool Username string @@ -28,6 +29,9 @@ func (payload *registryCreatePayload) Validate(r *http.Request) error { if payload.Authentication && (govalidator.IsNull(payload.Username) || govalidator.IsNull(payload.Password)) { return portainer.Error("Invalid credentials. Username and password must be specified when authentication is enabled") } + if payload.Type != 1 && payload.Type != 2 && payload.Type != 3 { + return portainer.Error("Invalid registry type. Valid values are: 1 (Quay.io), 2 (Azure container registry) or 3 (custom registry)") + } return nil } @@ -49,6 +53,7 @@ func (handler *Handler) registryCreate(w http.ResponseWriter, r *http.Request) * } registry := &portainer.Registry{ + Type: portainer.RegistryType(payload.Type), Name: payload.Name, URL: payload.URL, Authentication: payload.Authentication, diff --git a/api/http/proxy/factory.go b/api/http/proxy/factory.go index 73593f836..90b5ad444 100644 --- a/api/http/proxy/factory.go +++ b/api/http/proxy/factory.go @@ -25,7 +25,7 @@ type proxyFactory struct { func (factory *proxyFactory) newHTTPProxy(u *url.URL) http.Handler { u.Scheme = "http" - return newSingleHostReverseProxyWithHostHeader(u) + return httputil.NewSingleHostReverseProxy(u) } func newAzureProxy(credentials *portainer.AzureCredentials) (http.Handler, error) { diff --git a/api/http/proxy/manager.go b/api/http/proxy/manager.go index eb60a5dc0..b1e2aa6f4 100644 --- a/api/http/proxy/manager.go +++ b/api/http/proxy/manager.go @@ -3,18 +3,25 @@ package proxy import ( "net/http" "net/url" - "strings" + "strconv" "github.com/orcaman/concurrent-map" "github.com/portainer/portainer" ) +// TODO: contain code related to legacy extension management + +var extensionPorts = map[portainer.ExtensionID]string{ + portainer.RegistryManagementExtension: "7001", +} + type ( // Manager represents a service used to manage Docker proxies. Manager struct { - proxyFactory *proxyFactory - proxies cmap.ConcurrentMap - extensionProxies cmap.ConcurrentMap + proxyFactory *proxyFactory + proxies cmap.ConcurrentMap + extensionProxies cmap.ConcurrentMap + legacyExtensionProxies cmap.ConcurrentMap } // ManagerParams represents the required parameters to create a new Manager instance. @@ -31,8 +38,9 @@ type ( // NewManager initializes a new proxy Service func NewManager(parameters *ManagerParams) *Manager { return &Manager{ - proxies: cmap.New(), - extensionProxies: cmap.New(), + proxies: cmap.New(), + extensionProxies: cmap.New(), + legacyExtensionProxies: cmap.New(), proxyFactory: &proxyFactory{ ResourceControlService: parameters.ResourceControlService, TeamMembershipService: parameters.TeamMembershipService, @@ -44,6 +52,83 @@ func NewManager(parameters *ManagerParams) *Manager { } } +// GetProxy returns the proxy associated to a key +func (manager *Manager) GetProxy(key string) http.Handler { + proxy, ok := manager.proxies.Get(key) + if !ok { + return nil + } + return proxy.(http.Handler) +} + +// CreateAndRegisterProxy creates a new HTTP reverse proxy based on endpoint properties and and adds it to the registered proxies. +// It can also be used to create a new HTTP reverse proxy and replace an already registered proxy. +func (manager *Manager) CreateAndRegisterProxy(endpoint *portainer.Endpoint) (http.Handler, error) { + proxy, err := manager.createProxy(endpoint) + if err != nil { + return nil, err + } + + manager.proxies.Set(string(endpoint.ID), proxy) + return proxy, nil +} + +// DeleteProxy deletes the proxy associated to a key +func (manager *Manager) DeleteProxy(key string) { + manager.proxies.Remove(key) +} + +// GetExtensionProxy returns an extension proxy associated to an extension identifier +func (manager *Manager) GetExtensionProxy(extensionID portainer.ExtensionID) http.Handler { + proxy, ok := manager.extensionProxies.Get(strconv.Itoa(int(extensionID))) + if !ok { + return nil + } + return proxy.(http.Handler) +} + +// CreateExtensionProxy creates a new HTTP reverse proxy for an extension and +// registers it in the extension map associated to the specified extension identifier +func (manager *Manager) CreateExtensionProxy(extensionID portainer.ExtensionID) (http.Handler, error) { + address := "http://localhost:" + extensionPorts[extensionID] + + extensionURL, err := url.Parse(address) + if err != nil { + return nil, err + } + + proxy := manager.proxyFactory.newHTTPProxy(extensionURL) + manager.extensionProxies.Set(strconv.Itoa(int(extensionID)), proxy) + + return proxy, nil +} + +// DeleteExtensionProxy deletes the extension proxy associated to an extension identifier +func (manager *Manager) DeleteExtensionProxy(extensionID portainer.ExtensionID) { + manager.extensionProxies.Remove(strconv.Itoa(int(extensionID))) +} + +// GetLegacyExtensionProxy returns a legacy extension proxy associated to a key +func (manager *Manager) GetLegacyExtensionProxy(key string) http.Handler { + proxy, ok := manager.legacyExtensionProxies.Get(key) + if !ok { + return nil + } + return proxy.(http.Handler) +} + +// CreateLegacyExtensionProxy creates a new HTTP reverse proxy for a legacy extension and adds it to the registered proxies. +func (manager *Manager) CreateLegacyExtensionProxy(key, extensionAPIURL string) (http.Handler, error) { + extensionURL, err := url.Parse(extensionAPIURL) + if err != nil { + return nil, err + } + + proxy := manager.proxyFactory.newHTTPProxy(extensionURL) + manager.extensionProxies.Set(key, proxy) + return proxy, nil +} + func (manager *Manager) createDockerProxy(endpointURL *url.URL, tlsConfig *portainer.TLSConfiguration) (http.Handler, error) { if endpointURL.Scheme == "tcp" { if tlsConfig.TLS || tlsConfig.TLSSkipVerify { @@ -69,59 +154,3 @@ func (manager *Manager) createProxy(endpoint *portainer.Endpoint) (http.Handler, return manager.createDockerProxy(endpointURL, &endpoint.TLSConfig) } } - -// CreateAndRegisterProxy creates a new HTTP reverse proxy based on endpoint properties and and adds it to the registered proxies. -// It can also be used to create a new HTTP reverse proxy and replace an already registered proxy. -func (manager *Manager) CreateAndRegisterProxy(endpoint *portainer.Endpoint) (http.Handler, error) { - proxy, err := manager.createProxy(endpoint) - if err != nil { - return nil, err - } - - manager.proxies.Set(string(endpoint.ID), proxy) - return proxy, nil -} - -// GetProxy returns the proxy associated to a key -func (manager *Manager) GetProxy(key string) http.Handler { - proxy, ok := manager.proxies.Get(key) - if !ok { - return nil - } - return proxy.(http.Handler) -} - -// DeleteProxy deletes the proxy associated to a key -func (manager *Manager) DeleteProxy(key string) { - manager.proxies.Remove(key) -} - -// CreateAndRegisterExtensionProxy creates a new HTTP reverse proxy for an extension and adds it to the registered proxies. -func (manager *Manager) CreateAndRegisterExtensionProxy(key, extensionAPIURL string) (http.Handler, error) { - extensionURL, err := url.Parse(extensionAPIURL) - if err != nil { - return nil, err - } - - proxy := manager.proxyFactory.newHTTPProxy(extensionURL) - manager.extensionProxies.Set(key, proxy) - return proxy, nil -} - -// GetExtensionProxy returns the extension proxy associated to a key -func (manager *Manager) GetExtensionProxy(key string) http.Handler { - proxy, ok := manager.extensionProxies.Get(key) - if !ok { - return nil - } - return proxy.(http.Handler) -} - -// DeleteExtensionProxies deletes all the extension proxies associated to a key -func (manager *Manager) DeleteExtensionProxies(key string) { - for _, k := range manager.extensionProxies.Keys() { - if strings.Contains(k, key+"_") { - manager.extensionProxies.Remove(k) - } - } -} diff --git a/api/http/server.go b/api/http/server.go index 461a1f4ee..1220d94d1 100644 --- a/api/http/server.go +++ b/api/http/server.go @@ -11,6 +11,7 @@ import ( "github.com/portainer/portainer/http/handler/endpointgroups" "github.com/portainer/portainer/http/handler/endpointproxy" "github.com/portainer/portainer/http/handler/endpoints" + "github.com/portainer/portainer/http/handler/extensions" "github.com/portainer/portainer/http/handler/file" "github.com/portainer/portainer/http/handler/motd" "github.com/portainer/portainer/http/handler/registries" @@ -41,6 +42,7 @@ type Server struct { AuthDisabled bool EndpointManagement bool Status *portainer.Status + ExtensionManager portainer.ExtensionManager ComposeStackManager portainer.ComposeStackManager CryptoService portainer.CryptoService SignatureService portainer.DigitalSignatureService @@ -53,6 +55,7 @@ type Server struct { GitService portainer.GitService JWTService portainer.JWTService LDAPService portainer.LDAPService + ExtensionService portainer.ExtensionService RegistryService portainer.RegistryService ResourceControlService portainer.ResourceControlService ScheduleService portainer.ScheduleService @@ -128,8 +131,15 @@ func (server *Server) Start() error { var motdHandler = motd.NewHandler(requestBouncer) + var extensionHandler = extensions.NewHandler(requestBouncer) + extensionHandler.ExtensionService = server.ExtensionService + extensionHandler.ExtensionManager = server.ExtensionManager + var registryHandler = registries.NewHandler(requestBouncer) registryHandler.RegistryService = server.RegistryService + registryHandler.ExtensionService = server.ExtensionService + registryHandler.FileService = server.FileService + registryHandler.ProxyManager = proxyManager var resourceControlHandler = resourcecontrols.NewHandler(requestBouncer) resourceControlHandler.ResourceControlService = server.ResourceControlService @@ -203,6 +213,7 @@ func (server *Server) Start() error { EndpointProxyHandler: endpointProxyHandler, FileHandler: fileHandler, MOTDHandler: motdHandler, + ExtensionHandler: extensionHandler, RegistryHandler: registryHandler, ResourceControlHandler: resourceControlHandler, SettingsHandler: settingsHandler, diff --git a/api/portainer.go b/api/portainer.go index ad7891c9d..698faae76 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -165,17 +165,32 @@ type ( // RegistryID represents a registry identifier RegistryID int + // RegistryType represents a type of registry + RegistryType int + // Registry represents a Docker registry with all the info required // to connect to it Registry struct { - ID RegistryID `json:"Id"` - Name string `json:"Name"` - URL string `json:"URL"` - Authentication bool `json:"Authentication"` - Username string `json:"Username"` - Password string `json:"Password,omitempty"` - AuthorizedUsers []UserID `json:"AuthorizedUsers"` - AuthorizedTeams []TeamID `json:"AuthorizedTeams"` + ID RegistryID `json:"Id"` + Type RegistryType `json:"Type"` + Name string `json:"Name"` + URL string `json:"URL"` + Authentication bool `json:"Authentication"` + Username string `json:"Username"` + Password string `json:"Password,omitempty"` + AuthorizedUsers []UserID `json:"AuthorizedUsers"` + AuthorizedTeams []TeamID `json:"AuthorizedTeams"` + ManagementConfiguration *RegistryManagementConfiguration `json:"ManagementConfiguration"` + } + + // RegistryManagementConfiguration represents a configuration that can be used to query + // the registry API via the registry management extension. + RegistryManagementConfiguration struct { + Type RegistryType `json:"Type"` + Authentication bool `json:"Authentication"` + Username string `json:"Username"` + Password string `json:"Password"` + TLSConfig TLSConfiguration `json:"TLSConfig"` } // DockerHub represents all the required information to connect and use the @@ -323,7 +338,8 @@ type ( Labels []Pair `json:"Labels"` } - // EndpointExtension represents a extension associated to an endpoint + // EndpointExtension represents a deprecated form of Portainer extension + // TODO: legacy extension management EndpointExtension struct { Type EndpointExtensionType `json:"Type"` URL string `json:"URL"` @@ -459,6 +475,35 @@ type ( // It can be either a TLS CA file, a TLS certificate file or a TLS key file TLSFileType int + // ExtensionID represents a extension identifier + ExtensionID int + + // Extension represents a Portainer extension + Extension struct { + ID ExtensionID `json:"Id"` + Enabled bool `json:"Enabled"` + Name string `json:"Name,omitempty"` + ShortDescription string `json:"ShortDescription,omitempty"` + Description string `json:"Description,omitempty"` + Price string `json:"Price,omitempty"` + PriceDescription string `json:"PriceDescription,omitempty"` + Deal bool `json:"Deal,omitempty"` + Available bool `json:"Available,omitempty"` + License LicenseInformation `json:"License,omitempty"` + Version string `json:"Version"` + UpdateAvailable bool `json:"UpdateAvailable"` + ProductID int `json:"ProductId,omitempty"` + Images []string `json:"Images,omitempty"` + Logo string `json:"Logo,omitempty"` + } + + // LicenseInformation represents information about an extension license + LicenseInformation struct { + LicenseKey string `json:"LicenseKey,omitempty"` + Company string `json:"Company,omitempty"` + Expiration string `json:"Expiration,omitempty"` + } + // CLIService represents a service for managing CLI CLIService interface { ParseFlags(version string) (*CLIFlags, error) @@ -617,6 +662,14 @@ type ( DeleteTemplate(ID TemplateID) error } + // ExtensionService represents a service for managing extension data + ExtensionService interface { + Extension(ID ExtensionID) (*Extension, error) + Extensions() ([]Extension, error) + Persist(extension *Extension) error + DeleteExtension(ID ExtensionID) error + } + // CryptoService represents a service for encrypting/hashing data CryptoService interface { Hash(data string) (string, error) @@ -649,6 +702,7 @@ type ( DeleteTLSFiles(folder string) error GetStackProjectPath(stackIdentifier string) string StoreStackFileFromBytes(stackIdentifier, fileName string, data []byte) (string, error) + StoreRegistryManagementFileFromBytes(folder, fileName string, data []byte) (string, error) KeyPairFilesExist() (bool, error) StoreKeyPair(private, public []byte, privatePEMHeader, publicPEMHeader string) error LoadKeyPair() ([]byte, []byte, error) @@ -656,6 +710,8 @@ type ( FileExists(path string) (bool, error) StoreScheduledJobFileFromBytes(identifier string, data []byte) (string, error) GetScheduleFolder(identifier string) string + ExtractExtensionArchive(data []byte) error + GetBinaryFolder() string } // GitService represents a service for managing Git @@ -709,6 +765,14 @@ type ( JobService interface { ExecuteScript(endpoint *Endpoint, nodeName, image string, script []byte, schedule *Schedule) error } + + // ExtensionManager represents a service used to manage extensions + ExtensionManager interface { + FetchExtensionDefinitions() ([]Extension, error) + EnableExtension(extension *Extension, licenseKey string) error + DisableExtension(extension *Extension) error + UpdateExtension(extension *Extension, version string) error + } ) const ( @@ -718,6 +782,8 @@ const ( DBVersion = 15 // MessageOfTheDayURL represents the URL where Portainer MOTD message can be retrieved MessageOfTheDayURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com/motd.html" + // ExtensionDefinitionsURL represents the URL where Portainer extension definitions can be retrieved + ExtensionDefinitionsURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com/extensions.json" // 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 @@ -838,6 +904,12 @@ const ( ServiceWebhook ) +const ( + _ ExtensionID = iota + // RegistryManagementExtension represents the registry management extension + RegistryManagementExtension +) + const ( _ JobType = iota // ScriptExecutionJobType is a non-system job used to execute a script against a list of @@ -849,3 +921,13 @@ const ( // an external definition store EndpointSyncJobType ) + +const ( + _ RegistryType = iota + // QuayRegistry represents a Quay.io registry + QuayRegistry + // AzureRegistry represents an ACR registry + AzureRegistry + // CustomRegistry represents a custom registry + CustomRegistry +) diff --git a/app/__module.js b/app/__module.js index 429e2acc0..0ffc3c7c6 100644 --- a/app/__module.js +++ b/app/__module.js @@ -22,6 +22,7 @@ angular.module('portainer', [ 'portainer.agent', 'portainer.azure', 'portainer.docker', + 'portainer.extensions', 'extension.storidge', 'rzModule', 'moment-picker' diff --git a/app/app.js b/app/app.js index 3c54bc3bf..021f4d58a 100644 --- a/app/app.js +++ b/app/app.js @@ -43,8 +43,10 @@ function initAuthentication(authManager, Authentication, $rootScope, $state) { // hitting a 401. We're using this instead of the usual combination of // authManager.redirectWhenUnauthenticated() + unauthenticatedRedirector // to have more controls on which URL should trigger the unauthenticated state. - $rootScope.$on('unauthenticated', function () { - $state.go('portainer.auth', {error: 'Your session has expired'}); + $rootScope.$on('unauthenticated', function (event, data) { + if (!_.includes(data.config.url, '/v2/')) { + $state.go('portainer.auth', {error: 'Your session has expired'}); + } }); } diff --git a/app/constants.js b/app/constants.js index 0142d4c18..464089158 100644 --- a/app/constants.js +++ b/app/constants.js @@ -4,6 +4,7 @@ angular.module('portainer') .constant('API_ENDPOINT_ENDPOINTS', 'api/endpoints') .constant('API_ENDPOINT_ENDPOINT_GROUPS', 'api/endpoint_groups') .constant('API_ENDPOINT_MOTD', 'api/motd') +.constant('API_ENDPOINT_EXTENSIONS', 'api/extensions') .constant('API_ENDPOINT_REGISTRIES', 'api/registries') .constant('API_ENDPOINT_RESOURCE_CONTROLS', 'api/resource_controls') .constant('API_ENDPOINT_SCHEDULES', 'api/schedules') diff --git a/app/extensions/_module.js b/app/extensions/_module.js new file mode 100644 index 000000000..5a936d2cf --- /dev/null +++ b/app/extensions/_module.js @@ -0,0 +1,3 @@ +angular.module('portainer.extensions', [ + 'portainer.extensions.registrymanagement' +]); diff --git a/app/extensions/registry-management/_module.js b/app/extensions/registry-management/_module.js new file mode 100644 index 000000000..44599be3b --- /dev/null +++ b/app/extensions/registry-management/_module.js @@ -0,0 +1,41 @@ +angular.module('portainer.extensions.registrymanagement', []) +.config(['$stateRegistryProvider', function ($stateRegistryProvider) { + 'use strict'; + + var registryConfiguration = { + name: 'portainer.registries.registry.configure', + url: '/configure', + views: { + 'content@': { + templateUrl: 'app/extensions/registry-management/views/configure/configureregistry.html', + controller: 'ConfigureRegistryController' + } + } + }; + + var registryRepositories = { + name: 'portainer.registries.registry.repositories', + url: '/repositories', + views: { + 'content@': { + templateUrl: 'app/extensions/registry-management/views/repositories/registryRepositories.html', + controller: 'RegistryRepositoriesController' + } + } + }; + + var registryRepositoryTags = { + name: 'portainer.registries.registry.repository', + url: '/:repository', + views: { + 'content@': { + templateUrl: 'app/extensions/registry-management/views/repositories/edit/registryRepository.html', + controller: 'RegistryRepositoryController' + } + } + }; + + $stateRegistryProvider.register(registryConfiguration); + $stateRegistryProvider.register(registryRepositories); + $stateRegistryProvider.register(registryRepositoryTags); +}]); diff --git a/app/extensions/registry-management/components/registries-repositories-datatable/registryRepositoriesDatatable.html b/app/extensions/registry-management/components/registries-repositories-datatable/registryRepositoriesDatatable.html new file mode 100644 index 000000000..c416605a3 --- /dev/null +++ b/app/extensions/registry-management/components/registries-repositories-datatable/registryRepositoriesDatatable.html @@ -0,0 +1,83 @@ +
    + + +
    +
    + {{ $ctrl.titleText }} +
    +
    +
    + + +
    +
    +
    + + + + + + + + + + + + + + + + + + +
    + + + + + + Repository + + + + + + Tags count + + + +
    + + + + + {{ item.Name }} + {{ item.TagsCount }}
    Loading...
    No repository available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    + + +
    \ No newline at end of file diff --git a/app/extensions/registry-management/components/registries-repositories-datatable/registryRepositoriesDatatable.js b/app/extensions/registry-management/components/registries-repositories-datatable/registryRepositoriesDatatable.js new file mode 100644 index 000000000..a8cd8a27a --- /dev/null +++ b/app/extensions/registry-management/components/registries-repositories-datatable/registryRepositoriesDatatable.js @@ -0,0 +1,13 @@ +angular.module('portainer.extensions.registrymanagement').component('registryRepositoriesDatatable', { + templateUrl: 'app/extensions/registry-management/components/registries-repositories-datatable/registryRepositoriesDatatable.html', + controller: 'GenericDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + removeAction: '<' + } +}); diff --git a/app/extensions/registry-management/components/registries-repository-tags-datatable/registriesRepositoryTagsDatatable.html b/app/extensions/registry-management/components/registries-repository-tags-datatable/registriesRepositoryTagsDatatable.html new file mode 100644 index 000000000..20d127d38 --- /dev/null +++ b/app/extensions/registry-management/components/registries-repository-tags-datatable/registriesRepositoryTagsDatatable.html @@ -0,0 +1,112 @@ +
    + + +
    +
    + {{ + $ctrl.titleText }} +
    +
    +
    + +
    +
    + + +
    +
    + + + + + + + + + + + + + + + + + + + + + + + + + +
    + + + + + + Name + + + + Os/Architecture + + Image ID + + + + + + Size + + + + Actions
    + + + + + {{ item.Name }} + {{ item.Os }}/{{ item.Architecture }}{{ item.ImageId | truncate:40 }}{{ item.Size | humansize }} + + + Retag + + + + + + + +
    Loading...
    No tag available.
    +
    +
    +
    + {{ $ctrl.state.selectedItemCount }} item(s) selected +
    +
    +
    + + + Items per page + + + + +
    +
    +
    +     +     +
    \ No newline at end of file diff --git a/app/extensions/registry-management/components/registries-repository-tags-datatable/registriesRepositoryTagsDatatable.js b/app/extensions/registry-management/components/registries-repository-tags-datatable/registriesRepositoryTagsDatatable.js new file mode 100644 index 000000000..5c18c6a1c --- /dev/null +++ b/app/extensions/registry-management/components/registries-repository-tags-datatable/registriesRepositoryTagsDatatable.js @@ -0,0 +1,14 @@ +angular.module('portainer.extensions.registrymanagement').component('registriesRepositoryTagsDatatable', { + templateUrl: 'app/extensions/registry-management/components/registries-repository-tags-datatable/registriesRepositoryTagsDatatable.html', + controller: 'GenericDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + removeAction: '<', + retagAction: '<' + } +}); diff --git a/app/extensions/registry-management/helpers/localRegistryHelper.js b/app/extensions/registry-management/helpers/localRegistryHelper.js new file mode 100644 index 000000000..b4a0bd22a --- /dev/null +++ b/app/extensions/registry-management/helpers/localRegistryHelper.js @@ -0,0 +1,38 @@ +angular.module('portainer.extensions.registrymanagement') + .factory('RegistryV2Helper', [function RegistryV2HelperFactory() { + 'use strict'; + + var helper = {}; + + function historyRawToParsed(rawHistory) { + var history = []; + for (var i = 0; i < rawHistory.length; i++) { + var item = rawHistory[i]; + history.push(angular.fromJson(item.v1Compatibility)); + } + return history; + } + + helper.manifestsToTag = function (manifests) { + var v1 = manifests.v1; + var v2 = manifests.v2; + + var history = historyRawToParsed(v1.history); + var imageId = history[0].id; + var name = v1.tag; + var os = history[0].os; + var arch = v1.architecture; + var size = v2.layers.reduce(function (a, b) { + return { + size: a.size + b.size + }; + }).size; + var digest = v2.digest; + var repositoryName = v1.name; + var fsLayers = v1.fsLayers; + + return new RepositoryTagViewModel(name, imageId, os, arch, size, digest, repositoryName, fsLayers, history, v2); + }; + + return helper; + }]); diff --git a/app/extensions/registry-management/models/registryRepository.js b/app/extensions/registry-management/models/registryRepository.js new file mode 100644 index 000000000..d3f7f02a7 --- /dev/null +++ b/app/extensions/registry-management/models/registryRepository.js @@ -0,0 +1,4 @@ +function RegistryRepositoryViewModel(data) { + this.Name = data.name; + this.TagsCount = data.tags.length; +} \ No newline at end of file diff --git a/app/extensions/registry-management/models/repositoryTag.js b/app/extensions/registry-management/models/repositoryTag.js new file mode 100644 index 000000000..1139bbf13 --- /dev/null +++ b/app/extensions/registry-management/models/repositoryTag.js @@ -0,0 +1,12 @@ +function RepositoryTagViewModel(name, imageId, os, arch, size, digest, repositoryName, fsLayers, history, manifestv2) { + this.Name = name; + this.ImageId = imageId; + this.Os = os; + this.Architecture = arch; + this.Size = size; + this.Digest = digest; + this.RepositoryName = repositoryName; + this.FsLayers = fsLayers; + this.History = history; + this.ManifestV2 = manifestv2; +} \ No newline at end of file diff --git a/app/extensions/registry-management/rest/catalog.js b/app/extensions/registry-management/rest/catalog.js new file mode 100644 index 000000000..1d6f24be5 --- /dev/null +++ b/app/extensions/registry-management/rest/catalog.js @@ -0,0 +1,23 @@ +angular.module('portainer.extensions.registrymanagement') +.factory('RegistryCatalog', ['$resource', 'API_ENDPOINT_REGISTRIES', function RegistryCatalogFactory($resource, API_ENDPOINT_REGISTRIES) { + 'use strict'; + return $resource(API_ENDPOINT_REGISTRIES + '/:id/v2/:action', {}, + { + get: { + method: 'GET', + params: { id: '@id', action: '_catalog' } + }, + ping: { + method: 'GET', + params: { id: '@id' }, timeout: 3500 + }, + pingWithForceNew: { + method: 'GET', + params: { id: '@id' }, timeout: 3500, + headers: { 'X-RegistryManagement-ForceNew': '1' } + } + }, + { + stripTrailingSlashes: false + }); +}]); diff --git a/app/extensions/registry-management/rest/manifest.js b/app/extensions/registry-management/rest/manifest.js new file mode 100644 index 000000000..475a524e6 --- /dev/null +++ b/app/extensions/registry-management/rest/manifest.js @@ -0,0 +1,61 @@ +angular.module('portainer.extensions.registrymanagement') +.factory('RegistryManifests', ['$resource', 'API_ENDPOINT_REGISTRIES', function RegistryManifestsFactory($resource, API_ENDPOINT_REGISTRIES) { + 'use strict'; + return $resource(API_ENDPOINT_REGISTRIES + '/:id/v2/:repository/manifests/:tag', {}, { + get: { + method: 'GET', + params: { + id: '@id', + repository: '@repository', + tag: '@tag' + }, + headers: { + 'Cache-Control': 'no-cache' + }, + transformResponse: function (data, headers) { + var response = angular.fromJson(data); + response.digest = headers('docker-content-digest'); + return response; + } + }, + getV2: { + method: 'GET', + params: { + id: '@id', + repository: '@repository', + tag: '@tag' + }, + headers: { + 'Accept': 'application/vnd.docker.distribution.manifest.v2+json', + 'Cache-Control': 'no-cache' + }, + transformResponse: function (data, headers) { + var response = angular.fromJson(data); + response.digest = headers('docker-content-digest'); + return response; + } + }, + put: { + method: 'PUT', + params: { + id: '@id', + repository: '@repository', + tag: '@tag' + }, + headers: { + 'Content-Type': 'application/vnd.docker.distribution.manifest.v2+json' + }, + transformRequest: function (data) { + return angular.toJson(data, 3); + } + }, + delete: { + method: 'DELETE', + params: { + id: '@id', + repository: '@repository', + tag: '@tag' + } + } + }); +}]); diff --git a/app/extensions/registry-management/rest/tags.js b/app/extensions/registry-management/rest/tags.js new file mode 100644 index 000000000..c880305f8 --- /dev/null +++ b/app/extensions/registry-management/rest/tags.js @@ -0,0 +1,10 @@ +angular.module('portainer.extensions.registrymanagement') +.factory('RegistryTags', ['$resource', 'API_ENDPOINT_REGISTRIES', function RegistryTagsFactory($resource, API_ENDPOINT_REGISTRIES) { + 'use strict'; + return $resource(API_ENDPOINT_REGISTRIES + '/:id/v2/:repository/tags/list', {}, { + get: { + method: 'GET', + params: { id: '@id', repository: '@repository' } + } + }); +}]); diff --git a/app/extensions/registry-management/services/registryAPIService.js b/app/extensions/registry-management/services/registryAPIService.js new file mode 100644 index 000000000..b766ca568 --- /dev/null +++ b/app/extensions/registry-management/services/registryAPIService.js @@ -0,0 +1,118 @@ +angular.module('portainer.extensions.registrymanagement') +.factory('RegistryV2Service', ['$q', 'RegistryCatalog', 'RegistryTags', 'RegistryManifests', 'RegistryV2Helper', +function RegistryV2ServiceFactory($q, RegistryCatalog, RegistryTags, RegistryManifests, RegistryV2Helper) { + 'use strict'; + var service = {}; + + service.ping = function(id, forceNewConfig) { + if (forceNewConfig) { + return RegistryCatalog.pingWithForceNew({ id: id }).$promise; + } + return RegistryCatalog.ping({ id: id }).$promise; + }; + + service.repositories = function (id) { + var deferred = $q.defer(); + + RegistryCatalog.get({ + id: id + }).$promise + .then(function success(data) { + var promises = []; + for (var i = 0; i < data.repositories.length; i++) { + var repository = data.repositories[i]; + promises.push(RegistryTags.get({ + id: id, + repository: repository + }).$promise); + } + return $q.all(promises); + }) + .then(function success(data) { + var repositories = data.map(function (item) { + if (!item.tags) { + return; + } + return new RegistryRepositoryViewModel(item); + }); + repositories = _.without(repositories, undefined); + deferred.resolve(repositories); + }) + .catch(function error(err) { + deferred.reject({ + msg: 'Unable to retrieve repositories', + err: err + }); + }); + + return deferred.promise; + }; + + service.tags = function (id, repository) { + var deferred = $q.defer(); + + RegistryTags.get({ + id: id, + repository: repository + }).$promise + .then(function succes(data) { + deferred.resolve(data.tags); + }).catch(function error(err) { + deferred.reject({ + msg: 'Unable to retrieve tags', + err: err + }); + }); + + return deferred.promise; + }; + + service.tag = function (id, repository, tag) { + var deferred = $q.defer(); + + var promises = { + v1: RegistryManifests.get({ + id: id, + repository: repository, + tag: tag + }).$promise, + v2: RegistryManifests.getV2({ + id: id, + repository: repository, + tag: tag + }).$promise + }; + $q.all(promises) + .then(function success(data) { + var tag = RegistryV2Helper.manifestsToTag(data); + deferred.resolve(tag); + }).catch(function error(err) { + deferred.reject({ + msg: 'Unable to retrieve tag ' + tag, + err: err + }); + }); + + return deferred.promise; + }; + + service.addTag = function (id, repository, tag, manifest) { + delete manifest.digest; + return RegistryManifests.put({ + id: id, + repository: repository, + tag: tag + }, manifest).$promise; + }; + + service.deleteManifest = function (id, repository, digest) { + return RegistryManifests.delete({ + id: id, + repository: repository, + tag: digest + }).$promise; + }; + + return service; +} +]); diff --git a/app/extensions/registry-management/views/configure/configureRegistryController.js b/app/extensions/registry-management/views/configure/configureRegistryController.js new file mode 100644 index 000000000..bbed8be30 --- /dev/null +++ b/app/extensions/registry-management/views/configure/configureRegistryController.js @@ -0,0 +1,66 @@ +angular.module('portainer.extensions.registrymanagement') +.controller('ConfigureRegistryController', ['$scope', '$state', '$transition$', 'RegistryService', 'RegistryV2Service', 'Notifications', +function ($scope, $state, $transition$, RegistryService, RegistryV2Service, Notifications) { + + $scope.state = { + testInProgress: false, + updateInProgress: false, + validConfiguration : false + }; + + $scope.testConfiguration = testConfiguration; + $scope.updateConfiguration = updateConfiguration; + + function testConfiguration() { + $scope.state.testInProgress = true; + + RegistryService.configureRegistry($scope.registry.Id, $scope.model) + .then(function success() { + return RegistryV2Service.ping($scope.registry.Id, true); + }) + .then(function success() { + Notifications.success('Success', 'Valid management configuration'); + $scope.state.validConfiguration = true; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Invalid management configuration'); + }) + .finally(function final() { + $scope.state.testInProgress = false; + }); + } + + function updateConfiguration() { + $scope.state.updateInProgress = true; + + RegistryService.configureRegistry($scope.registry.Id, $scope.model) + .then(function success() { + Notifications.success('Success', 'Registry management configuration updated'); + $state.go('portainer.registries.registry.repositories', { id: $scope.registry.Id }, {reload: true}); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to update registry management configuration'); + }) + .finally(function final() { + $scope.state.updateInProgress = false; + }); + } + + function initView() { + var registryId = $transition$.params().id; + + RegistryService.registry(registryId) + .then(function success(data) { + var registry = data; + var model = new RegistryManagementConfigurationDefaultModel(registry); + + $scope.registry = registry; + $scope.model = model; + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve registry details'); + }); + } + + initView(); +}]); diff --git a/app/extensions/registry-management/views/configure/configureregistry.html b/app/extensions/registry-management/views/configure/configureregistry.html new file mode 100644 index 000000000..48574dc41 --- /dev/null +++ b/app/extensions/registry-management/views/configure/configureregistry.html @@ -0,0 +1,161 @@ + + + + Registries > {{ registry.Name }} > Management configuration + + + +
    +
    + + +
    +
    + Information +
    +
    + + The following configuration will be used to access this registry API to provide Portainer management features. + +
    +
    + Registry details +
    + +
    + +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    + +
    + +
    + +
    +
    + + +
    + +
    + +
    +
    + +
    + + +
    + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + +
    + Required TLS files +
    + +
    + +
    + +
    + + + {{ model.TLSCACertFile.name }} + + + +
    +
    + + +
    + +
    + + + {{ model.TLSCertFile.name }} + + + +
    +
    + + +
    + +
    + + + {{ model.TLSKeyFile.name }} + + + +
    +
    + +
    +
    + +
    + Actions +
    +
    +
    + + +
    +
    +
    +     +     +
    +
    diff --git a/app/extensions/registry-management/views/repositories/edit/registryRepository.html b/app/extensions/registry-management/views/repositories/edit/registryRepository.html new file mode 100644 index 000000000..bb94f3247 --- /dev/null +++ b/app/extensions/registry-management/views/repositories/edit/registryRepository.html @@ -0,0 +1,88 @@ + + + + + + + + Registries > + {{ registry.Name }} > + {{ repository.Name }} + + + +
    +
    + + + + + + + + + + + + + + + + + + + +
    Repository + {{ repository.Name }} + +
    Tags count{{ repository.Tags.length }}
    Images count{{ repository.Images.length }}
    +     +     +
    + +
    + + + + +
    +
    + +
    + +
    +
    +
    + + + + {{ $select.selected }} + + + {{ image }} + + +
    +
    +
    + +
    +
    +
    +     +     +
    +
    + +
    +
    + +
    +
    \ No newline at end of file diff --git a/app/extensions/registry-management/views/repositories/edit/registryRepositoryController.js b/app/extensions/registry-management/views/repositories/edit/registryRepositoryController.js new file mode 100644 index 000000000..de4521cb1 --- /dev/null +++ b/app/extensions/registry-management/views/repositories/edit/registryRepositoryController.js @@ -0,0 +1,150 @@ +angular.module('portainer.app') + .controller('RegistryRepositoryController', ['$q', '$scope', '$transition$', '$state', 'RegistryV2Service', 'RegistryService', 'ModalService', 'Notifications', + function ($q, $scope, $transition$, $state, RegistryV2Service, RegistryService, ModalService, Notifications) { + + $scope.state = { + actionInProgress: false + }; + $scope.formValues = { + Tag: '' + }; + $scope.tags = []; + $scope.repository = { + Name: [], + Tags: [], + Images: [] + }; + + $scope.$watch('tags.length', function () { + var images = $scope.tags.map(function (item) { + return item.ImageId; + }); + $scope.repository.Images = _.uniq(images); + }); + + $scope.addTag = function () { + var manifest = $scope.tags.find(function (item) { + return item.ImageId === $scope.formValues.SelectedImage; + }).ManifestV2; + RegistryV2Service.addTag($scope.registryId, $scope.repository.Name, $scope.formValues.Tag, manifest) + .then(function success() { + Notifications.success('Success', 'Tag successfully added'); + $state.reload(); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to add tag'); + }); + }; + + $scope.retagAction = function (tag) { + RegistryV2Service.deleteManifest($scope.registryId, $scope.repository.Name, tag.Digest) + .then(function success() { + var promises = []; + var tagsToAdd = $scope.tags.filter(function (item) { + return item.Digest === tag.Digest; + }); + tagsToAdd.map(function (item) { + var tagValue = item.Modified && item.Name !== item.NewName ? item.NewName : item.Name; + promises.push(RegistryV2Service.addTag($scope.registryId, $scope.repository.Name, tagValue, item.ManifestV2)); + }); + return $q.all(promises); + }) + .then(function success() { + Notifications.success('Success', 'Tag successfully modified'); + $state.reload(); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to modify tag'); + tag.Modified = false; + tag.NewValue = tag.Value; + }); + }; + + $scope.removeTags = function (selectedItems) { + ModalService.confirmDeletion( + 'Are you sure you want to remove the selected tags ?', + function onConfirm(confirmed) { + if (!confirmed) { + return; + } + var promises = []; + var uniqItems = _.uniqBy(selectedItems, 'Digest'); + uniqItems.map(function (item) { + promises.push(RegistryV2Service.deleteManifest($scope.registryId, $scope.repository.Name, item.Digest)); + }); + $q.all(promises) + .then(function success() { + var promises = []; + var tagsToReupload = _.differenceBy($scope.tags, selectedItems, 'Name'); + tagsToReupload.map(function (item) { + promises.push(RegistryV2Service.addTag($scope.registryId, $scope.repository.Name, item.Name, item.ManifestV2)); + }); + return $q.all(promises); + }) + .then(function success() { + Notifications.success('Success', 'Tags successfully deleted'); + $state.reload(); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to delete tags'); + }); + }); + }; + + $scope.removeRepository = function () { + ModalService.confirmDeletion( + 'This action will only remove the manifests linked to this repository. You need to manually trigger a garbage collector pass on your registry to remove orphan layers and really remove the images content. THIS ACTION CAN NOT BE UNDONE', + function onConfirm(confirmed) { + if (!confirmed) { + return; + } + var promises = []; + var uniqItems = _.uniqBy($scope.tags, 'Digest'); + uniqItems.map(function (item) { + promises.push(RegistryV2Service.deleteManifest($scope.registryId, $scope.repository.Name, item.Digest)); + }); + $q.all(promises) + .then(function success() { + Notifications.success('Success', 'Repository sucessfully removed'); + $state.go('portainer.registries.registry.repositories', { + id: $scope.registryId + }, { + reload: true + }); + }).catch(function error(err) { + Notifications.error('Failure', err, 'Unable to delete repository'); + }); + } + ); + }; + + function initView() { + var registryId = $scope.registryId = $transition$.params().id; + var repository = $scope.repository.Name = $transition$.params().repository; + $q.all({ + registry: RegistryService.registry(registryId), + tags: RegistryV2Service.tags(registryId, repository) + }) + .then(function success(data) { + $scope.registry = data.registry; + $scope.repository.Tags = data.tags; + $scope.tags = []; + for (var i = 0; i < data.tags.length; i++) { + var tag = data.tags[i]; + RegistryV2Service.tag(registryId, repository, tag) + .then(function success(data) { + $scope.tags.push(data); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve tag information'); + }); + } + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve repository information'); + }); + } + + initView(); + } + ]); diff --git a/app/extensions/registry-management/views/repositories/registryRepositories.html b/app/extensions/registry-management/views/repositories/registryRepositories.html new file mode 100644 index 000000000..6ca3664c7 --- /dev/null +++ b/app/extensions/registry-management/views/repositories/registryRepositories.html @@ -0,0 +1,37 @@ + + + + + + + + Registries > {{ registry.Name }} > Repositories + + + +
    + + +

    + + Portainer was not able to use this registry management features. You might need to update the configuration used by Portainer to access this registry. +

    +

    Note: Portainer registry management features are only supported with registries exposing the v2 registry API.

    + +     +     +
    + +
    +
    + + +
    +
    diff --git a/app/extensions/registry-management/views/repositories/registryRepositoriesController.js b/app/extensions/registry-management/views/repositories/registryRepositoriesController.js new file mode 100644 index 000000000..ccf4fb3de --- /dev/null +++ b/app/extensions/registry-management/views/repositories/registryRepositoriesController.js @@ -0,0 +1,33 @@ +angular.module('portainer.extensions.registrymanagement') +.controller('RegistryRepositoriesController', ['$transition$', '$scope', 'RegistryService', 'RegistryV2Service', 'Notifications', +function ($transition$, $scope, RegistryService, RegistryV2Service, Notifications) { + + $scope.state = { + displayInvalidConfigurationMessage: false + }; + + function initView() { + var registryId = $transition$.params().id; + + RegistryService.registry(registryId) + .then(function success(data) { + $scope.registry = data; + + RegistryV2Service.ping(registryId, false) + .then(function success() { + return RegistryV2Service.repositories(registryId); + }) + .then(function success(data) { + $scope.repositories = data; + }) + .catch(function error() { + $scope.state.displayInvalidConfigurationMessage = true; + }); + }) + .catch(function error(err) { + Notifications.error('Failure', err, 'Unable to retrieve registry details'); + }); + } + + initView(); +}]); diff --git a/app/extensions/storidge/__module.js b/app/extensions/storidge/__module.js index 34a1b007e..9fe339859 100644 --- a/app/extensions/storidge/__module.js +++ b/app/extensions/storidge/__module.js @@ -1,3 +1,4 @@ +// TODO: legacy extension management angular.module('extension.storidge', []) .config(['$stateRegistryProvider', function ($stateRegistryProvider) { 'use strict'; diff --git a/app/portainer/__module.js b/app/portainer/__module.js index e6ab9f5d2..b79553a52 100644 --- a/app/portainer/__module.js +++ b/app/portainer/__module.js @@ -198,6 +198,28 @@ angular.module('portainer.app', []) } }; + var extensions = { + name: 'portainer.extensions', + url: '/extensions', + views: { + 'content@': { + templateUrl: 'app/portainer/views/extensions/extensions.html', + controller: 'ExtensionsController' + } + } + }; + + var extension = { + name: 'portainer.extensions.extension', + url: '/extension/:id', + views: { + 'content@': { + templateUrl: 'app/portainer/views/extensions/inspect/extension.html', + controller: 'ExtensionController' + } + } + }; + var registries = { name: 'portainer.registries', url: '/registries', @@ -335,7 +357,22 @@ angular.module('portainer.app', []) url: '/support', views: { 'content@': { - templateUrl: 'app/portainer/views/support/support.html' + templateUrl: 'app/portainer/views/support/support.html', + controller: 'SupportController' + } + }, + params: { + product: {} + } + }; + + var supportProduct = { + name: 'portainer.support.product', + url: '/product', + views: { + 'content@': { + templateUrl: 'app/portainer/views/support/product/product.html', + controller: 'SupportProductController' } } }; @@ -457,6 +494,8 @@ angular.module('portainer.app', []) $stateRegistryProvider.register(init); $stateRegistryProvider.register(initEndpoint); $stateRegistryProvider.register(initAdmin); + $stateRegistryProvider.register(extensions); + $stateRegistryProvider.register(extension); $stateRegistryProvider.register(registries); $stateRegistryProvider.register(registry); $stateRegistryProvider.register(registryAccess); @@ -470,6 +509,7 @@ angular.module('portainer.app', []) $stateRegistryProvider.register(stack); $stateRegistryProvider.register(stackCreation); $stateRegistryProvider.register(support); + $stateRegistryProvider.register(supportProduct); $stateRegistryProvider.register(tags); $stateRegistryProvider.register(updatePassword); $stateRegistryProvider.register(users); diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html index 601171eae..900e3432a 100644 --- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html +++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html @@ -61,6 +61,12 @@ Manage access + + Browse + + + Browse ( ) + diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.js b/app/portainer/components/datatables/registries-datatable/registriesDatatable.js index a24a717c8..be93a88bd 100644 --- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.js +++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.js @@ -9,6 +9,7 @@ angular.module('portainer.app').component('registriesDatatable', { orderBy: '@', reverseOrder: '<', accessManagement: '<', - removeAction: '<' + removeAction: '<', + registryManagement: '<' } }); diff --git a/app/portainer/components/extension-list/extension-item/extension-item.js b/app/portainer/components/extension-list/extension-item/extension-item.js new file mode 100644 index 000000000..4e11ab7f3 --- /dev/null +++ b/app/portainer/components/extension-list/extension-item/extension-item.js @@ -0,0 +1,8 @@ +angular.module('portainer.app').component('extensionItem', { + templateUrl: 'app/portainer/components/extension-list/extension-item/extensionItem.html', + controller: 'ExtensionItemController', + bindings: { + model: '<', + currentDate: '<' + } +}); diff --git a/app/portainer/components/extension-list/extension-item/extensionItem.html b/app/portainer/components/extension-list/extension-item/extensionItem.html new file mode 100644 index 000000000..d9d870a08 --- /dev/null +++ b/app/portainer/components/extension-list/extension-item/extensionItem.html @@ -0,0 +1,46 @@ + +
    +
    + + + + + + + + + +
    + + + {{ $ctrl.model.Name }} + + + + coming soon + deal + expired + enabled + update available + +
    + + +
    + + + {{ $ctrl.model.ShortDescription }} + + + + Licensed to {{ $ctrl.model.License.Company }} - Expires on {{ $ctrl.model.License.Expiration }} + +
    + +     + +
    + +
    diff --git a/app/portainer/components/extension-list/extension-item/extensionItemController.js b/app/portainer/components/extension-list/extension-item/extensionItemController.js new file mode 100644 index 000000000..cdccfefea --- /dev/null +++ b/app/portainer/components/extension-list/extension-item/extensionItemController.js @@ -0,0 +1,18 @@ +angular.module('portainer.app') +.controller('ExtensionItemController', ['$state', +function ($state) { + + var ctrl = this; + ctrl.$onInit = $onInit; + ctrl.goToExtensionView = goToExtensionView; + + function goToExtensionView() { + $state.go('portainer.extensions.extension', { id: ctrl.model.Id }); + } + + function $onInit() { + if (ctrl.currentDate === ctrl.model.License.Expiration) { + ctrl.model.Expired = true; + } + } +}]); diff --git a/app/portainer/components/extension-list/extension-list.js b/app/portainer/components/extension-list/extension-list.js new file mode 100644 index 000000000..6d35f8a68 --- /dev/null +++ b/app/portainer/components/extension-list/extension-list.js @@ -0,0 +1,7 @@ +angular.module('portainer.app').component('extensionList', { + templateUrl: 'app/portainer/components/extension-list/extensionList.html', + bindings: { + extensions: '<', + currentDate: '<' + } +}); diff --git a/app/portainer/components/extension-list/extensionList.html b/app/portainer/components/extension-list/extensionList.html new file mode 100644 index 000000000..3b76d6024 --- /dev/null +++ b/app/portainer/components/extension-list/extensionList.html @@ -0,0 +1,20 @@ +
    + + + +
    +
    + Available extensions +
    +
    + +
    + +
    + +     +     +
    diff --git a/app/portainer/components/extension-tooltip/extension-tooltip.html b/app/portainer/components/extension-tooltip/extension-tooltip.html new file mode 100644 index 000000000..d2dfec892 --- /dev/null +++ b/app/portainer/components/extension-tooltip/extension-tooltip.html @@ -0,0 +1 @@ + diff --git a/app/portainer/components/extension-tooltip/extension-tooltip.js b/app/portainer/components/extension-tooltip/extension-tooltip.js new file mode 100644 index 000000000..df9c62eba --- /dev/null +++ b/app/portainer/components/extension-tooltip/extension-tooltip.js @@ -0,0 +1,3 @@ +angular.module('portainer.app').component('extensionTooltip', { + templateUrl: 'app/portainer/components/extension-tooltip/extension-tooltip.html' +}); diff --git a/app/portainer/components/forms/registry-form-azure/registry-form-azure.html b/app/portainer/components/forms/registry-form-azure/registry-form-azure.html new file mode 100644 index 000000000..0a9217b87 --- /dev/null +++ b/app/portainer/components/forms/registry-form-azure/registry-form-azure.html @@ -0,0 +1,81 @@ +
    +
    + Azure registry details +
    + +
    + +
    + +
    +
    +
    +
    +
    +

    This field is required.

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

    This field is required.

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

    This field is required.

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

    This field is required.

    +
    +
    +
    + + +
    + Actions +
    +
    +
    + +
    +
    + +
    diff --git a/app/portainer/components/forms/registry-form-azure/registry-form-azure.js b/app/portainer/components/forms/registry-form-azure/registry-form-azure.js new file mode 100644 index 000000000..51208f5ba --- /dev/null +++ b/app/portainer/components/forms/registry-form-azure/registry-form-azure.js @@ -0,0 +1,9 @@ +angular.module('portainer.app').component('registryFormAzure', { + templateUrl: 'app/portainer/components/forms/registry-form-azure/registry-form-azure.html', + bindings: { + model: '=', + formAction: '<', + formActionLabel: '@', + actionInProgress: '<' + } +}); diff --git a/app/portainer/components/forms/registry-form-custom/registry-form-custom.html b/app/portainer/components/forms/registry-form-custom/registry-form-custom.html new file mode 100644 index 000000000..bb02e9276 --- /dev/null +++ b/app/portainer/components/forms/registry-form-custom/registry-form-custom.html @@ -0,0 +1,105 @@ +
    +
    + Important notice +
    +
    + + Docker requires you to connect to a secure registry. + You can find more information about how to connect to an insecure registry in the Docker documentation. + +
    +
    + Custom registry details +
    + +
    + +
    + +
    +
    +
    +
    +
    +

    This field is required.

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

    This field is required.

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

    This field is required.

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

    This field is required.

    +
    +
    +
    + +
    + +
    + Actions +
    +
    +
    + +
    +
    + +
    diff --git a/app/portainer/components/forms/registry-form-custom/registry-form-custom.js b/app/portainer/components/forms/registry-form-custom/registry-form-custom.js new file mode 100644 index 000000000..5d5da8de7 --- /dev/null +++ b/app/portainer/components/forms/registry-form-custom/registry-form-custom.js @@ -0,0 +1,9 @@ +angular.module('portainer.app').component('registryFormCustom', { + templateUrl: 'app/portainer/components/forms/registry-form-custom/registry-form-custom.html', + bindings: { + model: '=', + formAction: '<', + formActionLabel: '@', + actionInProgress: '<' + } +}); diff --git a/app/portainer/components/forms/registry-form-quay/registry-form-quay.html b/app/portainer/components/forms/registry-form-quay/registry-form-quay.html new file mode 100644 index 000000000..598081b2e --- /dev/null +++ b/app/portainer/components/forms/registry-form-quay/registry-form-quay.html @@ -0,0 +1,48 @@ +
    +
    + Quay account details +
    + +
    + +
    + +
    +
    +
    +
    +
    +

    This field is required.

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

    This field is required.

    +
    +
    +
    + + +
    + Actions +
    +
    +
    + +
    +
    + +
    diff --git a/app/portainer/components/forms/registry-form-quay/registry-form-quay.js b/app/portainer/components/forms/registry-form-quay/registry-form-quay.js new file mode 100644 index 000000000..e08453454 --- /dev/null +++ b/app/portainer/components/forms/registry-form-quay/registry-form-quay.js @@ -0,0 +1,9 @@ +angular.module('portainer.app').component('registryFormQuay', { + templateUrl: 'app/portainer/components/forms/registry-form-quay/registry-form-quay.html', + bindings: { + model: '=', + formAction: '<', + formActionLabel: '@', + actionInProgress: '<' + } +}); diff --git a/app/portainer/components/product-list/product-item/product-item.js b/app/portainer/components/product-list/product-item/product-item.js new file mode 100644 index 000000000..98c177644 --- /dev/null +++ b/app/portainer/components/product-list/product-item/product-item.js @@ -0,0 +1,9 @@ +angular.module('portainer.app').component('productItem', { + templateUrl: 'app/portainer/components/product-list/product-item/productItem.html', + controller: 'ProductItemController', + bindings: { + model: '<', + currentDate: '<', + goTo: '<' + } +}); diff --git a/app/portainer/components/product-list/product-item/productItem.html b/app/portainer/components/product-list/product-item/productItem.html new file mode 100644 index 000000000..fa72a7092 --- /dev/null +++ b/app/portainer/components/product-list/product-item/productItem.html @@ -0,0 +1,41 @@ + +
    +
    + + + + + + +
    + + + {{ $ctrl.model.Name }} + + + + expired + enabled + update available + +
    + + +
    + + + {{ $ctrl.model.ShortDescription }} + + + + Licensed to {{ $ctrl.model.License.Company }} - Expires on {{ $ctrl.model.License.Expiration }} + +
    + +     + +
    + +
    diff --git a/app/portainer/components/product-list/product-item/productItemController.js b/app/portainer/components/product-list/product-item/productItemController.js new file mode 100644 index 000000000..d1d479624 --- /dev/null +++ b/app/portainer/components/product-list/product-item/productItemController.js @@ -0,0 +1,18 @@ +angular.module('portainer.app') +.controller('ProductItemController', ['$state', +function ($state) { + + var ctrl = this; + ctrl.$onInit = $onInit; + ctrl.goToExtensionView = goToExtensionView; + + function goToExtensionView() { + $state.go('portainer.extensions.extension', { id: ctrl.model.Id }); + } + + function $onInit() { + if (ctrl.currentDate === ctrl.model.License.Expiration) { + ctrl.model.Expired = true; + } + } +}]); diff --git a/app/portainer/components/product-list/product-list.js b/app/portainer/components/product-list/product-list.js new file mode 100644 index 000000000..ad3d05025 --- /dev/null +++ b/app/portainer/components/product-list/product-list.js @@ -0,0 +1,10 @@ +angular.module('portainer.app').component('productList', { + templateUrl: 'app/portainer/components/product-list/productList.html', + bindings: { + titleText: '@', + products: '<', + goTo: '<' + // extensions: '<', + // currentDate: '<' + } +}); diff --git a/app/portainer/components/product-list/productList.html b/app/portainer/components/product-list/productList.html new file mode 100644 index 000000000..44606ae28 --- /dev/null +++ b/app/portainer/components/product-list/productList.html @@ -0,0 +1,21 @@ +
    + + + +
    +
    + {{ $ctrl.titleText }} +
    +
    + +
    + +
    + +     +     +
    diff --git a/app/portainer/models/extension.js b/app/portainer/models/extension.js new file mode 100644 index 000000000..12533d0f5 --- /dev/null +++ b/app/portainer/models/extension.js @@ -0,0 +1,17 @@ +function ExtensionViewModel(data) { + this.Id = data.Id; + this.Name = data.Name; + this.Enabled = data.Enabled; + this.Description = data.Description; + this.Price = data.Price; + this.PriceDescription = data.PriceDescription; + this.Available = data.Available; + this.Deal = data.Deal; + this.ShortDescription = data.ShortDescription; + this.License = data.License; + this.Version = data.Version; + this.UpdateAvailable = data.UpdateAvailable; + this.ProductId = data.ProductId; + this.Images = data.Images; + this.Logo = data.Logo; +} diff --git a/app/portainer/models/registry.js b/app/portainer/models/registry.js index 44c3051ac..23287da05 100644 --- a/app/portainer/models/registry.js +++ b/app/portainer/models/registry.js @@ -1,5 +1,6 @@ function RegistryViewModel(data) { this.Id = data.Id; + this.Type = data.Type; this.Name = data.Name; this.URL = data.URL; this.Authentication = data.Authentication; @@ -9,3 +10,44 @@ function RegistryViewModel(data) { this.AuthorizedTeams = data.AuthorizedTeams; this.Checked = false; } + +function RegistryManagementConfigurationDefaultModel(registry) { + this.Authentication = false; + this.Password = ''; + this.TLS = false; + this.TLSSkipVerify = false; + this.TLSCACertFile = null; + this.TLSCertFile = null; + this.TLSKeyFile = null; + + if (registry.Type === 1 || registry.Type === 2 ) { + this.Authentication = true; + this.Username = registry.Username; + this.TLS = true; + } + + if (registry.Type === 3 && registry.Authentication) { + this.Authentication = true; + this.Username = registry.Username; + } +} + +function RegistryDefaultModel() { + this.Type = 3; + this.URL = ''; + this.Name = ''; + this.Authentication = false; + this.Username = ''; + this.Password = ''; +} + +function RegistryCreateRequest(model) { + this.Name = model.Name; + this.Type = model.Type; + this.URL = model.URL; + this.Authentication = model.Authentication; + if (model.Authentication) { + this.Username = model.Username; + this.Password = model.Password; + } +} diff --git a/app/portainer/models/status.js b/app/portainer/models/status.js index f1302d391..198622389 100644 --- a/app/portainer/models/status.js +++ b/app/portainer/models/status.js @@ -4,4 +4,5 @@ function StatusViewModel(data) { this.EndpointManagement = data.EndpointManagement; this.Analytics = data.Analytics; this.Version = data.Version; + this.EnabledExtensions = data.EnabledExtensions; } diff --git a/app/portainer/rest/extension.js b/app/portainer/rest/extension.js index 1f9dd75bb..6b4588d68 100644 --- a/app/portainer/rest/extension.js +++ b/app/portainer/rest/extension.js @@ -1,11 +1,12 @@ angular.module('portainer.app') -.factory('Extensions', ['$resource', 'EndpointProvider', 'API_ENDPOINT_ENDPOINTS', function Extensions($resource, EndpointProvider, API_ENDPOINT_ENDPOINTS) { +.factory('Extension', ['$resource', 'API_ENDPOINT_EXTENSIONS', + function ExtensionFactory($resource, API_ENDPOINT_EXTENSIONS) { 'use strict'; - return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/extensions/:type', { - endpointId: EndpointProvider.endpointID - }, - { - register: { method: 'POST' }, - deregister: { method: 'DELETE', params: { type: '@type' } } + return $resource(API_ENDPOINT_EXTENSIONS + '/:id/:action', {}, { + create: { method: 'POST' }, + query: { method: 'GET', isArray: true }, + get: { method: 'GET', params: { id: '@id' } }, + delete: { method: 'DELETE', params: { id: '@id' } }, + update: { method: 'POST', params: { id: '@id', action: 'update' } } }); }]); diff --git a/app/portainer/rest/legacyExtension.js b/app/portainer/rest/legacyExtension.js new file mode 100644 index 000000000..1da3abdd7 --- /dev/null +++ b/app/portainer/rest/legacyExtension.js @@ -0,0 +1,12 @@ +// TODO: legacy extension management +angular.module('portainer.app') +.factory('LegacyExtensions', ['$resource', 'EndpointProvider', 'API_ENDPOINT_ENDPOINTS', function LegacyExtensions($resource, EndpointProvider, API_ENDPOINT_ENDPOINTS) { + 'use strict'; + return $resource(API_ENDPOINT_ENDPOINTS + '/:endpointId/extensions/:type', { + endpointId: EndpointProvider.endpointID + }, + { + register: { method: 'POST' }, + deregister: { method: 'DELETE', params: { type: '@type' } } + }); +}]); diff --git a/app/portainer/rest/registry.js b/app/portainer/rest/registry.js index 56c46a3d0..3c25cbbcf 100644 --- a/app/portainer/rest/registry.js +++ b/app/portainer/rest/registry.js @@ -7,6 +7,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'} }, + configure: { method: 'POST', params: { id: '@id', action: 'configure' } } }); }]); diff --git a/app/portainer/services/api/extensionService.js b/app/portainer/services/api/extensionService.js index 3cd08a828..b7087f3fc 100644 --- a/app/portainer/services/api/extensionService.js +++ b/app/portainer/services/api/extensionService.js @@ -1,19 +1,65 @@ angular.module('portainer.app') -.factory('ExtensionService', ['Extensions', function ExtensionServiceFactory(Extensions) { +.factory('ExtensionService', ['$q', 'Extension', function ExtensionServiceFactory($q, Extension) { 'use strict'; var service = {}; - service.registerStoridgeExtension = function(url) { - var payload = { - Type: 1, - URL: url - }; - - return Extensions.register(payload).$promise; + service.enable = function(license) { + return Extension.create({ license: license }).$promise; }; - service.deregisterStoridgeExtension = function() { - return Extensions.deregister({ type: 1 }).$promise; + service.update = function(id, version) { + return Extension.update({ id: id, version: version }).$promise; + }; + + service.delete = function(id) { + return Extension.delete({ id: id }).$promise; + }; + + service.extensions = function(store) { + var deferred = $q.defer(); + + Extension.query({ store: store }).$promise + .then(function success(data) { + var extensions = data.map(function (item) { + return new ExtensionViewModel(item); + }); + deferred.resolve(extensions); + }) + .catch(function error(err) { + deferred.reject({msg: 'Unable to retrieve extensions', err: err}); + }); + + return deferred.promise; + }; + + service.extension = function(id) { + var deferred = $q.defer(); + + Extension.get({ id: id }).$promise + .then(function success(data) { + var extension = new ExtensionViewModel(data); + deferred.resolve(extension); + }) + .catch(function error(err) { + deferred.reject({msg: 'Unable to retrieve extension details', err: err}); + }); + + return deferred.promise; + }; + + service.registryManagementEnabled = function() { + var deferred = $q.defer(); + + service.extensions(false) + .then(function onSuccess(extensions) { + var extensionAvailable = _.find(extensions, { Id: 1, Enabled: true }) ? true : false; + deferred.resolve(extensionAvailable); + }) + .catch(function onError(err) { + deferred.reject(err); + }); + + return deferred.promise; }; return service; diff --git a/app/portainer/services/api/legacyExtensionService.js b/app/portainer/services/api/legacyExtensionService.js new file mode 100644 index 000000000..38d4df65e --- /dev/null +++ b/app/portainer/services/api/legacyExtensionService.js @@ -0,0 +1,21 @@ +// TODO: legacy extension management +angular.module('portainer.app') +.factory('LegacyExtensionService', ['LegacyExtensions', function LegacyExtensionServiceFactory(LegacyExtensions) { + 'use strict'; + var service = {}; + + service.registerStoridgeExtension = function(url) { + var payload = { + Type: 1, + URL: url + }; + + return LegacyExtensions.register(payload).$promise; + }; + + service.deregisterStoridgeExtension = function() { + return LegacyExtensions.deregister({ type: 1 }).$promise; + }; + + return service; +}]); diff --git a/app/portainer/services/api/registryService.js b/app/portainer/services/api/registryService.js index ff5d00f18..1d09c31d8 100644 --- a/app/portainer/services/api/registryService.js +++ b/app/portainer/services/api/registryService.js @@ -1,5 +1,5 @@ angular.module('portainer.app') -.factory('RegistryService', ['$q', 'Registries', 'DockerHubService', 'RegistryHelper', 'ImageHelper', function RegistryServiceFactory($q, Registries, DockerHubService, RegistryHelper, ImageHelper) { +.factory('RegistryService', ['$q', 'Registries', 'DockerHubService', 'RegistryHelper', 'ImageHelper', 'FileUploadService', function RegistryServiceFactory($q, Registries, DockerHubService, RegistryHelper, ImageHelper, FileUploadService) { 'use strict'; var service = {}; @@ -54,17 +54,13 @@ angular.module('portainer.app') return Registries.update({ id: registry.Id }, registry).$promise; }; - service.createRegistry = function(name, URL, authentication, username, password) { - var payload = { - Name: name, - URL: URL, - Authentication: authentication - }; - if (authentication) { - payload.Username = username; - payload.Password = password; - } - return Registries.create({}, payload).$promise; + service.configureRegistry = function(id, registryManagementConfigurationModel) { + return FileUploadService.configureRegistry(id, registryManagementConfigurationModel); + }; + + service.createRegistry = function(model) { + var payload = new RegistryCreateRequest(model); + return Registries.create(payload).$promise; }; service.retrieveRegistryFromRepository = function(repository) { diff --git a/app/portainer/services/fileUpload.js b/app/portainer/services/fileUpload.js index d00271dcb..512445fc2 100644 --- a/app/portainer/services/fileUpload.js +++ b/app/portainer/services/fileUpload.js @@ -80,6 +80,13 @@ angular.module('portainer.app') }); }; + service.configureRegistry = function(registryId, registryManagementConfigurationModel) { + return Upload.upload({ + url: 'api/registries/' + registryId + '/configure', + data: registryManagementConfigurationModel + }); + }; + service.executeEndpointJob = function (imageName, file, endpointId, nodeName) { return Upload.upload({ url: 'api/endpoints/' + endpointId + '/job?method=file&nodeName=' + nodeName, diff --git a/app/portainer/services/extensionManager.js b/app/portainer/services/legacyExtensionManager.js similarity index 86% rename from app/portainer/services/extensionManager.js rename to app/portainer/services/legacyExtensionManager.js index e9f622746..f56549ab5 100644 --- a/app/portainer/services/extensionManager.js +++ b/app/portainer/services/legacyExtensionManager.js @@ -1,6 +1,7 @@ +// TODO: legacy extension management angular.module('portainer.app') -.factory('ExtensionManager', ['$q', 'PluginService', 'SystemService', 'ExtensionService', -function ExtensionManagerFactory($q, PluginService, SystemService, ExtensionService) { +.factory('LegacyExtensionManager', ['$q', 'PluginService', 'SystemService', 'LegacyExtensionService', +function ExtensionManagerFactory($q, PluginService, SystemService, LegacyExtensionService) { 'use strict'; var service = {}; @@ -60,7 +61,7 @@ function ExtensionManagerFactory($q, PluginService, SystemService, ExtensionServ .then(function success(data) { var managerIP = data.Swarm.NodeAddr; var storidgeAPIURL = 'tcp://' + managerIP + ':8282'; - return ExtensionService.registerStoridgeExtension(storidgeAPIURL); + return LegacyExtensionService.registerStoridgeExtension(storidgeAPIURL); }) .then(function success(data) { deferred.resolve(data); @@ -73,7 +74,7 @@ function ExtensionManagerFactory($q, PluginService, SystemService, ExtensionServ } function deregisterStoridgeExtension() { - return ExtensionService.deregisterStoridgeExtension(); + return LegacyExtensionService.deregisterStoridgeExtension(); } return service; diff --git a/app/portainer/services/modalService.js b/app/portainer/services/modalService.js index f08a02962..082dcf493 100644 --- a/app/portainer/services/modalService.js +++ b/app/portainer/services/modalService.js @@ -25,6 +25,14 @@ angular.module('portainer.app') return buttons; }; + service.enlargeImage = function(image) { + bootbox.dialog({ + message: '', + className: 'image-zoom-modal', + onEscape: true + }); + }; + service.confirm = function(options){ var box = bootbox.confirm({ title: options.title, diff --git a/app/portainer/views/extensions/extensions.html b/app/portainer/views/extensions/extensions.html new file mode 100644 index 000000000..2e78e557b --- /dev/null +++ b/app/portainer/views/extensions/extensions.html @@ -0,0 +1,71 @@ + + + Portainer extensions + + + + +

    + Content to be defined +

    +     +     + +
    +
    + + + + +
    +
    + Enable extension +
    + +
    +
    + + Ensure that you have a valid license. + +
    +
    + +
    + +
    + +
    +
    + +
    +
    +
    +

    Invalid license format.

    +
    +
    +
    + +
    +
    + +
    +
    + +
    + +     +     +
    +
    + +
    +
    + +
    +
    diff --git a/app/portainer/views/extensions/extensionsController.js b/app/portainer/views/extensions/extensionsController.js new file mode 100644 index 000000000..fb6b87244 --- /dev/null +++ b/app/portainer/views/extensions/extensionsController.js @@ -0,0 +1,58 @@ +angular.module('portainer.app') +.controller('ExtensionsController', ['$scope', '$state', 'ExtensionService', 'Notifications', +function ($scope, $state, ExtensionService, Notifications) { + + $scope.state = { + actionInProgress: false, + currentDate: moment().format('YYYY-MM-dd') + }; + + $scope.formValues = { + License: '' + }; + + function initView() { + ExtensionService.extensions(true) + .then(function onSuccess(data) { + $scope.extensions = data; + }) + .catch(function onError(err) { + Notifications.error('Failure', err, 'Unable to access extension store'); + }); + } + + $scope.enableExtension = function() { + var license = $scope.formValues.License; + + $scope.state.actionInProgress = true; + ExtensionService.enable(license) + .then(function onSuccess() { + Notifications.success('Extension successfully enabled'); + $state.reload(); + }) + .catch(function onError(err) { + Notifications.error('Failure', err, 'Unable to enable extension'); + }) + .finally(function final() { + $scope.state.actionInProgress = false; + }); + }; + + + $scope.isValidLicenseFormat = function(form) { + var valid = true; + + if (!$scope.formValues.License) { + return; + } + + if (isNaN($scope.formValues.License[0])) { + valid = false; + } + + form.extension_license.$setValidity('invalidLicense', valid); + }; + + + initView(); +}]); diff --git a/app/portainer/views/extensions/inspect/extension.html b/app/portainer/views/extensions/inspect/extension.html new file mode 100644 index 000000000..1e5e3d3c4 --- /dev/null +++ b/app/portainer/views/extensions/inspect/extension.html @@ -0,0 +1,122 @@ + + + + Portainer extensions > {{ extension.Name }} + + + +
    +
    + + + +
    + +
    + +
    +
    + {{ extension.Name }} extension +
    + +
    + By Portainer.io +
    +
    + +
    +
    + {{ extension.ShortDescription }} +
    +
    +
    + +
    + +
    + +
    + {{ extension.Enabled ? 'Enabled' : extension.Price }} +
    + +
    + {{ extension.PriceDescription }} +
    + +
    + +
    + +
    +
    + + + +
    + Coming soon +
    + +
    + +
    + +
    + +
    + +
    + +
    +
    +     +     +
    +
    + +
    +
    + + +
    + + Description + +
    +
    + + {{ extension.Description }} + +
    +     +     +
    +
    + +
    +
    + + +
    + + Screenshots + +
    +
    +
    + +
    +
    +     +     +
    +
    diff --git a/app/portainer/views/extensions/inspect/extensionController.js b/app/portainer/views/extensions/inspect/extensionController.js new file mode 100644 index 000000000..2f293e690 --- /dev/null +++ b/app/portainer/views/extensions/inspect/extensionController.js @@ -0,0 +1,63 @@ +angular.module('portainer.app') +.controller('ExtensionController', ['$q', '$scope', '$transition$', '$state', 'ExtensionService', 'Notifications', 'ModalService', +function ($q, $scope, $transition$, $state, ExtensionService, Notifications, ModalService) { + + $scope.state = { + updateInProgress: false, + deleteInProgress: false + }; + + $scope.formValues = { + instances: 1 + }; + + $scope.updateExtension = updateExtension; + $scope.deleteExtension = deleteExtension; + $scope.enlargeImage = enlargeImage; + + function enlargeImage(image) { + ModalService.enlargeImage(image); + } + + function deleteExtension(extension) { + $scope.state.deleteInProgress = true; + ExtensionService.delete(extension.Id) + .then(function onSuccess() { + Notifications.success('Extension successfully deleted'); + $state.reload(); + }) + .catch(function onError(err) { + Notifications.error('Failure', err, 'Unable to delete extension'); + }) + .finally(function final() { + $scope.state.deleteInProgress = false; + }); + } + + function updateExtension(extension) { + $scope.state.updateInProgress = true; + ExtensionService.update(extension.Id, extension.Version) + .then(function onSuccess() { + Notifications.success('Extension successfully updated'); + $state.reload(); + }) + .catch(function onError(err) { + Notifications.error('Failure', err, 'Unable to update extension'); + }) + .finally(function final() { + $scope.state.updateInProgress = false; + }); + } + + function initView() { + ExtensionService.extension($transition$.params().id) + .then(function onSuccess(extension) { + $scope.extension = extension; + }) + .catch(function onError(err) { + Notifications.error('Failure', err, 'Unable to retrieve extension information'); + }); + } + + initView(); +}]); diff --git a/app/portainer/views/home/home.html b/app/portainer/views/home/home.html index 49641ec85..b12d8e749 100644 --- a/app/portainer/views/home/home.html +++ b/app/portainer/views/home/home.html @@ -17,22 +17,13 @@ + ng-if="!isAdmin && endpoints.length === 0" + title-text="Information"> -

    - 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 index b422a7e86..f25e5b51f 100644 --- a/app/portainer/views/home/homeController.js +++ b/app/portainer/views/home/homeController.js @@ -1,6 +1,6 @@ angular.module('portainer.app') -.controller('HomeController', ['$q', '$scope', '$state', 'Authentication', 'EndpointService', 'EndpointHelper', 'GroupService', 'Notifications', 'EndpointProvider', 'StateManager', 'ExtensionManager', 'ModalService', 'MotdService', 'SystemService', -function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, GroupService, Notifications, EndpointProvider, StateManager, ExtensionManager, ModalService, MotdService, SystemService) { +.controller('HomeController', ['$q', '$scope', '$state', 'Authentication', 'EndpointService', 'EndpointHelper', 'GroupService', 'Notifications', 'EndpointProvider', 'StateManager', 'LegacyExtensionManager', 'ModalService', 'MotdService', 'SystemService', +function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, GroupService, Notifications, EndpointProvider, StateManager, LegacyExtensionManager, ModalService, MotdService, SystemService) { $scope.goToEdit = function(id) { $state.go('portainer.endpoints.endpoint', { id: id }); @@ -87,7 +87,7 @@ function ($q, $scope, $state, Authentication, EndpointService, EndpointHelper, G EndpointProvider.setEndpointID(endpoint.Id); EndpointProvider.setEndpointPublicURL(endpoint.PublicURL); EndpointProvider.setOfflineModeFromStatus(endpoint.Status); - ExtensionManager.initEndpointExtensions(endpoint) + LegacyExtensionManager.initEndpointExtensions(endpoint) .then(function success(data) { var extensions = data; return StateManager.updateEndpointState(endpoint, extensions); diff --git a/app/portainer/views/registries/create/createRegistryController.js b/app/portainer/views/registries/create/createRegistryController.js index ef6212087..059f8b428 100644 --- a/app/portainer/views/registries/create/createRegistryController.js +++ b/app/portainer/views/registries/create/createRegistryController.js @@ -2,40 +2,38 @@ angular.module('portainer.app') .controller('CreateRegistryController', ['$scope', '$state', 'RegistryService', 'Notifications', function ($scope, $state, RegistryService, Notifications) { + $scope.selectQuayRegistry = selectQuayRegistry; + $scope.selectAzureRegistry = selectAzureRegistry; + $scope.selectCustomRegistry = selectCustomRegistry; + $scope.create = createRegistry; + $scope.state = { - RegistryType: 'quay', actionInProgress: false }; - $scope.formValues = { - Name: 'Quay', - URL: 'quay.io', - Authentication: true, - Username: '', - Password: '' - }; + function selectQuayRegistry() { + $scope.model.Name = 'Quay'; + $scope.model.URL = 'quay.io'; + $scope.model.Authentication = true; + } - $scope.selectQuayRegistry = function() { - $scope.formValues.Name = 'Quay'; - $scope.formValues.URL = 'quay.io'; - $scope.formValues.Authentication = true; - }; + function selectAzureRegistry() { + $scope.model.Name = ''; + $scope.model.URL = ''; + $scope.model.Authentication = true; + } - $scope.selectCustomRegistry = function() { - $scope.formValues.Name = ''; - $scope.formValues.URL = ''; - $scope.formValues.Authentication = false; - }; + function selectCustomRegistry() { + $scope.model.Name = ''; + $scope.model.URL = ''; + $scope.model.Authentication = false; + } - $scope.addRegistry = function() { - var registryName = $scope.formValues.Name; - var registryURL = $scope.formValues.URL.replace(/^https?\:\/\//i, ''); - var authentication = $scope.formValues.Authentication; - var username = $scope.formValues.Username; - var password = $scope.formValues.Password; + function createRegistry() { + $scope.model.URL = $scope.model.URL.replace(/^https?\:\/\//i, ''); $scope.state.actionInProgress = true; - RegistryService.createRegistry(registryName, registryURL, authentication, username, password) + RegistryService.createRegistry($scope.model) .then(function success() { Notifications.success('Registry successfully created'); $state.go('portainer.registries'); @@ -46,5 +44,11 @@ function ($scope, $state, RegistryService, Notifications) { .finally(function final() { $scope.state.actionInProgress = false; }); - }; + } + + function initView() { + $scope.model = new RegistryDefaultModel(); + } + + initView(); }]); diff --git a/app/portainer/views/registries/create/createregistry.html b/app/portainer/views/registries/create/createregistry.html index e4e1499b0..fd6f33e43 100644 --- a/app/portainer/views/registries/create/createregistry.html +++ b/app/portainer/views/registries/create/createregistry.html @@ -13,11 +13,13 @@
    Registry provider
    +
    +
    - +
    -
    - Important notice -
    -
    - - Docker requires you to connect to a secure registry. - You can find more information about how to connect to an insecure registry in the Docker documentation. - -
    -
    - Registry details -
    - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - - -
    -
    - - -
    -
    - - -
    - -
    - -
    - -
    -
    - - -
    - -
    - -
    -
    - -
    - -
    - Actions -
    -
    -
    - -
    -
    + + + + + + + diff --git a/app/portainer/views/registries/registries.html b/app/portainer/views/registries/registries.html index 9a01180ab..77ef9b773 100644 --- a/app/portainer/views/registries/registries.html +++ b/app/portainer/views/registries/registries.html @@ -73,9 +73,10 @@
    diff --git a/app/portainer/views/registries/registriesController.js b/app/portainer/views/registries/registriesController.js index 317091841..373a01bdf 100644 --- a/app/portainer/views/registries/registriesController.js +++ b/app/portainer/views/registries/registriesController.js @@ -1,6 +1,6 @@ angular.module('portainer.app') -.controller('RegistriesController', ['$q', '$scope', '$state', 'RegistryService', 'DockerHubService', 'ModalService', 'Notifications', -function ($q, $scope, $state, RegistryService, DockerHubService, ModalService, Notifications) { +.controller('RegistriesController', ['$q', '$scope', '$state', 'RegistryService', 'DockerHubService', 'ModalService', 'Notifications', 'ExtensionService', +function ($q, $scope, $state, RegistryService, DockerHubService, ModalService, Notifications, ExtensionService) { $scope.state = { actionInProgress: false @@ -60,11 +60,13 @@ function ($q, $scope, $state, RegistryService, DockerHubService, ModalService, N function initView() { $q.all({ registries: RegistryService.registries(), - dockerhub: DockerHubService.dockerhub() + dockerhub: DockerHubService.dockerhub(), + registryManagement: ExtensionService.registryManagementEnabled() }) .then(function success(data) { $scope.registries = data.registries; $scope.dockerhub = data.dockerhub; + $scope.registryManagementAvailable = data.registryManagement; }) .catch(function error(err) { $scope.registries = []; diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index a78c4f986..59ccaadff 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -45,6 +45,9 @@
  • Settings
    • +
  • + Extensions +
  • Users
    diff --git a/app/portainer/views/support/product/product.html b/app/portainer/views/support/product/product.html new file mode 100644 index 000000000..8af370d74 --- /dev/null +++ b/app/portainer/views/support/product/product.html @@ -0,0 +1,84 @@ + + + + Portainer support > {{ product.Name }} + + + +
    +
    + + + +
    + +
    + +
    +
    + {{ product.Name }} +
    + +
    + By Portainer.io +
    +
    + +
    +
    + {{ product.ShortDescription }} +
    +
    + +
    + +
    + +
    + +
    + {{ product.Price }} +
    + +
    + {{ product.PriceDescription }} +
    + +
    + +
    + +
    +
    + + + +
    + +
    +
    +     +     +
    +
    + +
    +
    + + +
    + + Description + +
    +
    + {{ product.Description }} +
    +     +     +
    +
    diff --git a/app/portainer/views/support/product/productController.js b/app/portainer/views/support/product/productController.js new file mode 100644 index 000000000..205878c79 --- /dev/null +++ b/app/portainer/views/support/product/productController.js @@ -0,0 +1,14 @@ +angular.module('portainer.app') + .controller('SupportProductController', ['$scope', '$transition$', + function($scope, $transition$) { + + $scope.formValues = { + hostCount: 10 + }; + + function initView() { + $scope.product = $transition$.params().product; + } + + initView(); + }]); diff --git a/app/portainer/views/support/support.html b/app/portainer/views/support/support.html index b687d52de..97e0e3a7e 100644 --- a/app/portainer/views/support/support.html +++ b/app/portainer/views/support/support.html @@ -1,38 +1,34 @@ - + - Portainer support + Commercial support options + + +

    + Business support is a subscription service and is delivered by Portainer developers directly. Portainer Business Support is available in Standard and Critical levels, which offer a range of availability and response time options. +

    +

    + Once acquired through an in-app purchase, a support subscription will enable private access to the Portainer Support Portal at the appropriate service level. +

    +

    + Business support includes comprehensive assistance and issue resolution for Portainer software, as well as the ability to ask “how to” questions. +

    +

    + Issues outside Portainer (such as those relating to third party software or hardware) will be diagnosed, verified and the client will be referred to the relevant supplier for support. Portainer support will investigate and resolve any bugs that are identified as part of the support case. +

    +     +     +
    - - - -
    -

    - Portainer.io offers multiple commercial support options. -

    -

    - Per incident -

    -

    -

    - Per Portainer instance -

      -
    • $USD 1200 per year
      • -
    • Unlimited incidents
      • -
    • 4 named users
      • -
    • Contact us
      • -
    -

    -
    -     -     +
    diff --git a/app/portainer/views/support/supportController.js b/app/portainer/views/support/supportController.js new file mode 100644 index 000000000..4fde0ce74 --- /dev/null +++ b/app/portainer/views/support/supportController.js @@ -0,0 +1,35 @@ +angular.module('portainer.app') + .controller('SupportController', ['$scope', '$state', + function($scope, $state) { + + $scope.goToProductView = function(product) { + $state.go('portainer.support.product', { product: product }); + }; + + function initView() { + var supportProducts = [ + { + Id: 1, + Name: 'Business Support Standard', + ShortDescription: '11x5 support with 4 hour response', + Price: 'USD 120', + PriceDescription: 'Price per month per host (minimum 10 hosts)', + Description: 'Portainer Business Support Standard:\n\n* 7am – 6pm business days, local time.\n* 4 Hour response for issues, 4 named support contacts.\n\nPortainer support provides you with an easy way to interact directly with the Portainer development team; whether you have an issue with the product, think you have found a bug, or need help on how to use Portainer, we are here to help. Support is initiated from our web based ticketing system, and support is provided either by Slack messaging, Zoom remote support, or email.\n\nPrice is per Docker Host, with a 10 Host minimum, and is an annual support subscription.', + ProductId: '1163' + }, + { + Id: 2, + Name: 'Business Support Critical', + ShortDescription: '24x7 support with 1 hour response', + Price: 'USD 240', + PriceDescription: 'Price per month per host (minimum 10 hosts)', + Description: 'Portainer Business Support Critical:\n\n* 24x7\n* 1 Hour response for issues, 4 named support contacts.\n\nPortainer support provides you with advanced support for critical requirements. Business Support Critical is an easy way to interact directly with the Portainer development team; whether you have an issue with the product, think you have found a bug, or need help on how to use Portainer, we are here to help. Support is initiated from our web based ticketing system, and support is provided either by Slack messaging, Zoom remote support, or email.\n\nPrice is per Docker Host, with a 10 Host minimum, and is an annual support subscription.', + ProductId: '1162' + } + ]; + + $scope.products = supportProducts; + } + + initView(); + }]); diff --git a/assets/css/app.css b/assets/css/app.css index 0ab4b52cd..103582a1f 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -59,6 +59,7 @@ html, body, #page-wrapper, #content-wrapper, .page-content, #view { margin-top: 5px; margin-bottom: 15px; color: #777; + padding-left: 0; } .form-horizontal .control-label.text-left{ @@ -798,6 +799,10 @@ ul.sidebar .sidebar-list .sidebar-sublist a.active { .modal-open { padding-right: 0 !important; } + +.image-zoom-modal .modal-dialog { + width: 80%; +} /*!bootbox override*/ /*angular-multi-select override*/ diff --git a/assets/images/support_1.png b/assets/images/support_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e33bc088b2d64a4e052323aed9b5d07e124f6937 GIT binary patch literal 4733 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 literal 0 HcmV?d00001 diff --git a/assets/images/support_2.png b/assets/images/support_2.png new file mode 100644 index 0000000000000000000000000000000000000000..89045ba20678595c929524d8689f02d203352922 GIT binary patch literal 5753 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 YTyJs}$$g6C-(TRq) Date: Sun, 9 Dec 2018 17:03:26 +1300 Subject: [PATCH 82/93] fix(support-details): fix a js error --- .../product-list/product-item/product-item.js | 2 -- .../product-item/productItemController.js | 18 ------------------ .../components/product-list/product-list.js | 2 -- .../components/product-list/productList.html | 1 - 4 files changed, 23 deletions(-) delete mode 100644 app/portainer/components/product-list/product-item/productItemController.js diff --git a/app/portainer/components/product-list/product-item/product-item.js b/app/portainer/components/product-list/product-item/product-item.js index 98c177644..0b92f5533 100644 --- a/app/portainer/components/product-list/product-item/product-item.js +++ b/app/portainer/components/product-list/product-item/product-item.js @@ -1,9 +1,7 @@ angular.module('portainer.app').component('productItem', { templateUrl: 'app/portainer/components/product-list/product-item/productItem.html', - controller: 'ProductItemController', bindings: { model: '<', - currentDate: '<', goTo: '<' } }); diff --git a/app/portainer/components/product-list/product-item/productItemController.js b/app/portainer/components/product-list/product-item/productItemController.js deleted file mode 100644 index d1d479624..000000000 --- a/app/portainer/components/product-list/product-item/productItemController.js +++ /dev/null @@ -1,18 +0,0 @@ -angular.module('portainer.app') -.controller('ProductItemController', ['$state', -function ($state) { - - var ctrl = this; - ctrl.$onInit = $onInit; - ctrl.goToExtensionView = goToExtensionView; - - function goToExtensionView() { - $state.go('portainer.extensions.extension', { id: ctrl.model.Id }); - } - - function $onInit() { - if (ctrl.currentDate === ctrl.model.License.Expiration) { - ctrl.model.Expired = true; - } - } -}]); diff --git a/app/portainer/components/product-list/product-list.js b/app/portainer/components/product-list/product-list.js index ad3d05025..4a76d1107 100644 --- a/app/portainer/components/product-list/product-list.js +++ b/app/portainer/components/product-list/product-list.js @@ -4,7 +4,5 @@ angular.module('portainer.app').component('productList', { titleText: '@', products: '<', goTo: '<' - // extensions: '<', - // currentDate: '<' } }); diff --git a/app/portainer/components/product-list/productList.html b/app/portainer/components/product-list/productList.html index 44606ae28..21c0410af 100644 --- a/app/portainer/components/product-list/productList.html +++ b/app/portainer/components/product-list/productList.html @@ -11,7 +11,6 @@
    From 17d85fdc15f254b67a4a5f7ecbdeb1d89121efa0 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Mon, 10 Dec 2018 21:56:07 +1300 Subject: [PATCH 83/93] fix(registry-creation): fix registry creation request being fired twice on firefox --- .../forms/registry-form-azure/registry-form-azure.html | 2 +- .../forms/registry-form-custom/registry-form-custom.html | 2 +- .../components/forms/registry-form-quay/registry-form-quay.html | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/portainer/components/forms/registry-form-azure/registry-form-azure.html b/app/portainer/components/forms/registry-form-azure/registry-form-azure.html index 0a9217b87..9165749f7 100644 --- a/app/portainer/components/forms/registry-form-azure/registry-form-azure.html +++ b/app/portainer/components/forms/registry-form-azure/registry-form-azure.html @@ -71,7 +71,7 @@
    - diff --git a/app/portainer/components/forms/registry-form-custom/registry-form-custom.html b/app/portainer/components/forms/registry-form-custom/registry-form-custom.html index bb02e9276..cfe60a94b 100644 --- a/app/portainer/components/forms/registry-form-custom/registry-form-custom.html +++ b/app/portainer/components/forms/registry-form-custom/registry-form-custom.html @@ -95,7 +95,7 @@
    - diff --git a/app/portainer/components/forms/registry-form-quay/registry-form-quay.html b/app/portainer/components/forms/registry-form-quay/registry-form-quay.html index 598081b2e..857802bbb 100644 --- a/app/portainer/components/forms/registry-form-quay/registry-form-quay.html +++ b/app/portainer/components/forms/registry-form-quay/registry-form-quay.html @@ -38,7 +38,7 @@
    - From e440ba53cb3527db86d5fbf7c0afaf286ae75324 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 12 Dec 2018 09:46:05 +1300 Subject: [PATCH 84/93] feat(api): migrate template data logo URLs (#2537) --- api/bolt/datastore.go | 1 + api/bolt/migrator/migrate_dbversion14.go | 24 ++++++++++++++++++++++++ api/bolt/migrator/migrator.go | 9 +++++++++ api/portainer.go | 6 ++++-- 4 files changed, 38 insertions(+), 2 deletions(-) diff --git a/api/bolt/datastore.go b/api/bolt/datastore.go index bc899c526..0e94ad157 100644 --- a/api/bolt/datastore.go +++ b/api/bolt/datastore.go @@ -142,6 +142,7 @@ func (store *Store) MigrateData() error { ResourceControlService: store.ResourceControlService, SettingsService: store.SettingsService, StackService: store.StackService, + TemplateService: store.TemplateService, UserService: store.UserService, VersionService: store.VersionService, FileService: store.fileService, diff --git a/api/bolt/migrator/migrate_dbversion14.go b/api/bolt/migrator/migrate_dbversion14.go index f74e4ae05..ebaa4495e 100644 --- a/api/bolt/migrator/migrate_dbversion14.go +++ b/api/bolt/migrator/migrate_dbversion14.go @@ -1,5 +1,11 @@ package migrator +import ( + "strings" + + "github.com/portainer/portainer" +) + func (m *Migrator) updateSettingsToDBVersion15() error { legacySettings, err := m.settingsService.Settings() if err != nil { @@ -9,3 +15,21 @@ func (m *Migrator) updateSettingsToDBVersion15() error { legacySettings.EnableHostManagementFeatures = false return m.settingsService.UpdateSettings(legacySettings) } + +func (m *Migrator) updateTemplatesToVersion15() error { + legacyTemplates, err := m.templateService.Templates() + if err != nil { + return err + } + + for _, template := range legacyTemplates { + template.Logo = strings.Replace(template.Logo, "https://portainer.io/images", portainer.AssetsServerURL, -1) + + err = m.templateService.UpdateTemplate(template.ID, &template) + if err != nil { + return err + } + } + + return nil +} diff --git a/api/bolt/migrator/migrator.go b/api/bolt/migrator/migrator.go index 1fc16c930..a44dac96c 100644 --- a/api/bolt/migrator/migrator.go +++ b/api/bolt/migrator/migrator.go @@ -8,6 +8,7 @@ import ( "github.com/portainer/portainer/bolt/resourcecontrol" "github.com/portainer/portainer/bolt/settings" "github.com/portainer/portainer/bolt/stack" + "github.com/portainer/portainer/bolt/template" "github.com/portainer/portainer/bolt/user" "github.com/portainer/portainer/bolt/version" ) @@ -22,6 +23,7 @@ type ( resourceControlService *resourcecontrol.Service settingsService *settings.Service stackService *stack.Service + templateService *template.Service userService *user.Service versionService *version.Service fileService portainer.FileService @@ -36,6 +38,7 @@ type ( ResourceControlService *resourcecontrol.Service SettingsService *settings.Service StackService *stack.Service + TemplateService *template.Service UserService *user.Service VersionService *version.Service FileService portainer.FileService @@ -51,6 +54,7 @@ func NewMigrator(parameters *Parameters) *Migrator { endpointService: parameters.EndpointService, resourceControlService: parameters.ResourceControlService, settingsService: parameters.SettingsService, + templateService: parameters.TemplateService, stackService: parameters.StackService, userService: parameters.UserService, versionService: parameters.VersionService, @@ -192,6 +196,11 @@ func (m *Migrator) Migrate() error { if err != nil { return err } + + err = m.updateTemplatesToVersion15() + if err != nil { + return err + } } return m.versionService.StoreDBVersion(portainer.DBVersion) diff --git a/api/portainer.go b/api/portainer.go index 698faae76..2eb2a99c5 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -780,10 +780,12 @@ const ( APIVersion = "1.20-dev" // DBVersion is the version number of the Portainer database DBVersion = 15 + // AssetsServerURL represents the URL of the Portainer asset server + AssetsServerURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com" // MessageOfTheDayURL represents the URL where Portainer MOTD message can be retrieved - MessageOfTheDayURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com/motd.html" + MessageOfTheDayURL = AssetsServerURL + "/motd.html" // ExtensionDefinitionsURL represents the URL where Portainer extension definitions can be retrieved - ExtensionDefinitionsURL = "https://portainer-io-assets.sfo2.digitaloceanspaces.com/extensions.json" + ExtensionDefinitionsURL = AssetsServerURL + "/extensions.json" // 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 From f222b3cb1afc3b5a3e0bea481298dc823a81850d Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 12 Dec 2018 09:47:28 +1300 Subject: [PATCH 85/93] feat(templates): update logo URLs --- templates.json | 96 +++++++++++++++++++++++++------------------------- 1 file changed, 48 insertions(+), 48 deletions(-) diff --git a/templates.json b/templates.json index 97d7f2b61..f99369d9f 100644 --- a/templates.json +++ b/templates.json @@ -5,7 +5,7 @@ "description": "Docker image registry", "categories": ["docker"], "platform": "linux", - "logo": "https://portainer.io/images/logos/registry.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/registry.png", "image": "registry:latest", "ports": [ "5000/tcp" @@ -18,7 +18,7 @@ "description": "High performance web server", "categories": ["webserver"], "platform": "linux", - "logo": "https://portainer.io/images/logos/nginx.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/nginx.png", "image": "nginx:latest", "ports": [ "80/tcp", @@ -32,7 +32,7 @@ "description": "Open-source HTTP server", "categories": ["webserver"], "platform": "linux", - "logo": "https://portainer.io/images/logos/httpd.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/httpd.png", "image": "httpd:latest", "ports": [ "80/tcp" @@ -45,7 +45,7 @@ "description": "HTTP/2 web server with automatic HTTPS", "categories": ["webserver"], "platform": "linux", - "logo": "https://portainer.io/images/logos/caddy.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/caddy.png", "image": "abiosoft/caddy:latest", "ports": [ "80/tcp", "443/tcp", "2015/tcp" @@ -58,7 +58,7 @@ "description": "The most popular open-source database", "categories": ["database"], "platform": "linux", - "logo": "https://portainer.io/images/logos/mysql.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/mysql.png", "image": "mysql:latest", "env": [ { @@ -77,7 +77,7 @@ "description": "Performance beyond MySQL", "categories": ["database"], "platform": "linux", - "logo": "https://portainer.io/images/logos/mariadb.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/mariadb.png", "image": "mariadb:latest", "env": [ { @@ -96,7 +96,7 @@ "description": "The most advanced open-source database", "categories": ["database"], "platform": "linux", - "logo": "https://portainer.io/images/logos/postgres.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/postgres.png", "image": "postgres:latest", "env": [ { @@ -119,7 +119,7 @@ "description": "Open-source document-oriented database", "categories": ["database"], "platform": "linux", - "logo": "https://portainer.io/images/logos/mongo.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/mongo.png", "image": "mongo:latest", "ports": [ "27017/tcp" @@ -132,7 +132,7 @@ "description": "An open-source, survivable, strongly consistent, scale-out SQL database", "categories": ["database"], "platform": "linux", - "logo": "https://portainer.io/images/logos/cockroachdb.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/cockroachdb.png", "image": "cockroachdb/cockroach:latest", "ports": [ "26257/tcp", @@ -147,7 +147,7 @@ "description": "An open-source distributed SQL database", "categories": ["database"], "platform": "linux", - "logo": "https://portainer.io/images/logos/cratedb.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/cratedb.png", "image": "crate:latest", "ports": [ "4200/tcp", @@ -161,7 +161,7 @@ "description": "Open-source search and analytics engine", "categories": ["database"], "platform": "linux", - "logo": "https://portainer.io/images/logos/elasticsearch.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/elasticsearch.png", "image": "elasticsearch:latest", "ports": [ "9200/tcp", @@ -176,7 +176,7 @@ "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", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/gitlab_ce.png", "image": "gitlab/gitlab-ce:latest", "ports": [ "80/tcp", @@ -195,7 +195,7 @@ "description": "A distributed object storage server built for cloud applications and devops", "categories": ["storage"], "platform": "linux", - "logo": "https://portainer.io/images/logos/minio.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/minio.png", "image": "minio/minio:latest", "ports": [ "9000/tcp" @@ -219,7 +219,7 @@ "description": "Standalone AWS S3 protocol server", "categories": ["storage"], "platform": "linux", - "logo": "https://portainer.io/images/logos/scality-s3.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/scality-s3.png", "image": "scality/s3server", "ports": [ "8000/tcp" @@ -243,7 +243,7 @@ "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", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/microsoft.png", "image": "microsoft/mssql-server-linux:2017-GA", "ports": [ "1433/tcp" @@ -266,7 +266,7 @@ "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", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/microsoft.png", "image": "microsoft/mssql-server-windows-developer:latest", "ports": [ "1433/tcp" @@ -290,7 +290,7 @@ "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", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/microsoft.png", "image": "microsoft/mssql-server-windows-express:latest", "ports": [ "1433/tcp" @@ -313,7 +313,7 @@ "description": "Open-source serverless computing platform", "categories": ["serverless"], "platform": "linux", - "logo": "https://portainer.io/images/logos/ironfunctions.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/ironfunctions.png", "image": "iron/functions:latest", "ports": [ "8080/tcp" @@ -327,7 +327,7 @@ "description": "Open-source user interface for IronFunctions", "categories": ["serverless"], "platform": "linux", - "logo": "https://portainer.io/images/logos/ironfunctions.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/ironfunctions.png", "image": "iron/functions-ui:latest", "ports": [ "4000/tcp" @@ -347,7 +347,7 @@ "description": "Open-source enterprise search platform", "categories": ["search-engine"], "platform": "linux", - "logo": "https://portainer.io/images/logos/solr.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/solr.png", "image": "solr:latest", "ports": [ "8983/tcp" @@ -360,7 +360,7 @@ "description": "Open-source in-memory data structure store", "categories": ["database"], "platform": "linux", - "logo": "https://portainer.io/images/logos/redis.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/redis.png", "image": "redis:latest", "ports": [ "6379/tcp" @@ -373,7 +373,7 @@ "description": "Highly reliable enterprise messaging system", "categories": ["messaging"], "platform": "linux", - "logo": "https://portainer.io/images/logos/rabbitmq.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/rabbitmq.png", "image": "rabbitmq:latest", "ports": [ "5671/tcp", @@ -388,7 +388,7 @@ "categories": ["blog"], "note": "Access the blog management interface under /ghost/.", "platform": "linux", - "logo": "https://portainer.io/images/logos/ghost.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/ghost.png", "image": "ghost:latest", "ports": [ "2368/tcp" @@ -402,7 +402,7 @@ "categories": ["CMS"], "platform": "linux", "note": "Default credentials: admin / changeme", - "logo": "https://portainer.io/images/logos/plesk.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/plesk.png", "image": "plesk/plesk:preview", "ports": [ "21/tcp", "80/tcp", "443/tcp", "8880/tcp", "8443/tcp", "8447/tcp" @@ -414,7 +414,7 @@ "description": "Another free and open-source CMS", "categories": ["CMS"], "platform": "linux", - "logo": "https://portainer.io/images/logos/joomla.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/joomla.png", "image": "joomla:latest", "env": [ { @@ -438,7 +438,7 @@ "description": "Open-source content management framework", "categories": ["CMS"], "platform": "linux", - "logo": "https://portainer.io/images/logos/drupal.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/drupal.png", "image": "drupal:latest", "ports": [ "80/tcp" @@ -451,7 +451,7 @@ "description": "A free and open-source CMS built on top of Zope", "categories": ["CMS"], "platform": "linux", - "logo": "https://portainer.io/images/logos/plone.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/plone.png", "image": "plone:latest", "ports": [ "8080/tcp" @@ -464,7 +464,7 @@ "description": "Open-source e-commerce platform", "categories": ["CMS"], "platform": "linux", - "logo": "https://portainer.io/images/logos/magento.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/magento.png", "image": "alankent/gsd:latest", "ports": [ "80/tcp", @@ -479,7 +479,7 @@ "description": "Collect logs, metrics and docker events", "categories": ["Log Management", "Monitoring"], "platform": "linux", - "logo": "https://portainer.io/images/logos/sematext_agent.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/sematext_agent.png", "image": "sematext/sematext-agent-docker:latest", "name": "sematext-agent", "privileged": true, @@ -506,7 +506,7 @@ "description": "Collect events and metrics", "categories": ["Monitoring"], "platform": "linux", - "logo": "https://portainer.io/images/logos/datadog_agent.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/datadog_agent.png", "image": "datadog/agent:latest", "env": [ { @@ -538,7 +538,7 @@ "description": "Open-source marketing automation platform", "categories": ["marketing"], "platform": "linux", - "logo": "https://portainer.io/images/logos/mautic.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/mautic.png", "image": "mautic/mautic:latest", "env": [ { @@ -562,7 +562,7 @@ "description": "Streaming media server", "categories": ["streaming"], "platform": "linux", - "logo": "https://portainer.io/images/logos/wowza.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/wowza.png", "image": "sameersbn/wowza:4.1.2-8", "env": [ { @@ -589,7 +589,7 @@ "description": "Open-source continuous integration tool", "categories": ["continuous-integration"], "platform": "linux", - "logo": "https://portainer.io/images/logos/jenkins.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/jenkins.png", "image": "jenkins/jenkins:lts", "ports": [ "8080/tcp", @@ -609,7 +609,7 @@ "description": "Open-source project management tool", "categories": ["project-management"], "platform": "linux", - "logo": "https://portainer.io/images/logos/redmine.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/redmine.png", "image": "redmine:latest", "ports": [ "3000/tcp" @@ -622,7 +622,7 @@ "description": "Open-source business apps", "categories": ["project-management"], "platform": "linux", - "logo": "https://portainer.io/images/logos/odoo.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/odoo.png", "image": "odoo:latest", "env": [ { @@ -651,7 +651,7 @@ "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", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/urbackup.png", "image": "cfstras/urbackup", "ports": [ "55413/tcp", "55414/tcp", "55415/tcp", "35622/tcp" @@ -665,7 +665,7 @@ "note": "Default credentials: admin/admin", "categories": ["filesystem", "storage"], "platform": "linux", - "logo": "https://portainer.io/images/logos/filebrowser.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/filebrowser.png", "image": "filebrowser/filebrowser:latest", "ports": [ "80/tcp" @@ -679,7 +679,7 @@ "description": "ColdFusion (CFML) CLI", "categories": ["development"], "platform": "linux", - "logo": "https://portainer.io/images/logos/ortussolutions-commandbox.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/ortussolutions-commandbox.png", "image": "ortussolutions/commandbox:latest", "env": [ { @@ -697,7 +697,7 @@ "description": "Open-source modular CMS", "categories": ["CMS"], "platform": "linux", - "logo": "https://portainer.io/images/logos/ortussolutions-contentbox.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/ortussolutions-contentbox.png", "image": "ortussolutions/contentbox:latest", "env": [ { @@ -725,7 +725,7 @@ "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", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/portainer.png", "repository": { "url": "https://github.com/portainer/templates", "stackfile": "stacks/portainer-agent/docker-stack.yml" @@ -739,7 +739,7 @@ "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", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/openfaas.png", "repository": { "url": "https://github.com/openfaas/faas", "stackfile": "docker-compose.yml" @@ -752,7 +752,7 @@ "note": "Deploys the IronFunctions API and UI.", "categories": ["serverless"], "platform": "linux", - "logo": "https://portainer.io/images/logos/ironfunctions.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/ironfunctions.png", "repository": { "url": "https://github.com/portainer/templates", "stackfile": "stacks/ironfunctions/docker-stack.yml" @@ -765,7 +765,7 @@ "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", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/cockroachdb.png", "repository": { "url": "https://github.com/portainer/templates", "stackfile": "stacks/cockroachdb/docker-stack.yml" @@ -778,7 +778,7 @@ "note": "Deploys a Wordpress instance connected to a MySQL database.", "categories": ["CMS"], "platform": "linux", - "logo": "https://portainer.io/images/logos/wordpress.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/wordpress.png", "repository": { "url": "https://github.com/portainer/templates", "stackfile": "stacks/wordpress/docker-stack.yml" @@ -798,7 +798,7 @@ "note": "Deploys a Wordpress instance connected to a MySQL database.", "categories": ["CMS"], "platform": "linux", - "logo": "https://portainer.io/images/logos/wordpress.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/wordpress.png", "repository": { "url": "https://github.com/portainer/templates", "stackfile": "stacks/wordpress/docker-compose.yml" @@ -817,7 +817,7 @@ "description": "Microsoft Operations Management Suite Linux agent.", "categories": ["OPS"], "platform": "linux", - "logo": "https://portainer.io/images/logos/microsoft.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/microsoft.png", "repository": { "url": "https://github.com/portainer/templates", "stackfile": "stacks/microsoft-oms/docker-stack.yml" @@ -840,7 +840,7 @@ "type": 2, "categories": ["Log Management", "Monitoring"], "description": "Collect logs, metrics and docker events", - "logo": "https://portainer.io/images/logos/sematext_agent.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/sematext_agent.png", "platform": "linux", "repository": { "url": "https://github.com/portainer/templates", @@ -862,7 +862,7 @@ "type": 2, "categories": ["Monitoring"], "description": "Collect events and metrics", - "logo": "https://portainer.io/images/logos/datadog_agent.png", + "logo": "https://portainer-io-assets.sfo2.digitaloceanspaces.com/logos/datadog_agent.png", "platform": "linux", "repository": { "url": "https://github.com/portainer/templates", From 5c2e714e69c2b5a2db931520e51d0f13c0fcd0d9 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 12 Dec 2018 10:28:21 +1300 Subject: [PATCH 86/93] style(extensions): minor update to extension UX/UI (#2538) * style(extensions): update extension icons * style(extensions): style update * feat(extensions): update extension UX * style(extensions): update extension style * style(extension-details): update screenshot default size * style(extensions): update overview diagram image * refactor(support): fix support URLs --- .../handler/extensions/extension_inspect.go | 4 + api/http/handler/extensions/extension_list.go | 2 +- api/portainer.go | 3 +- .../views/configure/configureregistry.html | 4 +- .../registriesDatatable.html | 4 +- .../extension-item/extensionItem.html | 7 +- .../extension-item/extensionItemController.js | 30 +++--- .../extension-tooltip/extension-tooltip.html | 1 - .../extension-tooltip/extension-tooltip.js | 3 - app/portainer/models/extension.js | 2 +- .../views/extensions/extensions.html | 60 +++++++++++- .../views/extensions/extensionsController.js | 91 +++++++++--------- .../views/extensions/inspect/extension.html | 24 +++-- .../views/support/product/product.html | 2 +- assets/css/app.css | 5 + assets/images/extensions_overview_diagram.png | Bin 0 -> 80834 bytes 16 files changed, 159 insertions(+), 83 deletions(-) delete mode 100644 app/portainer/components/extension-tooltip/extension-tooltip.html delete mode 100644 app/portainer/components/extension-tooltip/extension-tooltip.js create mode 100644 assets/images/extensions_overview_diagram.png diff --git a/api/http/handler/extensions/extension_inspect.go b/api/http/handler/extensions/extension_inspect.go index ea5fa0e90..712e4403e 100644 --- a/api/http/handler/extensions/extension_inspect.go +++ b/api/http/handler/extensions/extension_inspect.go @@ -35,6 +35,10 @@ func (handler *Handler) extensionInspect(w http.ResponseWriter, r *http.Request) for _, p := range extensions { if p.ID == extensionID { extension = p + if extension.DescriptionURL != "" { + description, _ := client.Get(extension.DescriptionURL, 10) + extension.Description = string(description) + } break } } diff --git a/api/http/handler/extensions/extension_list.go b/api/http/handler/extensions/extension_list.go index 8f6cacb77..392822528 100644 --- a/api/http/handler/extensions/extension_list.go +++ b/api/http/handler/extensions/extension_list.go @@ -22,7 +22,7 @@ func (handler *Handler) extensionList(w http.ResponseWriter, r *http.Request) *h if storeDetails { definitions, err := handler.ExtensionManager.FetchExtensionDefinitions() if err != nil { - return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve extension definitions", err} + return &httperror.HandlerError{http.StatusInternalServerError, "Unable to retrieve extensions", err} } for idx := range definitions { diff --git a/api/portainer.go b/api/portainer.go index 2eb2a99c5..2e9ef97d2 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -485,6 +485,7 @@ type ( Name string `json:"Name,omitempty"` ShortDescription string `json:"ShortDescription,omitempty"` Description string `json:"Description,omitempty"` + DescriptionURL string `json:"DescriptionURL,omitempty"` Price string `json:"Price,omitempty"` PriceDescription string `json:"PriceDescription,omitempty"` Deal bool `json:"Deal,omitempty"` @@ -492,7 +493,7 @@ type ( License LicenseInformation `json:"License,omitempty"` Version string `json:"Version"` UpdateAvailable bool `json:"UpdateAvailable"` - ProductID int `json:"ProductId,omitempty"` + ShopURL string `json:"ShopURL,omitempty"` Images []string `json:"Images,omitempty"` Logo string `json:"Logo,omitempty"` } diff --git a/app/extensions/registry-management/views/configure/configureregistry.html b/app/extensions/registry-management/views/configure/configureregistry.html index 48574dc41..3325230b3 100644 --- a/app/extensions/registry-management/views/configure/configureregistry.html +++ b/app/extensions/registry-management/views/configure/configureregistry.html @@ -149,8 +149,8 @@ Test in progress...
    diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html index 900e3432a..9bc262c40 100644 --- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html +++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html @@ -64,8 +64,8 @@ Browse - - Browse ( ) + + Browse (extension) diff --git a/app/portainer/components/extension-list/extension-item/extensionItem.html b/app/portainer/components/extension-list/extension-item/extensionItem.html index d9d870a08..95acdb9cb 100644 --- a/app/portainer/components/extension-list/extension-item/extensionItem.html +++ b/app/portainer/components/extension-list/extension-item/extensionItem.html @@ -1,9 +1,10 @@ -
    +
    - - + + +
    -
    +
    + + + +

    + + Portainer must be connected to the Internet to fetch the list of available extensions. +

    +     +     diff --git a/app/portainer/views/extensions/extensionsController.js b/app/portainer/views/extensions/extensionsController.js index fb6b87244..cb1a19d8a 100644 --- a/app/portainer/views/extensions/extensionsController.js +++ b/app/portainer/views/extensions/extensionsController.js @@ -1,58 +1,59 @@ angular.module('portainer.app') -.controller('ExtensionsController', ['$scope', '$state', 'ExtensionService', 'Notifications', -function ($scope, $state, ExtensionService, Notifications) { + .controller('ExtensionsController', ['$scope', '$state', 'ExtensionService', 'Notifications', + function($scope, $state, ExtensionService, Notifications) { - $scope.state = { - actionInProgress: false, - currentDate: moment().format('YYYY-MM-dd') - }; + $scope.state = { + actionInProgress: false, + currentDate: moment().format('YYYY-MM-dd') + }; - $scope.formValues = { - License: '' - }; + $scope.formValues = { + License: '' + }; - function initView() { - ExtensionService.extensions(true) - .then(function onSuccess(data) { - $scope.extensions = data; - }) - .catch(function onError(err) { - Notifications.error('Failure', err, 'Unable to access extension store'); - }); - } + function initView() { + ExtensionService.extensions(true) + .then(function onSuccess(data) { + $scope.extensions = data; + }) + .catch(function onError(err) { + $scope.extensions = []; + Notifications.error('Failure', err, 'Unable to access extension store'); + }); + } - $scope.enableExtension = function() { - var license = $scope.formValues.License; + $scope.enableExtension = function() { + var license = $scope.formValues.License; - $scope.state.actionInProgress = true; - ExtensionService.enable(license) - .then(function onSuccess() { - Notifications.success('Extension successfully enabled'); - $state.reload(); - }) - .catch(function onError(err) { - Notifications.error('Failure', err, 'Unable to enable extension'); - }) - .finally(function final() { - $scope.state.actionInProgress = false; - }); - }; + $scope.state.actionInProgress = true; + ExtensionService.enable(license) + .then(function onSuccess() { + Notifications.success('Extension successfully enabled'); + $state.reload(); + }) + .catch(function onError(err) { + Notifications.error('Failure', err, 'Unable to enable extension'); + }) + .finally(function final() { + $scope.state.actionInProgress = false; + }); + }; - $scope.isValidLicenseFormat = function(form) { - var valid = true; + $scope.isValidLicenseFormat = function(form) { + var valid = true; - if (!$scope.formValues.License) { - return; - } + if (!$scope.formValues.License) { + return; + } - if (isNaN($scope.formValues.License[0])) { - valid = false; - } + if (isNaN($scope.formValues.License[0])) { + valid = false; + } - form.extension_license.$setValidity('invalidLicense', valid); - }; + form.extension_license.$setValidity('invalidLicense', valid); + }; - initView(); -}]); + initView(); + }]); diff --git a/app/portainer/views/extensions/inspect/extension.html b/app/portainer/views/extensions/inspect/extension.html index 1e5e3d3c4..0a83740d9 100644 --- a/app/portainer/views/extensions/inspect/extension.html +++ b/app/portainer/views/extensions/inspect/extension.html @@ -51,11 +51,17 @@
    + +
    Coming soon
    @@ -92,10 +98,16 @@ Description
    -
    - - {{ extension.Description }} - +
    +
    +
    +
    +
    +

    + + Description for this extension unavailable at the moment. +

    +
    @@ -113,7 +125,7 @@
    - +
    diff --git a/app/portainer/views/support/product/product.html b/app/portainer/views/support/product/product.html index 8af370d74..554fd3fb7 100644 --- a/app/portainer/views/support/product/product.html +++ b/app/portainer/views/support/product/product.html @@ -52,7 +52,7 @@
    diff --git a/assets/css/app.css b/assets/css/app.css index 103582a1f..4532ce454 100644 --- a/assets/css/app.css +++ b/assets/css/app.css @@ -174,6 +174,11 @@ a[ng-click]{ box-shadow: 0 3px 10px -2px rgba(161, 170, 166, 0.5); } +.blocklist-item--disabled { + cursor: auto; + background-color: #ececec; +} + .blocklist-item--selected { border: 2px solid #bbbbbb; background-color: #ececec; diff --git a/assets/images/extensions_overview_diagram.png b/assets/images/extensions_overview_diagram.png new file mode 100644 index 0000000000000000000000000000000000000000..91f7ee16457a14a9e103e1060b672cd88b0b5b5c GIT binary patch literal 80834 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�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 Date: Wed, 12 Dec 2018 11:19:23 +1300 Subject: [PATCH 87/93] feat(api): update DigitalSignatureService (#2539) --- api/crypto/ecdsa.go | 8 +++----- api/docker/client.go | 2 +- api/exec/swarm_stack.go | 2 +- api/http/handler/websocket/websocket_exec.go | 2 +- api/http/proxy/docker_transport.go | 2 +- api/portainer.go | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/api/crypto/ecdsa.go b/api/crypto/ecdsa.go index f2b87d639..35cc0b283 100644 --- a/api/crypto/ecdsa.go +++ b/api/crypto/ecdsa.go @@ -8,8 +8,6 @@ import ( "encoding/base64" "encoding/hex" "math/big" - - "github.com/portainer/portainer" ) const ( @@ -105,10 +103,10 @@ func (service *ECDSAService) GenerateKeyPair() ([]byte, []byte, error) { // CreateSignature creates a digital signature. // It automatically hash a specific message using MD5 and creates a signature from // that hash. +// If a secret is associated to the service, it will be used instead of the specified +// message. // It then encodes the generated signature in base64. -func (service *ECDSAService) CreateSignature() (string, error) { - - message := portainer.PortainerAgentSignatureMessage +func (service *ECDSAService) CreateSignature(message string) (string, error) { if service.secret != "" { message = service.secret } diff --git a/api/docker/client.go b/api/docker/client.go index 913e5dd87..aebec1adb 100644 --- a/api/docker/client.go +++ b/api/docker/client.go @@ -67,7 +67,7 @@ func createAgentClient(endpoint *portainer.Endpoint, signatureService portainer. return nil, err } - signature, err := signatureService.CreateSignature() + signature, err := signatureService.CreateSignature(portainer.PortainerAgentSignatureMessage) if err != nil { return nil, err } diff --git a/api/exec/swarm_stack.go b/api/exec/swarm_stack.go index f41a581db..da781b030 100644 --- a/api/exec/swarm_stack.go +++ b/api/exec/swarm_stack.go @@ -140,7 +140,7 @@ func (manager *SwarmStackManager) updateDockerCLIConfiguration(dataPath string) return err } - signature, err := manager.signatureService.CreateSignature() + signature, err := manager.signatureService.CreateSignature(portainer.PortainerAgentSignatureMessage) if err != nil { return err } diff --git a/api/http/handler/websocket/websocket_exec.go b/api/http/handler/websocket/websocket_exec.go index 6f2d07d22..ba4a9d7e6 100644 --- a/api/http/handler/websocket/websocket_exec.go +++ b/api/http/handler/websocket/websocket_exec.go @@ -111,7 +111,7 @@ func (handler *Handler) proxyWebsocketRequest(w http.ResponseWriter, r *http.Req } } - signature, err := handler.SignatureService.CreateSignature() + signature, err := handler.SignatureService.CreateSignature(portainer.PortainerAgentSignatureMessage) if err != nil { return err } diff --git a/api/http/proxy/docker_transport.go b/api/http/proxy/docker_transport.go index 2476685cc..7521ee337 100644 --- a/api/http/proxy/docker_transport.go +++ b/api/http/proxy/docker_transport.go @@ -64,7 +64,7 @@ func (p *proxyTransport) proxyDockerRequest(request *http.Request) (*http.Respon request.URL.Path = path if p.enableSignature { - signature, err := p.SignatureService.CreateSignature() + signature, err := p.SignatureService.CreateSignature(portainer.PortainerAgentSignatureMessage) if err != nil { return nil, err } diff --git a/api/portainer.go b/api/portainer.go index 2e9ef97d2..6479a2a53 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -683,7 +683,7 @@ type ( GenerateKeyPair() ([]byte, []byte, error) EncodedPublicKey() string PEMHeaders() (string, string) - CreateSignature() (string, error) + CreateSignature(message string) (string, error) } // JWTService represents a service for managing JWT tokens From acc5218c16d278800ee9f99b8afa849ce9700f7e Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 12 Dec 2018 12:31:55 +1300 Subject: [PATCH 88/93] fix(api): fix snapshot schedule loading --- api/cmd/portainer/main.go | 80 +++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 37 deletions(-) diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index f4f366d5f..e0a9dd2f9 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -116,9 +116,10 @@ func initJobScheduler() portainer.JobScheduler { return cron.NewJobScheduler() } -func loadSnapshotSystemSchedule(jobScheduler portainer.JobScheduler, snapshotter portainer.Snapshotter, scheduleService portainer.ScheduleService, endpointService portainer.EndpointService, flags *portainer.CLIFlags) error { - if !*flags.Snapshot { - return nil +func loadSnapshotSystemSchedule(jobScheduler portainer.JobScheduler, snapshotter portainer.Snapshotter, scheduleService portainer.ScheduleService, endpointService portainer.EndpointService, settingsService portainer.SettingsService) error { + settings, err := settingsService.Settings() + if err != nil { + return err } schedules, err := scheduleService.SchedulesByJobType(portainer.SnapshotJobType) @@ -126,20 +127,20 @@ func loadSnapshotSystemSchedule(jobScheduler portainer.JobScheduler, snapshotter return err } - if len(schedules) != 0 { - return nil - } - - snapshotJob := &portainer.SnapshotJob{} - - snapshotSchedule := &portainer.Schedule{ - ID: portainer.ScheduleID(scheduleService.GetNextIdentifier()), - Name: "system_snapshot", - CronExpression: "@every " + *flags.SnapshotInterval, - Recurring: true, - JobType: portainer.SnapshotJobType, - SnapshotJob: snapshotJob, - Created: time.Now().Unix(), + var snapshotSchedule *portainer.Schedule + if len(schedules) == 0 { + snapshotJob := &portainer.SnapshotJob{} + snapshotSchedule = &portainer.Schedule{ + ID: portainer.ScheduleID(scheduleService.GetNextIdentifier()), + Name: "system_snapshot", + CronExpression: "@every " + settings.SnapshotInterval, + Recurring: true, + JobType: portainer.SnapshotJobType, + SnapshotJob: snapshotJob, + Created: time.Now().Unix(), + } + } else { + snapshotSchedule = &schedules[0] } snapshotJobContext := cron.NewSnapshotJobContext(endpointService, snapshotter) @@ -150,7 +151,10 @@ func loadSnapshotSystemSchedule(jobScheduler portainer.JobScheduler, snapshotter return err } - return scheduleService.CreateSchedule(snapshotSchedule) + if len(schedules) == 0 { + return scheduleService.CreateSchedule(snapshotSchedule) + } + return nil } func loadEndpointSyncSystemSchedule(jobScheduler portainer.JobScheduler, scheduleService portainer.ScheduleService, endpointService portainer.EndpointService, flags *portainer.CLIFlags) error { @@ -538,25 +542,6 @@ func main() { snapshotter := initSnapshotter(clientFactory) - jobScheduler := initJobScheduler() - - err = loadSchedulesFromDatabase(jobScheduler, jobService, store.ScheduleService, store.EndpointService, fileService) - if err != nil { - log.Fatal(err) - } - - err = loadEndpointSyncSystemSchedule(jobScheduler, store.ScheduleService, store.EndpointService, flags) - if err != nil { - log.Fatal(err) - } - - err = loadSnapshotSystemSchedule(jobScheduler, snapshotter, store.ScheduleService, store.EndpointService, flags) - if err != nil { - log.Fatal(err) - } - - jobScheduler.Start() - endpointManagement := true if *flags.ExternalEndpoints != "" { endpointManagement = false @@ -579,6 +564,27 @@ func main() { log.Fatal(err) } + jobScheduler := initJobScheduler() + + err = loadSchedulesFromDatabase(jobScheduler, jobService, store.ScheduleService, store.EndpointService, fileService) + if err != nil { + log.Fatal(err) + } + + err = loadEndpointSyncSystemSchedule(jobScheduler, store.ScheduleService, store.EndpointService, flags) + if err != nil { + log.Fatal(err) + } + + if *flags.Snapshot { + err = loadSnapshotSystemSchedule(jobScheduler, snapshotter, store.ScheduleService, store.EndpointService, store.SettingsService) + if err != nil { + log.Fatal(err) + } + } + + jobScheduler.Start() + err = initDockerHub(store.DockerHubService) if err != nil { log.Fatal(err) From f5ada3085ebc9f756994fea17f803e2911e42dc1 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 12 Dec 2018 14:11:40 +1300 Subject: [PATCH 89/93] fix(api): fix an issue with schedule update --- api/cron/scheduler.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/api/cron/scheduler.go b/api/cron/scheduler.go index 2cff329e8..144e5ed2f 100644 --- a/api/cron/scheduler.go +++ b/api/cron/scheduler.go @@ -39,6 +39,7 @@ func (scheduler *JobScheduler) UpdateSystemJobSchedule(jobType portainer.JobType if err != nil { return err } + continue } newCron.Schedule(entry.Schedule, entry.Job) @@ -72,6 +73,7 @@ func (scheduler *JobScheduler) UpdateJobSchedule(runner portainer.JobRunner) err if err != nil { return err } + continue } newCron.Schedule(entry.Schedule, entry.Job) From 8780b0a901c5b77949c1831975791ddbd0b2a775 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 12 Dec 2018 14:19:58 +1300 Subject: [PATCH 90/93] feat(api): update extension path on Windows arch --- api/exec/extension.go | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/api/exec/extension.go b/api/exec/extension.go index 14dfba49e..20cf2eca8 100644 --- a/api/exec/extension.go +++ b/api/exec/extension.go @@ -57,6 +57,10 @@ func buildExtensionPath(binaryPath string, extension *portainer.Extension) strin extensionFilename += "-" + runtime.GOOS + "-" + runtime.GOARCH extensionFilename += "-" + extension.Version + if runtime.GOOS == "windows" { + extensionFilename += ".exe" + } + extensionPath := path.Join( binaryPath, extensionFilename) From 6c26cf1f39b6b0ce1b929f04ed422e5fc2f4146f Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 12 Dec 2018 16:03:20 +1300 Subject: [PATCH 91/93] style(support): update support pricing --- app/portainer/views/support/supportController.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/portainer/views/support/supportController.js b/app/portainer/views/support/supportController.js index 4fde0ce74..8c7394b4e 100644 --- a/app/portainer/views/support/supportController.js +++ b/app/portainer/views/support/supportController.js @@ -12,7 +12,7 @@ angular.module('portainer.app') Id: 1, Name: 'Business Support Standard', ShortDescription: '11x5 support with 4 hour response', - Price: 'USD 120', + Price: 'US$120.00', PriceDescription: 'Price per month per host (minimum 10 hosts)', Description: 'Portainer Business Support Standard:\n\n* 7am – 6pm business days, local time.\n* 4 Hour response for issues, 4 named support contacts.\n\nPortainer support provides you with an easy way to interact directly with the Portainer development team; whether you have an issue with the product, think you have found a bug, or need help on how to use Portainer, we are here to help. Support is initiated from our web based ticketing system, and support is provided either by Slack messaging, Zoom remote support, or email.\n\nPrice is per Docker Host, with a 10 Host minimum, and is an annual support subscription.', ProductId: '1163' @@ -21,7 +21,7 @@ angular.module('portainer.app') Id: 2, Name: 'Business Support Critical', ShortDescription: '24x7 support with 1 hour response', - Price: 'USD 240', + Price: 'US$240.00', PriceDescription: 'Price per month per host (minimum 10 hosts)', Description: 'Portainer Business Support Critical:\n\n* 24x7\n* 1 Hour response for issues, 4 named support contacts.\n\nPortainer support provides you with advanced support for critical requirements. Business Support Critical is an easy way to interact directly with the Portainer development team; whether you have an issue with the product, think you have found a bug, or need help on how to use Portainer, we are here to help. Support is initiated from our web based ticketing system, and support is provided either by Slack messaging, Zoom remote support, or email.\n\nPrice is per Docker Host, with a 10 Host minimum, and is an annual support subscription.', ProductId: '1162' From 1384359bafa3de292923eb6362518a6ed82ca9c2 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 12 Dec 2018 17:00:15 +1300 Subject: [PATCH 92/93] fix(api): fix snapshot hanging --- api/cron/job_snapshot.go | 66 +++++++++++++++++++++------------------- api/docker/client.go | 2 ++ 2 files changed, 36 insertions(+), 32 deletions(-) diff --git a/api/cron/job_snapshot.go b/api/cron/job_snapshot.go index aaeff3212..513a324b9 100644 --- a/api/cron/job_snapshot.go +++ b/api/cron/job_snapshot.go @@ -45,39 +45,41 @@ func (runner *SnapshotJobRunner) GetSchedule() *portainer.Schedule { // As a snapshot can be a long process, to avoid any concurrency issue we // retrieve the latest version of the endpoint right after a snapshot. func (runner *SnapshotJobRunner) Run() { - endpoints, err := runner.context.endpointService.Endpoints() - if err != nil { - log.Printf("background schedule error (endpoint snapshot). Unable to retrieve endpoint list (err=%s)\n", err) - return - } - - for _, endpoint := range endpoints { - if endpoint.Type == portainer.AzureEnvironment { - continue - } - - snapshot, snapshotError := runner.context.snapshotter.CreateSnapshot(&endpoint) - - latestEndpointReference, err := runner.context.endpointService.Endpoint(endpoint.ID) - if latestEndpointReference == nil { - log.Printf("background schedule error (endpoint snapshot). Endpoint not found inside the database anymore (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) - continue - } - - latestEndpointReference.Status = portainer.EndpointStatusUp - if snapshotError != nil { - log.Printf("background schedule error (endpoint snapshot). Unable to create snapshot (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, snapshotError) - latestEndpointReference.Status = portainer.EndpointStatusDown - } - - if snapshot != nil { - latestEndpointReference.Snapshots = []portainer.Snapshot{*snapshot} - } - - err = runner.context.endpointService.UpdateEndpoint(latestEndpointReference.ID, latestEndpointReference) + go func() { + endpoints, err := runner.context.endpointService.Endpoints() if err != nil { - log.Printf("background schedule error (endpoint snapshot). Unable to update endpoint (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + log.Printf("background schedule error (endpoint snapshot). Unable to retrieve endpoint list (err=%s)\n", err) return } - } + + for _, endpoint := range endpoints { + if endpoint.Type == portainer.AzureEnvironment { + continue + } + + snapshot, snapshotError := runner.context.snapshotter.CreateSnapshot(&endpoint) + + latestEndpointReference, err := runner.context.endpointService.Endpoint(endpoint.ID) + if latestEndpointReference == nil { + log.Printf("background schedule error (endpoint snapshot). Endpoint not found inside the database anymore (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + continue + } + + latestEndpointReference.Status = portainer.EndpointStatusUp + if snapshotError != nil { + log.Printf("background schedule error (endpoint snapshot). Unable to create snapshot (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, snapshotError) + latestEndpointReference.Status = portainer.EndpointStatusDown + } + + if snapshot != nil { + latestEndpointReference.Snapshots = []portainer.Snapshot{*snapshot} + } + + err = runner.context.endpointService.UpdateEndpoint(latestEndpointReference.ID, latestEndpointReference) + if err != nil { + log.Printf("background schedule error (endpoint snapshot). Unable to update endpoint (endpoint=%s, URL=%s) (err=%s)\n", endpoint.Name, endpoint.URL, err) + return + } + } + }() } diff --git a/api/docker/client.go b/api/docker/client.go index aebec1adb..421f92c04 100644 --- a/api/docker/client.go +++ b/api/docker/client.go @@ -3,6 +3,7 @@ package docker import ( "net/http" "strings" + "time" "github.com/docker/docker/client" "github.com/portainer/portainer" @@ -102,5 +103,6 @@ func httpClient(endpoint *portainer.Endpoint) (*http.Client, error) { return &http.Client{ Transport: transport, + Timeout: 30 * time.Second, }, nil } From 189d131105b1ea63135f7f4b361de89551ccd9f7 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 12 Dec 2018 17:03:25 +1300 Subject: [PATCH 93/93] chore(version): bump version number --- api/bolt/migrator/migrator.go | 2 +- api/portainer.go | 2 +- api/swagger.yaml | 4 ++-- api/swagger_config.json | 2 +- distribution/portainer.spec | 2 +- package.json | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/api/bolt/migrator/migrator.go b/api/bolt/migrator/migrator.go index a44dac96c..1f7d25b21 100644 --- a/api/bolt/migrator/migrator.go +++ b/api/bolt/migrator/migrator.go @@ -190,7 +190,7 @@ func (m *Migrator) Migrate() error { } } - // Portainer 1.20-dev + // Portainer 1.20.0 if m.currentDBVersion < 15 { err := m.updateSettingsToDBVersion15() if err != nil { diff --git a/api/portainer.go b/api/portainer.go index 6479a2a53..bf4fbcc89 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -778,7 +778,7 @@ type ( const ( // APIVersion is the version number of the Portainer API - APIVersion = "1.20-dev" + APIVersion = "1.20.0" // DBVersion is the version number of the Portainer database DBVersion = 15 // AssetsServerURL represents the URL of the Portainer asset server diff --git a/api/swagger.yaml b/api/swagger.yaml index ee24b528d..d8a3ad48a 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.20-dev" + version: "1.20.0" title: "Portainer API" contact: email: "info@portainer.io" @@ -3018,7 +3018,7 @@ definitions: description: "Is analytics enabled" Version: type: "string" - example: "1.20-dev" + example: "1.20.0" description: "Portainer API version" PublicSettingsInspectResponse: type: "object" diff --git a/api/swagger_config.json b/api/swagger_config.json index 957f1358e..beee114ea 100644 --- a/api/swagger_config.json +++ b/api/swagger_config.json @@ -1,5 +1,5 @@ { "packageName": "portainer", - "packageVersion": "1.20-dev", + "packageVersion": "1.20.0", "projectName": "portainer" } diff --git a/distribution/portainer.spec b/distribution/portainer.spec index abbd4b371..b974ae153 100644 --- a/distribution/portainer.spec +++ b/distribution/portainer.spec @@ -1,5 +1,5 @@ Name: portainer -Version: 1.20-dev +Version: 1.20.0 Release: 0 License: Zlib Summary: A lightweight docker management UI diff --git a/package.json b/package.json index 0f6b5ab6f..2fc6e9772 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "author": "Portainer.io", "name": "portainer", "homepage": "http://portainer.io", - "version": "1.20-dev", + "version": "1.20.0", "repository": { "type": "git", "url": "git@github.com:portainer/portainer.git"