Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

[17.12] Defaults Makefile VERSION variable to 0.0.0-dev#340

Merged
andrewhsu merged 1 commit intodocker-archive:17.12from
seemethere:cherry_pick_version_packaging
Dec 11, 2017
Merged

[17.12] Defaults Makefile VERSION variable to 0.0.0-dev#340
andrewhsu merged 1 commit intodocker-archive:17.12from
seemethere:cherry_pick_version_packaging

Conversation

@seemethere
Copy link
Copy Markdown
Contributor

@seemethere seemethere commented Dec 7, 2017

Cherry pick

backport fix from docker/docker-ce-packaging#67

git cherry-pick -x -s -Xsubtree="components/packaging" ffcd040b5c3bd4f81e1d1f11c32f9bb81e235ed1

Cherry pick was clean

Original Text

When building we should default to a dummy version unless otherwise
specified so we don't get ourselves confused over what is official and
what is not.

Signed-off-by: Eli Uriegas eli.uriegas@docker.com
(cherry picked from commit ffcd040)

Signed-off-by: Eli Uriegas eli.uriegas@docker.com

When building we should default to a dummy version unless otherwise
specified so we don't get ourselves confused over what is official and
what is not.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit ffcd040)

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
@seemethere seemethere requested a review from andrewhsu December 7, 2017 22:59
@andrewhsu andrewhsu added this to the 17.12.0 milestone Dec 7, 2017
@andrewhsu
Copy link
Copy Markdown
Contributor

Without this patch, version number was not displayed with static builds:

$ make static
...
$ ./dockerd --version
Docker version dev, build ee2f943

With this patch, version number is displayed:

$ make static
...
$ ./dockerd --version
Docker version 17.12.0-ce-rc1, build b52085fc2e

Copy link
Copy Markdown
Contributor

@andrewhsu andrewhsu left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@andrewhsu andrewhsu merged commit bde1eb8 into docker-archive:17.12 Dec 11, 2017
docker-jenkins pushed a commit that referenced this pull request Sep 23, 2019
[19.03 backport] bump google.golang.org/grpc v1.23.0 (CVE-2019-9512, CVE-2019-9514, CVE-2019-9515)
Upstream-commit: c27f11fa2e1081b3c37d7301b653195018421194
Component: engine
silvin-lubecki pushed a commit to silvin-lubecki/docker-ce that referenced this pull request Jan 31, 2020
…sion_packaging

[17.12] Defaults Makefile VERSION variable to 0.0.0-dev
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.

2 participants