From 723bf3874f5ac9f65f25ff92d21cae1606848d16 Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Mon, 13 Mar 2017 10:09:34 +0100
Subject: [PATCH 1/2] fix(templates): fix an issue where the image would not be
 pulled correctly (#664)

---
 app/components/templates/templatesController.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/app/components/templates/templatesController.js b/app/components/templates/templatesController.js
index a56996ec0..5a5395977 100644
--- a/app/components/templates/templatesController.js
+++ b/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);

From be2acdbdfb521781123d496054e5efb9c16739bd Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Mon, 13 Mar 2017 10:12:42 +0100
Subject: [PATCH 2/2] chore(version): bump version number

---
 api/portainer.go | 2 +-
 app/app.js       | 2 +-
 bower.json       | 2 +-
 package.json     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/api/portainer.go b/api/portainer.go
index 14032e931..66ac3e7d5 100644
--- a/api/portainer.go
+++ b/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
 )
diff --git a/app/app.js b/app/app.js
index 7805c060b..d0b0a810e 100644
--- a/app/app.js
+++ b/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');
diff --git a/bower.json b/bower.json
index c17158184..171d81c31 100644
--- a/bower.json
+++ b/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>"
diff --git a/package.json b/package.json
index 90a566de0..29e29ea80 100644
--- a/package.json
+++ b/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"