Fixies dockerd

[runcom]

• second commit use dockerd instead of docker daemon in systemd unit file ExecStart

[runcom]

ping @jfrazelle

[jessfraz]

When did the name change? Sorry I'm super behind on the repo. Looks good to
me tho

On Sunday, April 24, 2016, Antonio Murdaca [email protected] wrote:

ping @jfrazelle https://github.com/jfrazelle

—
You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#22278 (comment)

Jessie Frazelle
4096R / D4C4 DD60 0D66 F65A 8EFC 511E 18F3 685C 0022 BFF3
pgp.mit.edu http://pgp.mit.edu/pks/lookup?op=get&search=0x18F3685C0022BFF3

[mlaventure]

@jfrazelle changed here: #20639

[HackToday]

don't we fix doc related changes for that binary change ?

[kencochrane]

👍

[thaJeztah]

I guess the other init scripts also need to be modified? https://github.com/docker/docker/tree/master/contrib/init

[runcom]

I didn't because I've honestly no expertise :/ could be done in a follow up I guess

[runcom]

I guess I can grep for docker daemon though 😄

[runcom]

updated, ping @tianon

[mlaventure]

Given that the value for BASE in the scripts is being changed to dockerd we need to rename our default configuration file to dockerd in /etc/default/ and /etc/sysconfig too.

[runcom]

@mlaventure where are those files

[tianon]

I wasn't sure what we ought to do here -- if folks have an existing /etc/conf.d/docker, then this means that their DOCKER_BINARY entry now needs to change to point to dockerd instead, so I think we should probably rename the var to make this really explicit and clear (and update docker.confd appropriately).

[runcom]

updated @tianon @mlaventure PTAL

[tianon]

Sorry, I meant we should rename this to be DOCKERD_BINARY instead, so that if someone has an existing file, their DOCKER_BINARY setting won't be used as if it were dockerd to poor effect.

[mlaventure]

@runcom

There are a few files that'd need to be updated if we decide to use dockerd instead of docker daemon from now on, including some markdown one.

The easiest way to find them is to run: git grep 'sysconfig/docker' and git grep 'default/docker'

[LK4D4]

@runcom we merged some stuff about cmd/docker{d}. Did it affect your PR?

[runcom]

@LK4D4 I don't think so as long as it's always installed into /usr/bin/ as dockerd :)

[runcom]

looks like doc stuff for dockerd has been updated here #22386 ping @thaJeztah

[thaJeztah]

@runcom thanks for the ping, was already looking at that :-)

we probably need to update the completion scripts as well?

[mlaventure]

ping @thaJeztah

@runcom made me realize on #22519 that this was still open.

Do we still want to have the completion scripts updated as part of this PR?

P.S: It needs a rebase btw

[thaJeztah]

@mlaventure no, I'm fine with doing that in a separate PR (unless @runcom wants to do it here). Perhaps we should create a tracking issue with all that's left for 1.12 to fix related to the docker daemon to dockerd change

[LK4D4]

@runcom would you mind to answer @tianon comments?

[runcom]

Yes I missed pushing my changes, will do

[runcom]

@LK4D4 @tianon Fixed, let me know if this needs any other things

[LK4D4]

LGTM
ping @tianon

[runcom]

ping @tianon

[tianon]

the DOCKER var in the line above this should be DOCKERD now 😄 (both here, at the top of this file, and in sysvinit-debian/docker.default)

[tianon]

Oh, and in upstart/docker.conf

[runcom]

damn me :) thx for checking again

[tianon]

Sorry, I think this is the last one -- this should still be /usr/local/bin/dockerd and should be commented out by default. 😇

[runcom]

@tianon updated again

[tianon]

Very nice, LGTM 👍 ❤️

[LK4D4]

LGTM
thanks @runcom