Import `opts` package from moby/moby #82

vdemeester · 2017-05-15T10:25:03Z

Imports the opts package from moby/moby keeping history. Part of moby/moby#33150 👼.

Used the following to do it

git clone git@github.com:docker/docker.git
git filter-branch -f --prune-empty --subdirectory-filter opts
git filter-branch -f --index-filter \
                   'git ls-files -s | sed "s-\t\"*-&opts/-" |
                           GIT_INDEX_FILE=$GIT_INDEX_FILE.new \
                                   git update-index --index-info &&
                    mv "$GIT_INDEX_FILE.new" "$GIT_INDEX_FILE"' HEAD
git remote add dockercli https://github.com/docker/cli.git
git remote add vdecli git@github.com:vdemeester/cli.git
git fetch -p --all
git rebase -s recursive dockercli/master
git push -f vdecli master:opts-from-docker

The last commit (87948e7) renames the import and update few variable names to not shadow the package.

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)

Add a --dns-search parameter and a DnsSearch configuration field for specifying dns search domains. Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)

match dock functionality, and not try to achieve shell-sourcing compatibility Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)

trim the front of variables. Error if there are other spaces present. Leave the value alone. Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)

In that case /etc/resolv.conf will be generated with no search option. Usage: --dns-search=. Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)

Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com> (github: adelton)

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

functions to pkg/parsers/kernel, and parsing filters to pkg/parsers/filter. Adjust imports and package references. Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)

Signed-off-by: Solomon Hykes <solomon@docker.com>

Adds support for a --registry-mirror=scheme://<host>[:port] daemon flag. The flag may be present multiple times. If provided, mirrors are prepended to the list of endpoints used for image pull. Note that only mirrors of the public index.docker.io registry are supported, and image/tag resolution is still performed via the official index. Docker-DCO-1.1-Signed-off-by: Tim Smith <timbot@google.com> (github: timbot)

Addresses #8057 Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>

This adds a --add-host host:ip flag which appends lines to /etc/hosts. This is needed in places where you want the container to get a different name resolution than it would through DNS. This was submitted before as docker#5525, closed, and now I am re-opening. It has come up 2 or 3 times in the last couple days. Signed-off-by: Tim Hockin <thockin@google.com>

used path package instead of path/filepath so that --volumes and --device parameters to always validate paths as unix paths instead of OS-dependent path convention Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

Signed-off-by: Victor Vieux <vieux@docker.com>

Passing RepositoryInfo to ResolveAuthConfig, pullRepository, and pushRepository Moving --registry-mirror configuration to registry config Created resolve_repository job Repo names with 'index.docker.io' or 'docker.io' are now synonymous with omitting an index name. Adding test for RepositoryInfo Adding tests for opts.StringSetOpts and registry.ValidateMirror Fixing search term use of repoInfo Adding integration tests for registry mirror configuration Normalizing LookupImage image name to match LocalName parsing rules Normalizing repository LocalName to avoid multiple references to an official image Removing errorOut use in tests Removing TODO comment gofmt changes golint comments cleanup. renaming RegistryOptions => registry.Options, and RegistryServiceConfig => registry.ServiceConfig Splitting out builtins.Registry and registry.NewService calls Stray whitespace cleanup Moving integration tests for Mirrors and InsecureRegistries into TestNewIndexInfo unit test Factoring out ValidateRepositoryName from NewRepositoryInfo Removing unused IndexServerURL Allowing json marshaling of ServiceConfig. Exposing ServiceConfig in /info Switching to CamelCase for json marshaling PR cleanup; removing 'Is' prefix from boolean members. Removing unneeded json tags. Removing non-cleanup related fix for 'localhost:[port]' in splitReposName Merge fixes for gh9735 Fixing integration test Reapplying #9754 Adding comment on config.IndexConfigs use from isSecureIndex Remove unused error return value from isSecureIndex Signed-off-by: Don Kjer <don.kjer@gmail.com> Adding back comment in isSecureIndex Signed-off-by: Don Kjer <don.kjer@gmail.com>

See #10141 for more info, but the main point of this is to make sure that if you do "docker run -e FOO ..." that FOO from the current env is passed into the container. This means that if there's a value, its set. But it also means that if FOO isn't set then it should be unset in the container too - even if it has to remove it from the env. So, unset HOSTNAME docker run -e HOSTNAME busybox env should _NOT_ show HOSTNAME in the list at all Closes #10141 Signed-off-by: Doug Davis <dug@us.ibm.com>

Since the separator for extra host settings (for /etc/hosts in a container) is a ":", the code that handles extra hosts needed to only split on the first ":" to preserve IPv6 addresses which are passed via the command line settings as well as stored in the JSON container config. Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)

Fixes: #10655 As noted in the issue, bad format was being returned even if the format was appropriate, but the IP was invalid. This adds a better error message for when the IP address fails validation. Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Signed-off-by: Lei Jitang <leijitang@huawei.com>

Signed-off-by: Tomáš Hrčka <thrcka@redhat.com> Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Signed-off-by: George MacRorie <gmacr31@gmail.com>

Signed-off-by: Antonio Murdaca <me@runcom.ninja>

Signed-off-by: jhowardmsft <jhoward@microsoft.com>

This adds support to specify custom container paths for secrets. Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>

Also, rename a bunch of variable to not *shadow* the `opts` package name. Signed-off-by: Vincent Demeester <vincent@sbr.pm>

cpuguy83

LGTM

dnephin

We need to fix github.com/docker/docker/registry/config.go so it doesn't import docker/docker/opts. That will allow us to remove the package from vendor.

The cli flags should be added from this repo, not from some random package.

That will have to wait until after this PR.

LGTM

vdemeester · 2017-05-15T15:43:29Z

yep I'll handle registry/config.go after 👼 (in docker/docker)

mlaventure · 2017-05-15T18:38:56Z

💚 🎉

bump VERSION files to 17.06.0-ce

Static Dev builds should include date and sha Upstream-commit: 015af2c71e77fb99a9882301828bf8eafe4b95df Component: packaging

vieux and others added 30 commits May 15, 2017 11:57

move opts out of pkg because it's related to docker

c6c287c

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)

configurable dns search domains

bdc6276

Add a --dns-search parameter and a DnsSearch configuration field for specifying dns search domains. Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)

variable declaration cleanup

5684997

Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)

--env-file: simple line-delimited

1763473

match dock functionality, and not try to achieve shell-sourcing compatibility Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)

env-file: variable behavior

7297bfa

trim the front of variables. Error if there are other spaces present. Leave the value alone. Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)

Relax dns search to accept empty domain

9fdc86a

In that case /etc/resolv.conf will be generated with no search option. Usage: --dns-search=. Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)

Add support for IPv6 addresses in --dns parameters.

e56ff6b

Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com> (github: adelton)

update for consistency

84c187f

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

update go import path and libcontainer

1ed63a0

Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)

Move parsing functions to pkg/parsers and the specific kernel handling

29adea2

functions to pkg/parsers/kernel, and parsing filters to pkg/parsers/filter. Adjust imports and package references. Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)

Make --attach case-insensitive

67a518b

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)

opts.IpOpt: a helper to parse IP addressed from the command line

f34ca0a

Signed-off-by: Solomon Hykes <solomon@docker.com>

Helpers to parse lists, IPs, hosts, dns searches from the command line

a648788

Signed-off-by: Solomon Hykes <solomon@docker.com>

opts.IPVal returns an error on incorrect input

1edb726

Signed-off-by: Solomon Hykes <solomon@docker.com>

Fix inconsistency in IP address parsing errors

561b980

Signed-off-by: Solomon Hykes <solomon@docker.com>

Refactor all pre-compiled regexp to package level vars

8b27eee

Addresses #8057 Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>

Fix input volume path check on Windows

bcae148

used path package instead of path/filepath so that --volumes and --device parameters to always validate paths as unix paths instead of OS-dependent path convention Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>

add daemon labels

1eda63e

Signed-off-by: Victor Vieux <vieux@docker.com>

Allow setting ulimits for containers

473eb9a

Signed-off-by: Brian Goff <cpuguy83@gmail.com>

Add validate the input mac address on docker run command

8972795

Signed-off-by: Lei Jitang <leijitang@huawei.com>

Restrict domain name to 255 characters

01245d2

Signed-off-by: Tomáš Hrčka <thrcka@redhat.com> Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Cleanup redundant else statements find via golint #11602

cd08d97

Signed-off-by: George MacRorie <gmacr31@gmail.com>

Remove job from container_inspect

64a9942

Signed-off-by: Antonio Murdaca <me@runcom.ninja>

Windows: Change default listener to HTTP

7da1424

Signed-off-by: jhowardmsft <jhoward@microsoft.com>

ehazlett and others added 2 commits May 15, 2017 11:57

support custom paths for secrets

08097ed

This adds support to specify custom container paths for secrets. Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

Update CLI docs and add opts/config.go

560dc76

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>

GordonTheTurtle added the status/0-triage label May 15, 2017

vdemeester requested review from aaronlehmann, dnephin and tiborvass May 15, 2017 10:25

vdemeester force-pushed the opts-from-docker branch 2 times, most recently from 0de7beb to 8fd1bc8 Compare May 15, 2017 12:14

vdemeester changed the title ~~Opts from docker~~ Import opts package from docker May 15, 2017

vdemeester changed the title ~~Import opts package from docker~~ Import opts package from moby/moby May 15, 2017

vdemeester force-pushed the opts-from-docker branch from 8fd1bc8 to a8f826d Compare May 15, 2017 12:21

thaJeztah added status/2-code-review and removed status/0-triage labels May 15, 2017

thaJeztah mentioned this pull request May 15, 2017

Adding network specific options to service create/update moby/moby#33130

Merged

vdemeester force-pushed the opts-from-docker branch from a8f826d to 6283d47 Compare May 15, 2017 12:38

vdemeester mentioned this pull request May 15, 2017

Remove unused opts (moved to docker/cli) moby/moby#33198

Merged

Update cli imports to using local package

d7f6563

Also, rename a bunch of variable to not *shadow* the `opts` package name. Signed-off-by: Vincent Demeester <vincent@sbr.pm>

vdemeester force-pushed the opts-from-docker branch from 6283d47 to d7f6563 Compare May 15, 2017 12:45

cpuguy83 approved these changes May 15, 2017

View reviewed changes

justincormack approved these changes May 15, 2017

View reviewed changes

dnephin approved these changes May 15, 2017

View reviewed changes

mlaventure merged commit 36e557f into docker:master May 15, 2017

GordonTheTurtle added this to the 17.06.0 milestone May 15, 2017

vdemeester deleted the opts-from-docker branch May 15, 2017 18:59

dnephin mentioned this pull request May 16, 2017

Allow Proxy Configuration in config.json #93

Merged

thaJeztah mentioned this pull request Sep 3, 2022

opts: remove unused RuntimeOpt #3769

Merged

nobiit pushed a commit to nobidev/docker-cli that referenced this pull request Nov 19, 2025

Merge pull request docker#82 from seemethere/increment_to_ga

02c1d87

bump VERSION files to 17.06.0-ce

nobiit pushed a commit to nobidev/docker-cli that referenced this pull request Nov 19, 2025

Merge pull request docker#82 from seemethere/static_dev_versions

1fa91ec

Static Dev builds should include date and sha Upstream-commit: 015af2c71e77fb99a9882301828bf8eafe4b95df Component: packaging

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Import `opts` package from moby/moby #82

Import `opts` package from moby/moby #82

Uh oh!

vdemeester commented May 15, 2017 •

edited

Loading

Uh oh!

cpuguy83 left a comment

Uh oh!

dnephin left a comment

Uh oh!

vdemeester commented May 15, 2017

Uh oh!

mlaventure commented May 15, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Import opts package from moby/moby #82

Import opts package from moby/moby #82

Uh oh!

Conversation

vdemeester commented May 15, 2017 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

cpuguy83 left a comment

Choose a reason for hiding this comment

Uh oh!

dnephin left a comment

Choose a reason for hiding this comment

Uh oh!

vdemeester commented May 15, 2017

Uh oh!

mlaventure commented May 15, 2017

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

20 participants

Import `opts` package from moby/moby #82

Import `opts` package from moby/moby #82

vdemeester commented May 15, 2017 •

edited

Loading