Merge branch 'release/1.12.1'

api/portainer.go

@@ -176,7 +176,7 @@ type (
 
 const (
 	// 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 = 1
 )

app/app.js

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

app/components/templates/templatesController.js

@@ -46,7 +46,10 @@ function ($scope, $q, $state, $anchorScroll, Config, ContainerService, Container
         });
       }
       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) {
       return ContainerService.createAndStartContainer(templateConfiguration.container);

bower.json

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

package.json

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