dockerignore, internal/build: forward correct git folder

xiemylogos · Nov 12, 2017 · e401536 · e401536
1 parent cb8bbe7
commit e401536
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -1,7 +1,7 @@
 **/.git
-/.git
-!/.git/HEAD
-!/.git/refs/heads
+.git
+!.git/HEAD
+!.git/refs/heads
 **/*_test.go
 
 build/_workspace

diff --git a/internal/build/env.go b/internal/build/env.go
@@ -82,14 +82,15 @@ func Env() Environment {
 // LocalEnv returns build environment metadata gathered from git.
 func LocalEnv() Environment {
 	env := applyEnvFlags(Environment{Name: "local", Repo: "ethereum/go-ethereum"})
-	head := ReadGitFile("HEAD")
+
+	head := readGitFile("HEAD")
 	if splits := strings.Split(head, " "); len(splits) == 2 {
 		head = splits[1]
 	} else {
 		return env
 	}
 	if env.Commit == "" {
-		env.Commit = ReadGitFile(head)
+		env.Commit = readGitFile(head)
 	}
 	if env.Branch == "" {
 		if head != "HEAD" {

diff --git a/internal/build/util.go b/internal/build/util.go
@@ -89,8 +89,8 @@ func RunGit(args ...string) string {
 	return strings.TrimSpace(stdout.String())
 }
 
-// ReadGitFile returns content of file in .git directory.
-func ReadGitFile(file string) string {
+// readGitFile returns content of file in .git directory.
+func readGitFile(file string) string {
 	content, err := ioutil.ReadFile(path.Join(".git", file))
 	if err != nil {
 		return ""