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

Merge tag '1.22.1' into develop 

Release 1.22.1
pull/3219/head
Anthony Lapenna 2019-10-11 10:40:58 +13:00
parent 8de507a15d 80ad5079f7
commit 3632e07654
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -269,7 +269,7 @@ func (m *Migrator) Migrate() error {
} }
} }
// Portainer 1.22.x // Portainer 1.22.1
if m.currentDBVersion < 20 { if m.currentDBVersion < 20 {
err := m.updateUsersToDBVersion20() err := m.updateUsersToDBVersion20()
if err != nil { if err != nil {

4
api/portainer.go
View File

@ -903,7 +903,7 @@ type (
const ( const (
// APIVersion is the version number of the Portainer API // APIVersion is the version number of the Portainer API
APIVersion = "1.22.0" APIVersion = "1.22.1"
// DBVersion is the version number of the Portainer database // DBVersion is the version number of the Portainer database
DBVersion = 20 DBVersion = 20
// AssetsServerURL represents the URL of the Portainer asset server // AssetsServerURL represents the URL of the Portainer asset server
@ -913,7 +913,7 @@ const (
// VersionCheckURL represents the URL used to retrieve the latest version of Portainer // VersionCheckURL represents the URL used to retrieve the latest version of Portainer
VersionCheckURL = "https://api.github.com/repos/portainer/portainer/releases/latest" VersionCheckURL = "https://api.github.com/repos/portainer/portainer/releases/latest"
// ExtensionDefinitionsURL represents the URL where Portainer extension definitions can be retrieved // ExtensionDefinitionsURL represents the URL where Portainer extension definitions can be retrieved
ExtensionDefinitionsURL = AssetsServerURL + "/extensions-1.22.0.json" ExtensionDefinitionsURL = AssetsServerURL + "/extensions-1.22.1.json"
// SupportProductsURL represents the URL where Portainer support products can be retrieved // SupportProductsURL represents the URL where Portainer support products can be retrieved
SupportProductsURL = AssetsServerURL + "/support.json" SupportProductsURL = AssetsServerURL + "/support.json"
// PortainerAgentHeader represents the name of the header available in any agent response // PortainerAgentHeader represents the name of the header available in any agent response

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: "1.22.0" version: "1.22.1"
title: "Portainer API" title: "Portainer API"
contact: contact:
email: "info@portainer.io" email: "info@portainer.io"
@ -3174,7 +3174,7 @@ definitions:
description: "Is analytics enabled" description: "Is analytics enabled"
Version: Version:
type: "string" type: "string"
example: "1.22.0" example: "1.22.1"
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": "1.22.0", "packageVersion": "1.22.1",
"projectName": "portainer" "projectName": "portainer"
} }

2
distribution/portainer.spec
View File

@ -1,5 +1,5 @@
Name: portainer Name: portainer
Version: 1.22.0 Version: 1.22.1
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": "1.22.0", "version": "1.22.1",
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git@github.com:portainer/portainer.git" "url": "git@github.com:portainer/portainer.git"