aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPéter Szilágyi <peterke@gmail.com>2017-11-13 04:56:38 +0800
committerGitHub <noreply@github.com>2017-11-13 04:56:38 +0800
commit836314c055bebed671a392a0cf8202e57efceb41 (patch)
tree5a5fc484378d333a4e8b6b3236ccf40e5cf660c6
parentcb8bbe70819839e6399c44fff6a75ab3d16b8791 (diff)
parente401536c97f6c31a10f89952757dbb92cdf60e2d (diff)
downloaddexon-836314c055bebed671a392a0cf8202e57efceb41.tar
dexon-836314c055bebed671a392a0cf8202e57efceb41.tar.gz
dexon-836314c055bebed671a392a0cf8202e57efceb41.tar.bz2
dexon-836314c055bebed671a392a0cf8202e57efceb41.tar.lz
dexon-836314c055bebed671a392a0cf8202e57efceb41.tar.xz
dexon-836314c055bebed671a392a0cf8202e57efceb41.tar.zst
dexon-836314c055bebed671a392a0cf8202e57efceb41.zip
Merge pull request #15464 from karalabe/docker-fix
dockerignore, internal/build: forward correct git folder
-rw-r--r--.dockerignore6
-rw-r--r--internal/build/env.go5
-rw-r--r--internal/build/util.go4
3 files changed, 8 insertions, 7 deletions
diff --git a/.dockerignore b/.dockerignore
index 751ff2a0c..d280741c6 100644
--- 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
index 793242fcf..c9848bf82 100644
--- 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
index 91465c419..c6e059f0d 100644
--- 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 ""