Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-04 05:15:25 +02:00
Code Issues Releases Activity

fix(db) EE-2425 http-disabled flag does not work (#6447)

Browse source 
Co-authored-by: Simon Meng <simon.meng@portainer.io>
This commit is contained in:
cong meng 2022-01-25 09:32:31 +13:00 • committed by GitHub
parent 48c2f127f8
commit 4bd3f61ce6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
api/cmd/portainer/main.go
View file

@ -107,11 +107,6 @@ func initDataStore(flags *portainer.CLIFlags, secretKey []byte, fileService port
if isNew { if isNew {
// from MigrateData // from MigrateData
store.VersionService.StoreDBVersion(portainer.DBVersion) store.VersionService.StoreDBVersion(portainer.DBVersion)
err := updateSettingsFromFlags(store, flags)
if err != nil {
log.Fatalf("Failed updating settings from flags: %v", err)
}
} else { } else {
storedVersion, err := store.VersionService.DBVersion() storedVersion, err := store.VersionService.DBVersion()
if err != nil { if err != nil {
@ -125,6 +120,11 @@ func initDataStore(flags *portainer.CLIFlags, secretKey []byte, fileService port
} }
} }
err = updateSettingsFromFlags(store, flags)
if err != nil {
log.Fatalf("Failed updating settings from flags: %v", err)
}
// this is for the db restore functionality - needs more tests. // this is for the db restore functionality - needs more tests.
go func() { go func() {
<-shutdownCtx.Done() <-shutdownCtx.Done()