Compare commits

..

6 Commits

Author SHA1 Message Date
Anthony Lapenna 0abe8883d1 chore(dockerfiles): update data directory for windows Dockerfiles 2017-02-01 11:35:25 +13:00
Anthony Lapenna 84f2c2d735 Merge tag '1.11.3' into develop
Release 1.11.3
2017-02-01 11:02:15 +13:00
Anthony Lapenna 5d63c90203 Merge branch 'release/1.11.3' 2017-02-01 11:02:10 +13:00
Anthony Lapenna a97e7bbaae chore(version): bump version number 2017-02-01 11:02:05 +13:00
Anthony Lapenna f3cfb0a940 fix(cli): revert data/certs directories defaults to c:\data and c:\certs (#551) 2017-02-01 08:56:07 +13:00
Anthony Lapenna b1ca43934f Merge tag '1.11.2' into develop
Release 1.11.2
2017-01-26 17:44:00 +13:00
7 changed files with 10 additions and 10 deletions
+4 -4
View File
@@ -2,11 +2,11 @@ package cli
const (
defaultBindAddress = ":9000"
defaultDataDirectory = "C:\\ProgramData\\Portainer"
defaultDataDirectory = "C:\\data"
defaultAssetsDirectory = "."
defaultTemplatesURL = "https://raw.githubusercontent.com/portainer/templates/master/templates.json"
defaultTLSVerify = "false"
defaultTLSCACertPath = "C:\\ProgramData\\Portainer\\certs\\ca.pem"
defaultTLSCertPath = "C:\\ProgramData\\Portainer\\certs\\cert.pem"
defaultTLSKeyPath = "C:\\ProgramData\\Portainer\\certs\\key.pem"
defaultTLSCACertPath = "C:\\certs\\ca.pem"
defaultTLSCertPath = "C:\\certs\\cert.pem"
defaultTLSKeyPath = "C:\\certs\\key.pem"
)
+1 -1
View File
@@ -119,7 +119,7 @@ type (
const (
// APIVersion is the version number of portainer API.
APIVersion = "1.11.2"
APIVersion = "1.11.3"
)
const (
+1 -1
View File
@@ -568,4 +568,4 @@ angular.module('portainer', [
.constant('ENDPOINTS_ENDPOINT', 'api/endpoints')
.constant('TEMPLATES_ENDPOINT', 'api/templates')
.constant('PAGINATION_MAX_ITEMS', 10)
.constant('UI_VERSION', 'v1.11.2');
.constant('UI_VERSION', 'v1.11.3');
+1 -1
View File
@@ -1,6 +1,6 @@
{
"name": "portainer",
"version": "1.11.2",
"version": "1.11.3",
"homepage": "https://github.com/portainer/portainer",
"authors": [
"Anthony Lapenna <anthony.lapenna at gmail dot com>"
+1 -1
View File
@@ -2,7 +2,7 @@ FROM microsoft/windowsservercore
COPY dist /
VOLUME C:\\ProgramData\\Portainer
VOLUME C:\\data
WORKDIR /
+1 -1
View File
@@ -2,7 +2,7 @@ FROM microsoft/nanoserver
COPY dist /
VOLUME C:\\ProgramData\\Portainer
VOLUME C:\\data
WORKDIR /
+1 -1
View File
@@ -2,7 +2,7 @@
"author": "Portainer.io",
"name": "portainer",
"homepage": "http://portainer.io",
"version": "1.11.2",
"version": "1.11.3",
"repository": {
"type": "git",
"url": "git@github.com:portainer/portainer.git"