mirror of
https://github.com/ethereum/go-ethereum.git
synced 2026-08-16 17:03:46 +00:00
build: Retrieve git commit hash from the enviroment
When building with docker the git command are not available. This PR uses the docker env to pass the version info. A Makefile command was added to build the docker container. fixes #15346
This commit is contained in:
parent
eea996e4e1
commit
8f19589ed7
3 changed files with 21 additions and 0 deletions
|
|
@ -3,6 +3,13 @@ FROM golang:1.9-alpine as builder
|
|||
|
||||
RUN apk add --no-cache make gcc musl-dev linux-headers
|
||||
|
||||
ARG GIT_COMMIT
|
||||
ENV GIT_COMMIT ${GIT_COMMIT}
|
||||
ARG GIT_BRANCH
|
||||
ENV GIT_BRANCH ${GIT_BRANCH}
|
||||
ARG GIT_TAG
|
||||
ENV GIT_TAG ${GIT_TAG}
|
||||
|
||||
ADD . /go-ethereum
|
||||
RUN cd /go-ethereum && make geth
|
||||
|
||||
|
|
|
|||
7
Makefile
7
Makefile
|
|
@ -34,6 +34,13 @@ ios:
|
|||
@echo "Done building."
|
||||
@echo "Import \"$(GOBIN)/Geth.framework\" to use the library."
|
||||
|
||||
docker:
|
||||
docker build \
|
||||
--build-arg GIT_COMMIT=$(shell git rev-parse HEAD) \
|
||||
--build-arg GIT_BRANCH=$(shell git rev-parse --abbrev-ref HEAD) \
|
||||
--build-arg GIT_TAG=$(shell git tag -l --points-at HEAD) \
|
||||
-t ethereum:$(shell git rev-parse --short HEAD) .
|
||||
|
||||
test: all
|
||||
build/env.sh go run build/ci.go test
|
||||
|
||||
|
|
|
|||
|
|
@ -74,6 +74,13 @@ func Env() Environment {
|
|||
IsPullRequest: os.Getenv("APPVEYOR_PULL_REQUEST_NUMBER") != "",
|
||||
IsCronJob: os.Getenv("APPVEYOR_SCHEDULED_BUILD") == "True",
|
||||
}
|
||||
case os.Getenv("GIT_COMMIT") != "":
|
||||
return Environment{
|
||||
Name: "docker",
|
||||
Commit: os.Getenv("GIT_COMMIT"),
|
||||
Branch: os.Getenv("GIT_BRANCH"),
|
||||
Tag: os.Getenv("GIT_TAG"),
|
||||
}
|
||||
default:
|
||||
return LocalEnv()
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue