build: include commit hash & version

[ghost]

(partially) fixes #2304

New script bin/genversion generates SemVer-compatible string out of closest git tag. The script is called in Makefile to pass IPFS version and commit info as linker arguments.
Dockerfiles got optional build argument IPFS_VERSION to avoid including .git/ into the image.

License: MIT
Signed-off-by: hutenosa hutenosa@mm.st

[Kubuxu]

IIRC there was API version comparison somewhere, IMO it should work among the same pre-release, different commit metadata. You can try it by building, starting daemon, adding commit, building, trying to use ipfs files ls /.

[ghost]

Travis uses quite outdated docker (1.8.2) which doesn't support build arguments (appeared in 1.9.0). I was unable to upgrade docker in Travis environment so I've just replaced ARG with ENV in both Dockerfiles. Drawback: docker builds will all have hardcoded version 0.4.0-dev unless explicitly changed.

Once Travis refreshes its docker (they promised to keep it updated), we can go back to build arguments and pass the version via cmdline: docker build --build-arg IPFS_VERSION=...

@Kubuxu I checked, client and server versions should match and it's about version tags like 0.4.0-rc2. Commit metadata can be different. Since now version is SemVer-compatible string, we may soften the condition and compare only major versions starting from 1.0.0

[Kubuxu]

What about this: https://github.com/hutenosa/go-ipfs/blob/fix/version-commit-hash/commands/http/handler.go#L453-L463

[ghost]

config.ApiVersion contains only the version number and not the current commit: https://github.com/hutenosa/go-ipfs/blob/fix/version-commit-hash/repo/config/version.go#L18

However, client and daemon with different version number / pre-release will not be able to communicate.

[Kubuxu]

Right, sorry for trouble.

Go/Bash LGTM, but I can't say anything about docker.

[ghost]

@lgierth Are you fine with Dockerfile changes?

There's an important one: to build an image from source code, make docker should be called instead of mere docker build. I didn't find another way to pass the version to the container.

Docker 1.9+ is now required. A workaround for Travis is created.

[whyrusleeping]

@hutenosa could you rebase these changes on the lastest master? I'll also poke @lgierth to have him take a look at the dockerfile changes.

[ghost]

CurrentVersionNumber should stay as it is and not carry commit information -- it's used in too many places where the assumption is a simple vN.N.N string. Maybe just use CurrentCommit?

[ghost]

Hey @hutenosa I'm so sorry for letting this sit so long. I like this PR very much!

I think this can be simplified a bit, by not touching CurrentVersionNumber,
and instead introducing a "full version" as well as deprecating "current commit".

• leave CurrentVersionNumber (and ApiVersion) untouched
• FullVersion, passed as IPFS_FULL_VERSION
• add FullVersion to /api/v0/version
• add ipfs version --full option
• add Full Version to :8080/version
• deprecate/remove mentions of CurrentCommit
  • deprecate ipfs version --commit
  • deprecate Commit in /api/v0/version
  • remove Commit in :8080/version

I can help you out with a few of these any time.

Regarding git, I haven't found a way to use git describe without a full repo,
so passing the full version via docker is okay.

[ghost]

I'm closing this PR since I deleted the forked repository. Unfortunately, github has no means to rebind the PR to a new fork. I'll resubmit a new one shortly.