github
/
portainer
mirror of https://github.com/portainer/portainer
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge tag '2.0.0' into develop 

Release 2.0.0
pull/4280/head
Anthony Lapenna 2020-08-27 17:48:21 +12:00
parent b91895d618 1bc0c1baa9
commit 3ec05accbc
6 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/bolt/migrator/migrator.go
View File

@ -329,7 +329,7 @@ func (m *Migrator) Migrate() error {
} }
} }
// Portainer 2.0 // Portainer 2.0.0
if m.currentDBVersion < 25 { if m.currentDBVersion < 25 {
err := m.updateSettingsToDB25() err := m.updateSettingsToDB25()
if err != nil { if err != nil {

2
api/portainer.go
View File

@ -1119,7 +1119,7 @@ type (
const ( const (
// APIVersion is the version number of the Portainer API // APIVersion is the version number of the Portainer API
APIVersion = "2.0.0-dev" APIVersion = "2.0.0"
// DBVersion is the version number of the Portainer database // DBVersion is the version number of the Portainer database
DBVersion = 25 DBVersion = 25
// AssetsServerURL represents the URL of the Portainer asset server // AssetsServerURL represents the URL of the Portainer asset server

4
api/swagger.yaml
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). **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: '2.0.0-dev' version: '2.0.0'
title: 'Portainer API' title: 'Portainer API'
contact: contact:
email: 'info@portainer.io' email: 'info@portainer.io'
@ -2976,7 +2976,7 @@ definitions:
description: 'Is authentication enabled' description: 'Is authentication enabled'
Version: Version:
type: 'string' type: 'string'
example: '2.0.0-dev' example: '2.0.0'
description: 'Portainer API version' description: 'Portainer API version'
PublicSettingsInspectResponse: PublicSettingsInspectResponse:
type: 'object' type: 'object'

2
api/swagger_config.json
View File

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

2
distribution/portainer.spec
View File

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

2
package.json
View File

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