Merge pull request #72 from vania-pooh/master

Correctly working in Docker container without OVERRIDE_HOME variable …
aerokube · Aug 9, 2017 · 4612cf5 · 4612cf5
2 parents 8e3b294 + a90077e
commit 4612cf5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -3,4 +3,5 @@ FROM alpine:3.5
 RUN apk add -U ca-certificates tzdata && rm -Rf /var/cache/apk/*
 COPY cm /
 
+WORKDIR /root
 ENTRYPOINT ["/cm"]
diff --git a/selenoid/base.go b/selenoid/base.go
@@ -92,12 +92,7 @@ func getHomeDir() string {
 }
 
 func joinPaths(baseDir string, elem []string) string {
-	var p string
-	if baseDir == "" {
-		p = filepath.Join(elem...)
-	} else {
-		p = filepath.Join(append([]string{baseDir}, elem...)...)
-	}
+	p := filepath.Join(append([]string{baseDir}, elem...)...)
 	ap, _ := filepath.Abs(p)
 	return ap
 }

diff --git a/selenoid/docker_test.go b/selenoid/docker_test.go
@@ -380,6 +380,8 @@ func TestFilterOutLatest(t *testing.T) {
 }
 
 func TestChooseVolumeConfigDir(t *testing.T) {
+	dirWithoutVariable := chooseVolumeConfigDir("/some/dir", []string{"one", "two"})
+	AssertThat(t, dirWithoutVariable, EqualTo{"/some/dir"})
 	os.Setenv("OVERRIDE_HOME", "/test/dir")
 	defer os.Unsetenv("OVERRIDE_HOME")
 	dir := chooseVolumeConfigDir("/some/dir", []string{"one", "two"})