Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-23 15:29:42 +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

4
api/http/handler/settings/settings_public.go
View file

@ -49,6 +49,8 @@ type publicSettingsResponse struct {
// The check in interval for edge agent (in seconds) - used in non async mode [seconds]
CheckinInterval int `example:"60"`
}
IsDockerDesktopExtention bool `json:"IsDockerDesktopExtention" example:"false"`
}
// @id SettingsPublic
@ -89,6 +91,8 @@ func generatePublicSettings(appSettings *portainer.Settings) *publicSettingsResp
publicSettings.Edge.CommandInterval = appSettings.Edge.CommandInterval
publicSettings.Edge.CheckinInterval = appSettings.EdgeAgentCheckinInterval
publicSettings.IsDockerDesktopExtention = appSettings.IsDockerDesktopExtention
//if OAuth authentication is on, compose the related fields from application settings
if publicSettings.AuthenticationMethod == portainer.AuthenticationOAuth {
publicSettings.OAuthLogoutURI = appSettings.OAuthSettings.LogoutURI