Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixing the wrong Git Commit hash in docker version #22048

Merged

Conversation

vdemeester
Copy link
Member

DOCKER_GITCOMMIT needs to match the tagged commit used to build the
binary. The current commit refers to 1.12.1 and wasn't update each
time we updated the package. Using a variable near the version and
adding a comment so we don't forget to update next time.

Signed-off-by: Vincent Demeester vincent@sbr.pm

Motivation for this change

The current output of docker version is incoherent (tag is 1.13.0 but the commit refers to 1.12.1). My bad for not seeing this when updating the package 馃槄 馃惢.

Things done
  • Tested using sandboxing
    (nix.useSandbox on NixOS,
    or option build-use-sandbox in nix.conf
    on non-NixOS)
  • Built on platform(s)
    • NixOS
    • macOS
    • Linux
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Fits CONTRIBUTING.md.

`DOCKER_GITCOMMIT` needs to match the tagged commit used to build the
binary. The current commit refers to 1.12.1 and wasn't update each
time we updated the package. Using a variable near the version and
adding a comment so we don't forget to update next time.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
@mention-bot
Copy link

@vdemeester, thanks for your PR! By analyzing the history of the files in this pull request, we identified @offlinehacker, @domenkozar and @benley to be potential reviewers.

@offlinehacker offlinehacker merged commit ab6f360 into NixOS:master Jan 23, 2017
@vdemeester vdemeester deleted the fix-docker-version-git-commit branch January 23, 2017 10:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants