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

chore(code): reduce divergence with EE EE-4344 (#7748)

Browse source
This commit is contained in:
andres-portainer 2022-09-28 14:56:32 -03:00 • committed by GitHub
parent e9384a6987
commit cb79dc18f8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
102 changed files with 259 additions and 180 deletions
Download patch file Download diff file Expand all files Collapse all files

3
api/datastore/init.go
View file

@ -36,6 +36,7 @@ func (store *Store) checkOrCreateInstanceID() error {
instanceID := uid.String()
return store.VersionService.StoreInstanceID(instanceID)
}
return err
}
@ -88,7 +89,6 @@ func (store *Store) checkOrCreateDefaultSettings() error {
func (store *Store) checkOrCreateDefaultSSLSettings() error {
_, err := store.SSLSettings().Settings()
if store.IsErrObjectNotFound(err) {
defaultSSLSettings := &portainer.SSLSettings{
HTTPEnabled: true,
@ -96,6 +96,7 @@ func (store *Store) checkOrCreateDefaultSSLSettings() error {
return store.SSLSettings().UpdateSettings(defaultSSLSettings)
}
return err
}