roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #15464 from karalabe/docker-fix

Browse Source 
dockerignore, internal/build: forward correct git folder
This commit is contained in:
Péter Szilágyi 2017-11-12 22:56:38 +02:00 committed by GitHub
commit 836314c055
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.dockerignore
View File

@ -1,7 +1,7 @@
**/.git
/.git
!/.git/HEAD
!/.git/refs/heads
.git
!.git/HEAD
!.git/refs/heads
**/*_test.go
build/_workspace

5
internal/build/env.go
View File

@ -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" {

4
internal/build/util.go
View File

@ -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 ""