Merge branch '108-fix-mount-dir-slash' into 'master'

anatolystansler · anatolystansler · commit 595c508ae19b · 2020-03-04T11:54:38.000Z
fix: trailing slash in mount dir problem Closes #108 See merge request postgres-ai/database-lab!89
diff --git a/pkg/services/provision/mode_local.go b/pkg/services/provision/mode_local.go
@@ -89,21 +89,6 @@ func NewProvisionModeLocal(ctx context.Context, config Config, dockerClient *cli
 		},
 	}
 
-	thinCloneManager, err := thinclones.NewManager(p.config.ModeLocal.ThinCloneManager,
-		p.runner, thinclones.ManagerConfig{
-			Pool:                 p.config.ModeLocal.ClonePool,
-			SnapshotFilterSuffix: p.config.ModeLocal.SnapshotFilterSuffix,
-			MountDir:             p.config.ModeLocal.MountDir,
-			OSUsername:           p.config.OSUsername,
-			ClonePrefix:          ClonePrefix,
-		})
-
-	if err != nil {
-		return nil, errors.Wrap(err, "failed to initialize thin-clone manager")
-	}
-
-	p.thinCloneManager = thinCloneManager
-
 	if len(p.config.ModeLocal.MountDir) == 0 {
 		p.config.ModeLocal.MountDir = "/var/lib/dblab/clones/"
 	}
@@ -128,6 +113,21 @@ func NewProvisionModeLocal(ctx context.Context, config Config, dockerClient *cli
 		p.config.PgMgmtPassword = DefaultPassword
 	}
 
+	thinCloneManager, err := thinclones.NewManager(p.config.ModeLocal.ThinCloneManager,
+		p.runner, thinclones.ManagerConfig{
+			Pool:                 p.config.ModeLocal.ClonePool,
+			SnapshotFilterSuffix: p.config.ModeLocal.SnapshotFilterSuffix,
+			MountDir:             p.config.ModeLocal.MountDir,
+			OSUsername:           p.config.OSUsername,
+			ClonePrefix:          ClonePrefix,
+		})
+
+	if err != nil {
+		return nil, errors.Wrap(err, "failed to initialize thin-clone manager")
+	}
+
+	p.thinCloneManager = thinCloneManager
+
 	return p, nil
 }
 
