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

Merge branch 'release/1.12.1'

pull/681/head 1.12.1
Anthony Lapenna 2017-03-13 10:12:49 +01:00
parent 7bef9c0708 be2acdbdfb
commit 5b2d5e17ab
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/portainer.go
View File

@ -176,7 +176,7 @@ type (
const ( const (
// APIVersion is the version number of Portainer API. // APIVersion is the version number of Portainer API.
APIVersion = "1.12.0" APIVersion = "1.12.1"
// DBVersion is the version number of Portainer database. // DBVersion is the version number of Portainer database.
DBVersion = 1 DBVersion = 1
) )

2
app/app.js
View File

@ -566,4 +566,4 @@ angular.module('portainer', [
.constant('ENDPOINTS_ENDPOINT', 'api/endpoints') .constant('ENDPOINTS_ENDPOINT', 'api/endpoints')
.constant('TEMPLATES_ENDPOINT', 'api/templates') .constant('TEMPLATES_ENDPOINT', 'api/templates')
.constant('PAGINATION_MAX_ITEMS', 10) .constant('PAGINATION_MAX_ITEMS', 10)
.constant('UI_VERSION', 'v1.12.0'); .constant('UI_VERSION', 'v1.12.1');

5
app/components/templates/templatesController.js
View File

@ -46,7 +46,10 @@ function ($scope, $q, $state, $anchorScroll, Config, ContainerService, Container
}); });
} }
TemplateService.updateContainerConfigurationWithVolumes(templateConfiguration.container, template, data); TemplateService.updateContainerConfigurationWithVolumes(templateConfiguration.container, template, data);
return $q.all(volumeResourceControlQueries).then(ImageService.pullImage(templateConfiguration.image)); return $q.all(volumeResourceControlQueries)
.then(function success() {
return ImageService.pullImage(templateConfiguration.image);
});
}) })
.then(function success(data) { .then(function success(data) {
return ContainerService.createAndStartContainer(templateConfiguration.container); return ContainerService.createAndStartContainer(templateConfiguration.container);

2
bower.json
View File

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

2
package.json
View File

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