Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Fix UNKNOWN values on docker images #11608

Merged
merged 1 commit into from
Apr 7, 2020
Merged

Conversation

denisgranha
Copy link

In the previous build for docker images, it had the .git folder ignored. It makes sense to ignore it, it's a big folder and usually it doesn't get used.

The problem is that it's used in the compilation by this library https://docs.rs/vergen/3.1.0/vergen/
And is the reason why with the current build, there are two unknown values:

2020-04-02 15:52:59 UTC Starting OpenEthereum/v3.0.0-alpha.1-nightly-UNKNOWN-UNKNOWN/x86_64-alpine-linux-musl/rustc1.42.0

With this PR, this issue gets solved.

Thanks to the way the alpine docker file has been written, the final size of the image is not affected by this PR as the docker image is built in a multistage process and only the binaries are included in the final image.

…ild date and commit hash in the binary generatio vergen library can get build date and commit hash in the binary generation
@eduadiez
Copy link
Collaborator

eduadiez commented Apr 6, 2020

LGTM.

Since we've two stages during the docker image generation I don't see any problem on copy the .git directory inside the first stage.

@denisgranha denisgranha merged commit 6ae613e into master Apr 7, 2020
@niklasad1 niklasad1 deleted the hotfix/docker-git-params branch April 7, 2020 09:39
dvdplm added a commit that referenced this pull request Apr 14, 2020
* master: (25 commits)
  Update .gitmodules (#11628)
  ethcore/res: activate ecip-1088 phoenix on classic (#11598)
  Upgrade parity-common deps to latest (#11620)
  Fix Goerli syncing (#11604)
  deps: switch to upstream ctrlc (#11617)
  Deduplicating crate dependencies (part 3 of n) (#11614)
  Deduplicating crate dependencies (part 2 of n, `slab`) (#11613)
  Actually save ENR on creation and modification (#11602)
  Activate POSDAO on xDai chain and update bootnodes (#11610)
  Activate on-chain randomness in POA Core (#11609)
  Deduplicating crate dependencies (part 1 of n) (#11606)
  Update enodes for POA Sokol (#11611)
  Remove .git folder from dogerignore file so vergen library can get build date and commit hash in the binary generatio vergen library can get build date and commit hash in the binary generation (#11608)
  Reduced gas cost for static calls made to precompiles EIP2046/1352 (#11583)
  [easy] `ethcore-bloom-journal` was renamed to `accounts-bloom` (#11605)
  Use serde_json to export hardcoded sync (#11601)
  Node Discovery v4 ENR Extension (EIP-868) (#11540)
  Fix compile warnings (#11595)
  Update version to 3.0.0-alpha.1 (#11592)
  ethcore/res: bump canon fork hash for mordor and kotti testnets (#11584)
  ...
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants