-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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
cli: add a separate --domainname flag #1130
Conversation
It's also related to moby/moby#37302. |
307aeaf
to
f0ba2fc
Compare
This should be ready to review. It has tests and documentation (though it depends somewhat on the server-side changes as well). |
f0ba2fc
to
6e3d549
Compare
Alright, I've fixed the build by removing the Swarm changes -- it looks like Swarm doesn't have a Domainname field in the API so we can't really add a switch for it. /ping @vdemeester @thaJeztah |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
SGTM 🐯
moby/moby#37302 was merged, so this should be ready-to-go. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I successfully tested run
and create
, but the feature seems to be absent for service create|update
:
$ build/docker run --help | grep domainname
--domainname string Container NIS domain name
$ build/docker create --help | grep domainname
--domainname string Container NIS domain name
$ build/docker service create --help | grep domainname
$ build/docker service update --help | grep domainname
$ build/docker service create --hostname some-host --domainname --some-domain nginx
unknown flag: --domainname
See 'docker service create --help'.
$ build/docker --version
Docker version 18.06.0-dev, build 6e3d5494
18b591e
to
ed970f2
Compare
Codecov Report
@@ Coverage Diff @@
## master #1130 +/- ##
==========================================
+ Coverage 55.22% 55.23% +<.01%
==========================================
Files 289 289
Lines 19389 19391 +2
==========================================
+ Hits 10708 10710 +2
Misses 7984 7984
Partials 697 697 |
Codecov Report
@@ Coverage Diff @@
## master #1130 +/- ##
==========================================
+ Coverage 55.22% 55.23% +<.01%
==========================================
Files 289 289
Lines 19389 19391 +2
==========================================
+ Hits 10708 10710 +2
Misses 7984 7984
Partials 697 697 |
3fcb197
to
4fc223c
Compare
/cc @albers |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM, but please remove the unrelated doc change.
A while ago, Docker split the "Domainname" field out from the "Hostname" field for the container configuration. There was no real user-visible change associated with this (and under the hood "Domainname" was mostly left unused from the command-line point of view). We now add this flag in order to match other proposed changes to allow for setting the NIS domainname of a container. This also includes a fix for the --hostname parsing tests (they would not error out if only one of .Hostname and .Domainname were incorrectly set -- which is not correct). Signed-off-by: Aleksa Sarai <asarai@suse.de>
4fc223c
to
6475790
Compare
@albers Removed the formatting change. |
Thanks for the contribution, @cyphar! |
A while ago, Docker split the "Domainname" field out from the "Hostname"
field for the container configuration. There was no real user-visible
change associated with this (and under the hood "Domainname" was mostly
left unused from the command-line point of view). We now add this flag
in order to match other proposed changes to allow for setting the NIS
domainname of a container.
Cute cat by .:I'm-a-kitty-cat!:.
Signed-off-by: Aleksa Sarai asarai@suse.de