Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-19 13:29:41 +02:00
Code Issues Releases Activity

fix(docker): add docker desktop extension flag in settings and add migration EE-5277 (#8948)

Browse source
This commit is contained in:
Prabhat Khera 2023-05-17 14:31:46 +12:00 • committed by GitHub
parent e156243e43
commit 83551201fb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 55 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

8
api/jwt/jwt.go
View file

@ -3,7 +3,6 @@ package jwt
import (
"errors"
"fmt"
"os"
"time"
portainer "github.com/portainer/portainer/api"
@ -169,7 +168,12 @@ func (service *Service) generateSignedToken(data *portainer.TokenData, expiresAt
return "", fmt.Errorf("invalid scope: %v", scope)
}
if _, ok := os.LookupEnv("DOCKER_EXTENSION"); ok {
settings, err := service.dataStore.Settings().Settings()
if err != nil {
return "", fmt.Errorf("failed fetching settings from db: %w", err)
}
if settings.IsDockerDesktopExtention {
// Set expiration to 99 years for docker desktop extension.
log.Info().Msg("detected docker desktop extension mode")
expiresAt = time.Now().Add(time.Hour * 8760 * 99).Unix()