1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-25 08:19:40 +02:00

Merge branch 'develop' into oath-poc

This commit is contained in:
Anthony Lapenna 2019-02-04 09:19:12 +13:00
commit 508352f4ea
53 changed files with 626 additions and 452 deletions

View file

@ -517,6 +517,7 @@ type (
LicenseKey string `json:"LicenseKey,omitempty"`
Company string `json:"Company,omitempty"`
Expiration string `json:"Expiration,omitempty"`
Valid bool `json:"Valid,omitempty"`
}
// CLIService represents a service for managing CLI
@ -799,9 +800,9 @@ type (
const (
// APIVersion is the version number of the Portainer API
APIVersion = "1.20.0"
APIVersion = "1.20.1"
// DBVersion is the version number of the Portainer database
DBVersion = 16
DBVersion = 17
// 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