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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Rename binaries to moby-* #34226

Open
wants to merge 10 commits into
base: master
from

Conversation

@tiborvass
Copy link
Collaborator

tiborvass commented Jul 23, 2017

Since the project and product separation between moby and docker, we had yet to rename the dockerd binary to a moby-affiliated name. It is in accordance with the plan in #35115

This PR does not impact docker CE.

The complete list of binaries being renamed in this repository:

dockerd			-> moby-engine
docker-init		-> moby-tini
docker-proxy		-> moby-proxy
docker-runc		-> moby-runc
docker-containerd	-> moby-containerd
docker-containerd-ctr	-> moby-containerd-ctr
docker-containerd-shim	-> moby-containerd-shim

Again, this should not affect Docker users.

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Jul 24, 2017

I'd prefer daemon over server 😈

@@ -81,7 +81,7 @@ func runDaemon(opts *daemonOptions) error {
}

func showVersion() {
fmt.Printf("Docker version %s, build %s\n", dockerversion.Version, dockerversion.GitCommit)
fmt.Printf("Docker version %s, build %s\n", autoversion.Version, autoversion.GitCommit)

This comment has been minimized.

@AkihiroSuda

AkihiroSuda Jul 24, 2017

Member

Docker -> Moby Core? (should be definable on compilation-time)

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Jul 24, 2017

cmd/server/README.md seems unneeded

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Aug 4, 2017

What's the current status?

@justincormack

This comment has been minimized.

Copy link
Contributor

justincormack commented Aug 15, 2017

Needs a rebase

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Aug 31, 2017

ping @tiborvass @mavenugo
What's current status?

(I think I have seen concrete schedule on this somewhere else, but could not find that again .. 😅 )

@tiborvass

This comment has been minimized.

Copy link
Collaborator

tiborvass commented Aug 31, 2017

@AkihiroSuda feel free to push to this branch, I wanted to get back to this but need to finish more pressing things first.

@tiborvass tiborvass referenced this pull request Oct 6, 2017

Open

Completing the Moby transition #35115

3 of 17 tasks complete

@tiborvass tiborvass changed the title Rename binaries to moby-core-* Rename binaries to moby-* Oct 6, 2017

@justincormack

This comment has been minimized.

Copy link
Contributor

justincormack commented Oct 9, 2017

Needs a rebase again. Lets prioritise this.

@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Oct 9, 2017

After switching to containerd 1.0, will we drop the prefixed names?

@justincormack

This comment has been minimized.

Copy link
Contributor

justincormack commented Oct 10, 2017

@thaJeztah I think we expect people to start packaging moby with upstream runc and containerd so potentially yes.

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Oct 10, 2017

moby-init might be confusing. Can we use moby-engine-%s prefix?

@justincormack

This comment has been minimized.

Copy link
Contributor

justincormack commented Oct 10, 2017

@AkihiroSuda we are now using unmodified upstream tini as well, I think we could just use that name.

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Oct 10, 2017

Not sure for tini, but for runc and containerd, using them without prefix might cause issues..

Can we put these binaries to /usr/local/libexec/moby-engine (Or /usr/local/libexec/moby)?

e.g.
/usr/local/libexec/moby-engine/runc, /usr/local/libexec/moby-engine/containerd, and /usr/local/libexec/moby-engine/tini

@justincormack

This comment has been minimized.

Copy link
Contributor

justincormack commented Oct 10, 2017

@AkihiroSuda we should open another issue to discuss those changes.

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Oct 10, 2017

Posted a comment to containerd/containerd#1508 (comment)
(No need to use prefix nor libexec if we can support installing different versions of containerd simultaneously)

@tiborvass tiborvass force-pushed the tiborvass:rename-dockerd branch from 73d1fae to 6c6b9c3 Oct 25, 2017

@cpuguy83

This comment has been minimized.

Copy link
Contributor

cpuguy83 commented Oct 25, 2017

15:43:27 daemon/runtime_autogen.go:7: DefaultRuntimeBinary redeclared in this block
15:43:27 	previous declaration at daemon/daemon_unix.go:61

Also a bunch of warnings from gosimple.

tiborvass and others added some commits Apr 12, 2017

project: rename dockerd in libcontainerd
Signed-off-by: Tibor Vass <tibor@docker.com>
project: rename dockerversion to autoversion
Signed-off-by: Tibor Vass <tibor@docker.com>
Fix warnings/errors
Signed-off-by: Tibor Vass <tibor@docker.com>
Rename dockerd to moby-engine
Signed-off-by: Daniel Nephin <dnephin@docker.com>
revendor libnetwork
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Add hack/ci/windowsRS1
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Rename dockerd to moby-engine in windows CI
Signed-off-by: Daniel Nephin <dnephin@docker.com>

@dnephin dnephin force-pushed the tiborvass:rename-dockerd branch from aadcd67 to 6e7071b Nov 3, 2017

@dnephin

This comment has been minimized.

Copy link
Member

dnephin commented Nov 3, 2017

rebased, and green again

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Nov 4, 2017

Can we have a blog article about this for announcement?

@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Nov 4, 2017

Yes, a blog would be appropriate 😄

I would like to have some more eyes on this, before we merge, and see if it needs additional coordination.

DO NOT MERGE YET

@vdemeester
Copy link
Member

vdemeester left a comment

LGTM 🐯

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Nov 7, 2017

@justincormack
Should we remove or update bundle installers for "Docker for Mac" and Docker Machine?

https://github.com/moby/moby/blob/6e7071ba2ae1abc04fe3fa1b33713cf28981b341/contrib/mac-install-bundle.sh
https://github.com/moby/moby/blob/6e7071ba2ae1abc04fe3fa1b33713cf28981b341/contrib/docker-machine-install-bundle.sh

(Either way, these are just contrib scripts and no need to be changed in this PR 😄 )

@thaJeztah

This comment has been minimized.

Copy link
Member

thaJeztah commented Nov 10, 2017

@dnephin @tiborvass what are we gonna do for https://master.dockerproject.org ? I think the current setup is configured to;

Historically, that site built master builds for the Docker project, and I know it's used for internal e2e tests to catch regressions early (combination docker cli <--> moby master), but I think it's also referred to by Microsoft for people that want to try a "cutting edge" version of "Docker" on Windows.

The last one is a bit of a pain, because it's not "Docker".

/cc @seemethere

@dnephin

This comment has been minimized.

Copy link
Member

dnephin commented Nov 10, 2017

We should probably have an nightly job that updates docker-ce and publishes from there.

@lsm5

This comment has been minimized.

Copy link
Contributor

lsm5 commented Feb 22, 2018

Any update on this? Also, are we at a point yet where we could use the distro's runc and containerd instead of docker-[runc,containerd] ? /cc @carlwgeorge

@AkihiroSuda

This comment has been minimized.

Copy link
Member

AkihiroSuda commented Mar 22, 2018

Is this still on plan?

@thaJeztah thaJeztah added this to backlog in maintainers-session Mar 22, 2018

@@ -163,14 +163,13 @@ Function Get-UpstreamCommit() {
}

# Build a binary (client or daemon)
Function Execute-Build($type, $additionalBuildTags, $directory) {
Function Execute-Build($type, $directory, $binary) {

This comment has been minimized.

@jhowardmsft

jhowardmsft Mar 22, 2018

Contributor

Why is this being removed?

@jhowardmsft

This comment has been minimized.

Copy link
Contributor

jhowardmsft commented Mar 22, 2018

This probably needs a change to the .rc files under hack\make\.resources-windows which embed the product name as seen in explorer. eg

image

@lsm5

This comment has been minimized.

Copy link
Contributor

lsm5 commented Aug 19, 2018

Is the rename still being considered?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment