Merge tag '1.20.0' into develop

Release 1.20.0
pull/2543/head
Anthony Lapenna 2018-12-12 17:03:36 +13:00
commit 6648c0bbe7
6 changed files with 7 additions and 7 deletions

View File

@ -190,7 +190,7 @@ func (m *Migrator) Migrate() error {
}
}
// Portainer 1.20-dev
// Portainer 1.20.0
if m.currentDBVersion < 15 {
err := m.updateSettingsToDBVersion15()
if err != nil {

View File

@ -778,7 +778,7 @@ type (
const (
// APIVersion is the version number of the Portainer API
APIVersion = "1.20-dev"
APIVersion = "1.20.0"
// DBVersion is the version number of the Portainer database
DBVersion = 15
// AssetsServerURL represents the URL of the Portainer asset server

View File

@ -54,7 +54,7 @@ info:
**NOTE**: You can find more information on how to query the Docker API in the [Docker official documentation](https://docs.docker.com/engine/api/v1.30/) as well as in [this Portainer example](https://gist.github.com/deviantony/77026d402366b4b43fa5918d41bc42f8).
version: "1.20-dev"
version: "1.20.0"
title: "Portainer API"
contact:
email: "info@portainer.io"
@ -3018,7 +3018,7 @@ definitions:
description: "Is analytics enabled"
Version:
type: "string"
example: "1.20-dev"
example: "1.20.0"
description: "Portainer API version"
PublicSettingsInspectResponse:
type: "object"

View File

@ -1,5 +1,5 @@
{
"packageName": "portainer",
"packageVersion": "1.20-dev",
"packageVersion": "1.20.0",
"projectName": "portainer"
}

View File

@ -1,5 +1,5 @@
Name: portainer
Version: 1.20-dev
Version: 1.20.0
Release: 0
License: Zlib
Summary: A lightweight docker management UI

View File

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