Commit Graph
37584 Commits
Author SHA1 Message Date
Antonio Murdaca 077a92771f Allow links to be specified with only the name if this matches the alias
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: e8e6124050
Component: cli
2017-05-15 11:57:13 +02:00
wlan0 6470449577 Add log opts flag to pass in logging options
Signed-off-by: wlan0 <sidharthamn@gmail.com>
Upstream-commit: d0c32b1efa
Component: cli
2017-05-15 11:57:13 +02:00
jhowardmsft 87a8e0557c Windows: Change default listener to HTTP
Signed-off-by: jhowardmsft <jhoward@microsoft.com>
Upstream-commit: 7da142413e
Component: cli
2017-05-15 11:57:13 +02:00
Antonio Murdaca 9f1e435e6a Remove job from container_inspect
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 64a9942188
Component: cli
2017-05-15 11:57:13 +02:00
George MacRorie 5792f08680 Cleanup redundant else statements find via golint #11602
Signed-off-by: George MacRorie <gmacr31@gmail.com>
Upstream-commit: cd08d97a64
Component: cli
2017-05-15 11:57:13 +02:00
Tomáš Hrčka 6c88b9b6c8 Restrict domain name to 255 characters
Signed-off-by: Tomáš Hrčka <thrcka@redhat.com>

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
Upstream-commit: 01245d2619
Component: cli
2017-05-15 11:57:13 +02:00
Lei Jitang ccc7b1dd83 Add validate the input mac address on docker run command
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 8972795de7
Component: cli
2017-05-15 11:57:13 +02:00
Brian Goff 2c7c95805c Allow setting ulimits for containers
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 473eb9a2c5
Component: cli
2017-05-15 11:57:13 +02:00
Phil Estes 8471c91d34 Add more helpful error message for -add-host
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)
Upstream-commit: 196bc32878
Component: cli
2017-05-15 11:57:13 +02:00
Phil Estes 42e0391260 Allow IPv6 addresses in ExtraHosts option settings
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)
Upstream-commit: d656c63b21
Component: cli
2017-05-15 11:57:13 +02:00
Doug Davis 542cb79ba6 Docker run -e FOO should erase FOO if FOO isn't set in client env
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>
Upstream-commit: 67735d2a16
Component: cli
2017-05-15 11:57:13 +02:00
Don Kjer 5e44a300bb Deprecating ResolveRepositoryName
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>
Upstream-commit: 4440f5aa3f
Component: cli
2017-05-15 11:57:12 +02:00
Victor Vieux e362dac28b add daemon labels
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 1eda63e7e4
Component: cli
2017-05-15 11:57:12 +02:00
Ahmet Alp Balkan 265a45229c Fix input volume path check on Windows
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>
Upstream-commit: bcae148da2
Component: cli
2017-05-15 11:57:12 +02:00
Tim Hockin c7523b18f9 Allow extra lines in /etc/hosts
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 #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>
Upstream-commit: 4731b1ebc8
Component: cli
2017-05-15 11:57:12 +02:00
Phil Estes 0a5e19808a Refactor all pre-compiled regexp to package level vars
Addresses #8057

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 8b27eee0f0
Component: cli
2017-05-15 11:57:12 +02:00
Tim Smith c5c0e2caa5 Add daemon flag to specify public registry mirrors
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)
Upstream-commit: cc0954586a
Component: cli
2017-05-15 11:57:12 +02:00
Solomon Hykes 9b463e6bc8 Fix inconsistency in IP address parsing errors
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 561b98067f
Component: cli
2017-05-15 11:57:12 +02:00
Solomon Hykes 43a7a9eb65 opts.IPVal returns an error on incorrect input
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 1edb726c0b
Component: cli
2017-05-15 11:57:12 +02:00
Solomon Hykes d71edae8a3 Helpers to parse lists, IPs, hosts, dns searches from the command line
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: a6487884e5
Component: cli
2017-05-15 11:57:12 +02:00
Solomon Hykes fb885c354e opts.IpOpt: a helper to parse IP addressed from the command line
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: f34ca0a354
Component: cli
2017-05-15 11:57:12 +02:00
Tibor Vass f324acb085 Make --attach case-insensitive
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 67a518b70c
Component: cli
2017-05-15 11:57:12 +02:00
Erik Hollensbe 81ffb1c91a Move parsing functions to pkg/parsers and the specific kernel handling
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)
Upstream-commit: 29adea2e42
Component: cli
2017-05-15 11:57:12 +02:00
Victor Vieux acf41deb77 update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 1ed63a0f85
Component: cli
2017-05-15 11:57:12 +02:00
Victor Vieux cd7bb080ab update for consistency
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 84c187fe0c
Component: cli
2017-05-15 11:57:12 +02:00
Jan Pazdziora 422d545b21 Add support for IPv6 addresses in --dns parameters.
Docker-DCO-1.1-Signed-off-by: Jan Pazdziora <jpazdziora@redhat.com> (github: adelton)
Upstream-commit: e56ff6bda9
Component: cli
2017-05-15 11:57:12 +02:00
Fabio Falci 89b67db447 Relax dns search to accept empty domain
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)
Upstream-commit: 9fdc86ac55
Component: cli
2017-05-15 11:57:12 +02:00
Vincent Batts 69a62f5946 env-file: variable behavior
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)
Upstream-commit: 7297bfab30
Component: cli
2017-05-15 11:57:12 +02:00
Vincent Batts 3fc9871b30 --env-file: simple line-delimited
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)
Upstream-commit: 176347382a
Component: cli
2017-05-15 11:57:11 +02:00
Daniel Norberg f2632ce254 variable declaration cleanup
Docker-DCO-1.1-Signed-off-by: Daniel Norberg <daniel.norberg@gmail.com> (github: danielnorberg)
Upstream-commit: 5684997e54
Component: cli
2017-05-15 11:57:11 +02:00
Daniel Norberg 261c179e16 configurable dns search domains
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)
Upstream-commit: bdc62769d3
Component: cli
2017-05-15 11:57:11 +02:00
Victor Vieux de7386fb67 move opts out of pkg because it's related to docker
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: c6c287cddc
Component: cli
2017-05-15 11:57:11 +02:00
Vincent Demeester 6879ffc828 Merge pull request #33146 from Microsoft/jjh/TestAPIStatsNoStreamGetCpu
Fix flaky TestAPIStatsNoStreamGetCpu
Upstream-commit: 8a03eb0b6cc56879eada4a928c6314f33001fc83
Component: engine
2017-05-15 11:21:53 +02:00
zhangxiaoyu-zidif a1d5efdf77 server.go: format for
Signed-off-by: zhangxiaoyu-zidif <zhang.xiaoyu33@zte.com.cn>
Upstream-commit: 1ab62a0b4daa6b643fc140d3ec8661ef407ec3b1
Component: engine
2017-05-15 07:12:28 +08:00
Justin Menga 2d5cb49e4e Update comments describing new behaviour
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: dc87490b632949394307e25dce17c8db6cf664c6
Component: engine
2017-05-15 11:08:16 +12:00
Justin Menga 2373c13c5a Code review changes
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 3a4cf2b076a8f04f54b6edff4f661f5c3b2c8157
Component: engine
2017-05-15 10:28:18 +12:00
Doug Davis 9d09c6e973 Merge pull request #33188 from allencloud/fix-nits-in-function-comments
fix typos in function comments
Upstream-commit: 5072b22c5fea93f00917c8c5d6a29d782db2bb73
Component: engine
2017-05-14 08:17:28 -04:00
allencloud 462508ec1a fix typos in function comments
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 4a98f9ef7fdb6f6f77516fb030293fbc0ff659dc
Component: engine
2017-05-14 13:05:41 +08:00
Kenfe-Mickaël Laventure 418f2b9f51 Merge pull request #33179 from tonistiigi/fix-from-scratch
Fix resetting image metadata between stages for scratch case
Upstream-commit: 4e0fdc9098e2ff9e4e78287f8d60aef8af465d55
Component: engine
2017-05-13 21:17:02 -07:00
Kenfe-Mickaël Laventure 537a743ad7 Merge pull request #33182 from cyli/exclusive-root-pools-in-daemon
Use exclusive root pools if a CA cert file is specified in the daemon
Upstream-commit: 190c6e8cf8b893874a33d83f78307f1bed0bfbcd
Component: engine
2017-05-13 21:15:42 -07:00
allencloud 25f28a5159 add swarm get unlock key test for client package
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: a86023eaa93f18bfefb345a5e13c88156abaa6fa
Component: engine
2017-05-14 11:09:19 +08:00
Daniel Nephin 71ca4e1c02 osx cross
Fix CI build

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a408fb0a61
Component: cli
2017-05-13 13:47:00 -04:00
Sebastiaan van Stijn e5c39230b9 Merge pull request #32700 from jphuynh/more-maintainer-deprecation
MAINTAINER deprecation follow up. Relates to #25466
Upstream-commit: 20255ade2965440d22e149cdd7c32e207f6918ba
Component: engine
2017-05-13 17:28:52 +02:00
Sebastiaan van Stijn 231fefa0c5 Merge pull request #33174 from thaJeztah/update-authors
Update AUTHORS and mailmap
Upstream-commit: c56cfbaf966af0b7b559e4188bcf83340e7bb1cc
Component: engine
2017-05-13 17:25:31 +02:00
Justin Menga 6083b78b58 Add missing month in datetime map
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: bf1c377f6012f3db714e0f848d70e776ef1226a6
Component: engine
2017-05-13 22:10:51 +12:00
Justin Menga 3ac82c3d80 Append new line to multiline events
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 4374f16667708118c126cd71f733493b0070e807
Component: engine
2017-05-13 17:54:04 +12:00
Justin Menga 7dd003d1da Code review changes
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 8ef9c19ecdd16881289a63e5e89de3f5c83def66
Component: engine
2017-05-13 17:54:04 +12:00
Tibor Vass 38049ee803 awslogs: use github.com/pkg/errors to wrap an error
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f775005a17c7ae0d3851cc86f46b7c46aafa27d8
Component: engine
2017-05-13 17:54:04 +12:00
Justin Menga 17b96f5ff1 Formatting
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 6f073e352247217a4cc5ee825676a9a496655455
Component: engine
2017-05-13 17:54:04 +12:00
Justin Menga 4221bdc95f Add awslogs benchmarks
Signed-off-by: Justin Menga <justin.menga@gmail.com>
Upstream-commit: 84b03660dab03ac366d99ba817a5ec8523808386
Component: engine
2017-05-13 17:54:04 +12:00