Skip to content

Commit d6746cd

Browse files
committed
Use correct image name for migration db upgrade
Partly fixed by #595 but migration path was missed.
1 parent f4165d5 commit d6746cd

1 file changed

Lines changed: 3 additions & 11 deletions

File tree

mgradm/shared/podman/podman.go

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -371,10 +371,6 @@ func Upgrade(
371371
}
372372

373373
if newPgVersion > oldPgVersion {
374-
log.Info().Msgf(
375-
L("Previous PostgreSQL is %[1]s, instead new one is %[2]s. Performing a DB version upgrade…"),
376-
oldPgVersion, newPgVersion,
377-
)
378374
if err := RunPgsqlVersionUpgrade(
379375
authFile, registry, image, upgradeImage, strconv.Itoa(oldPgVersion),
380376
strconv.Itoa(newPgVersion),
@@ -564,7 +560,7 @@ func Migrate(
564560
log.Info().Msgf(L("Configuring split PostgreSQL container. Image version: %[1]d, not migrated version: %[2]d"),
565561
newPgVersion, oldPgVersion)
566562

567-
if err := upgradeDB(newPgVersion, oldPgVersion, upgradeImage, authFile, registry, pgsqlFlags.Image); err != nil {
563+
if err := upgradeDB(newPgVersion, oldPgVersion, upgradeImage, authFile, registry, image); err != nil {
568564
return err
569565
}
570566

@@ -797,15 +793,11 @@ func upgradeDB(
797793
upgradeImage types.ImageFlags,
798794
authFile string,
799795
registry string,
800-
dbImage types.ImageFlags,
796+
image types.ImageFlags,
801797
) error {
802798
if newPgVersion > oldPgVersion {
803-
log.Info().Msgf(
804-
L("Previous PostgreSQL is %[1]s, instead new one is %[2]s. Performing a DB version upgrade…"),
805-
oldPgVersion, newPgVersion,
806-
)
807799
if err := RunPgsqlVersionUpgrade(
808-
authFile, registry, dbImage, upgradeImage, strconv.Itoa(oldPgVersion),
800+
authFile, registry, image, upgradeImage, strconv.Itoa(oldPgVersion),
809801
strconv.Itoa(newPgVersion),
810802
); err != nil {
811803
return utils.Error(err, L("cannot run PostgreSQL version upgrade script"))

0 commit comments

Comments
 (0)