Merge pull request #193 from arangodb-helper/bugfix/cleanup-database-version-container

ewoutp · web-flow · commit 88177f0bbba7 · 2018-08-10T09:15:50.000+02:00
Cleanup dangling `arangodb --version` container
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,9 @@
 
 ## Changes from version 0.13.0 to master
 
+- Fixed dangling container used to check database version when running
+  _Starter_ on docker.
+
 ## Changes from version 0.12.0 to 0.13.0
 
 - Database upgrade procedure has changed.
diff --git a/service/version_check.go b/service/version_check.go
@@ -40,7 +40,7 @@ func (s *Service) DatabaseVersion(ctx context.Context) (driver.Version, error) {
 	if err != nil {
 		return "", maskAny(err)
 	}
-	//defer p.Cleanup()
+	defer p.Cleanup()
 	p.Wait()
 
 	// Parse output

Original file line number	Diff line number	Diff line change
`@@ -40,7 +40,7 @@ func (s *Service) DatabaseVersion(ctx context.Context) (driver.Version, error) {`
`40`	`40`	`if err != nil {`
`41`	`41`	`return "", maskAny(err)`
`42`	`42`	`}`
`43`		`- //defer p.Cleanup()`
	`43`	`+ defer p.Cleanup()`
`44`	`44`	`p.Wait()`
`45`	`45`
`46`	`46`	`// Parse output`