Commit Graph

24311 Commits

Author SHA1 Message Date
565bc9079d Move some container related methods and structs to smaller files
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fb48bf518bfc200ee9a230a7bedaf640df4e5dae
Component: engine
2016-05-24 21:31:15 +02:00
6696b4b541 Merge pull request #22906 from nshalman/patch-1
Clarification about 'docker build --build-arg'
Upstream-commit: ce07eac570e90ed8aa69472bae463902c075e078
Component: engine
2016-05-24 15:33:27 +02:00
2332228518 Clarification about 'docker build --build-arg'
See #22860

Signed-off-by: Nahum Shalman <nshalman@omniti.com>
Upstream-commit: fd7d99ed283bea260fa5e674ee8200038196fdac
Component: engine
2016-05-24 09:25:11 -04:00
df271497b6 Merge pull request #22900 from AkihiroSuda/fix22020
update docs/reference/commandline/cp.md
Upstream-commit: 6a385a00226dc7d8a35406ae284bb6731444d524
Component: engine
2016-05-24 14:06:02 +02:00
4e2b010c12 update docs/reference/commandline/cp.md
Close #22020

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: cb1635c9cf4813c95a1c72dd35b13e8acebfbfb6
Component: engine
2016-05-24 11:09:38 +00:00
850246a4c4 Merge pull request #22590 from yongtang/22463-docker-daemon-events
Emit events for docker daemon
Upstream-commit: d76d38c7d028754c48f842e4631c2d897e63198d
Component: engine
2016-05-24 11:05:39 +02:00
da14c60e92 Merge pull request #22928 from friism/patch-3
remove duplicated text
Upstream-commit: bf7bae9662a2de9cdb689ac813c503fe1157d6da
Component: engine
2016-05-24 08:38:40 +02:00
d6f4430048 Merge pull request #22541 from crosbymichael/graph-restore
Implement graph driver restore on reboot
Upstream-commit: d7dfe9103bfc275494d936a5d89f3067b0aedbc9
Component: engine
2016-05-23 22:57:23 -07:00
e2f2261834 Merge pull request #22926 from justincormack/seccomp-test
Fix error channel size in seccomp test
Upstream-commit: a5aba7752a9716cde55e94705048407bed17374f
Component: engine
2016-05-23 22:28:24 -07:00
b1cf67eeb6 remove duplicated text
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 5271a69411e93a2b694c84f7f8216f0d91404e07
Component: engine
2016-05-23 19:01:30 -07:00
fe4d79b993 Add filter for events emitted by docker daemon
This fix tries to cover the issue raised in #22463 by adding
filter for events emitted by docker daemon so that user could
utilize filter to receive events of interest.

Documentations have been updated for this fix.

Additional tests have been added to cover the changes in this fix.

This fix fixes #22463.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 62014aaf9abeb4256cb66e7ae06bfdf5a77d1140
Component: engine
2016-05-23 19:00:47 -07:00
e954a0d7e9 Emit events for docker daemon
This fix tries to cover the issue raised in #22463 by emitting
events for docker daemon so that user could be notified by
scenarios like config reload, etc.

This fix adds the `daemon reload`, and events for docker daemon.

Additional tests have been added to cover the changes in this fix.

This fix fixes #22463.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 382c152a73dfa1d771334ffbe79759c5c3596144
Component: engine
2016-05-23 19:00:47 -07:00
f066a59cec Fix error channel size in seccomp test
This was not changed when the additional tests were added.
It may be the reason for occasional test failures.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3598f2e33198686f0afa08aca640dbda8697fcb2
Component: engine
2016-05-23 18:14:55 -07:00
26b03e34e3 Merge pull request #22919 from LK4D4/carry_22754
cli: remove unnecessary initErr type
Upstream-commit: 9bc6c4ef80d8f7178c5b085bea83a5919e3abae1
Component: engine
2016-05-23 20:21:08 -04:00
2736991181 Remove mountedLayer Mount and Unmount
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 8bb4d31b10e4c3abee9ca92535461859bbf25d46
Component: engine
2016-05-23 16:52:58 -07:00
de30361155 Fix overlay use of rootdir and defer
Check for the rootDir first because the mergeDir may not exist if root
is present.

Also fix unmounting in the defer to make sure it does not have a
refcount.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 36a82c20321936a71b30fcfde8bc6c76d6cc8d1f
Component: engine
2016-05-23 16:03:40 -07:00
bfa2eac673 Add windows graph driver ref counter
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 4bac8bce985b20d68422ef93de3adf4931b2dee5
Component: engine
2016-05-23 16:03:40 -07:00
49f1314f0b Remove ref counting from layer store
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e19499710e3728433cdc8348e985f9a825cb2336
Component: engine
2016-05-23 15:57:23 -07:00
987aa6f79e Add reference counting to aufs
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 5b6b8df0c1b5a54ae9a717810eedf9fc971e1321
Component: engine
2016-05-23 15:57:23 -07:00
50e99151eb Add fast path for fsmagic supported drivers
For things that we can check if they are mounted by using their fsmagic
we should use that and for others do it the slow way.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 1ba05cdb6ade7e3abd4c4c3221b5e27645460111
Component: engine
2016-05-23 15:57:23 -07:00
e6822e5504 Remove restart test
This test is not applicable anymore now that containers are not stopped
when the daemon is restored.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 31e903b0e17d01a4240f7890218a80088d32658c
Component: engine
2016-05-23 15:57:23 -07:00
8f4e229dc9 Remove overlay pathCache
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 290be017c54ed99466339529bf8683ee00930c28
Component: engine
2016-05-23 15:57:23 -07:00
2b52cbdf3e Restore ref count
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 009ee16beff4f6d3607fa251019908cc72ce0a34
Component: engine
2016-05-23 15:57:23 -07:00
32ca950a34 cli: remove unnecessary initErr type
Signed-off-by: ZhangHang <stevezhang2014@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b65e57bed534b00350d091db1894fdff1c4230d5
Component: engine
2016-05-23 13:04:10 -07:00
890fe96d30 Merge pull request #22875 from Microsoft/jjh/nativeconsoleon
Windows: Turn on native console by default
Upstream-commit: 91bc4cca58dcd698b67f6e7cad7dc225a870eafe
Component: engine
2016-05-23 21:19:54 +02:00
0fa6812f20 Merge pull request #22665 from isubuz/20788-doc-valid-tag-name
docs: add valid chars in image name and tag 
Upstream-commit: 2cd8b876ad1c235ccd932d101252423fa86aee06
Component: engine
2016-05-23 20:45:27 +02:00
af7458f4ff Merge pull request #22774 from Microsoft/jjh/client
Windows: Daemon default to Hyper-V containers on client
Upstream-commit: 9f1a1212593e8e9ca4fcdeeaabc09e0deee8e806
Component: engine
2016-05-23 11:29:50 -07:00
0fe147094e Merge pull request #22856 from thaJeztah/dont-warn-when-net-none
Suppress "IPv4 forwarding" warning for --net=none
Upstream-commit: 3ab9049be31c2c205cb9bce793e3bd640072e6e7
Component: engine
2016-05-23 11:11:21 -07:00
f3d8bc8e20 Merge pull request #22873 from jstarks/fix_bs_del
Windows: Work around Windows BS/DEL behavior
Upstream-commit: 0ac881b70582bce279db124f2cd89222c1857625
Component: engine
2016-05-23 11:10:33 -07:00
1f85a31589 Merge pull request #22878 from vdemeester/better-default-context
Rework usage of context.Context in api/client
Upstream-commit: 5f95750ab40ecc71b0424c399c35a42dc0965ad5
Component: engine
2016-05-23 13:43:08 -04:00
c0471a1614 Merge pull request #22884 from vdemeester/moving-daemon-horn
Move some image related methods & struct to smaller files
Upstream-commit: b316bc42fe1ad8edc709bf28975fb3a52e766344
Component: engine
2016-05-23 12:26:00 -04:00
85a166f069 Merge pull request #22892 from alexellis/20784-builder-intg2unit-tests-typo
Typo fix wiildcard -> wildcard
Upstream-commit: f18224de143e7a129ef63cdfa53fa4b0a2d90f9d
Component: engine
2016-05-22 12:07:11 -07:00
dd19106ac3 Typo fix wiildcard -> wildcard
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
Upstream-commit: 86d48aa111384539b0d2bd50353c4d4c40a5750a
Component: engine
2016-05-22 18:39:35 +01:00
c9241942c4 Merge pull request #22889 from thaJeztah/carry-22151-granular-vendoring
Allow granular vendoring
Upstream-commit: 07dc6bfb46e3cd30d01e027680e18a662806bd49
Component: engine
2016-05-22 18:30:59 +02:00
4d15f45425 Merge pull request #22890 from thaJeztah/docs/slashes
fix docs not building if branch-name contains slashes
Upstream-commit: 07f79621ea3aef5220d6c275fcab03bb4ed6ce22
Component: engine
2016-05-22 17:49:08 +02:00
773532708c Merge pull request #22706 from tkopczynski/20784-builder-intg2unit-tests
Reimplement more builder integration tests as unit tests
Upstream-commit: e0653413ec9242a64ef8f2d23ad426efae81bf6b
Component: engine
2016-05-22 17:48:30 +02:00
ebe14ff3b5 fix docs not building if branch-name contains slashes
similar to the changes made in a4192471cd6d6012a66c19a635a11c7f6139d683,
clean the branch-name before using it as a tag-name
for the image that's built.

this also changes the "image name" for docs images
being built from "docs-base" to "docker-docs", to
be in line with the main Makefile

before this change:

  /usr/bin/make -C docs docs
  docker build -t "docs-base:docs/slashes" .
  invalid value "docs-base:docs/slashes" for flag -t: Error parsing reference: "docs-base:docs/slashes" is not a valid repository/tag
  See 'docker build --help'.
  make[1]: *** [docs-build] Error 125
  make: *** [docs] Error 2

after this change:

  /usr/bin/make -C docs docs
  docker build -t "docker-docs:docs-slashes" .
  Sending build context to Docker daemon 9.165 MB
  ...

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9552e24af6151eaef07a481a1125059141d01f75
Component: engine
2016-05-22 17:33:41 +02:00
0a347eac64 Allow granular vendoring
hack/vendor.sh can now accept command line arguments

`./hack/vendor.sh github.com/docker/engine-api` will revendor only the
engine-api dependency.

`./hack/vendor.sh github.com/docker/engine-api v0.3.3` will vendor only
engine-api at the specified tag/commit.

`./hack/vendor.sh git github.com/docker/engine-api v0.3.3` is the same
but specifies the VCS for cases where the VCS is something else than git

`./hack/vendor.sh git golang.org/x/sys
eb2c74142fd19a79b3f237334c7384d5167b1b46
https://github.com/golang/sys.git` will vendor only golang.org/x/sys
downloading from the specified URL

Signed-off-by: Tibor Vass <tibor@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 80f61c41086cb2be8dbea023667f42a6c3c3248c
Component: engine
2016-05-22 16:44:25 +02:00
9071d0f71d Merge pull request #22747 from sdurrheimer/zsh-completion-images-filters
Add zsh completion for 'docker images' filters
Upstream-commit: 96817cbdee48c4877da7a1f42009331befc6af0d
Component: engine
2016-05-22 16:30:18 +02:00
8ea54c334a Merge pull request #22885 from yongtang/05212016-typo-in-dockernetworks-md
Fix a typos in docs of networking guide
Upstream-commit: c0c36bc15096cb7a81dfb9556b1300d0cd94013a
Component: engine
2016-05-22 15:54:21 +02:00
d84ac3cf8d Add zsh completion for 'docker images' filters
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 11da243273908719c5ab755c6765a9561693ba30
Component: engine
2016-05-22 13:01:08 +02:00
4197623885 Reimplementing more builder integration tests as unit tests
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
Upstream-commit: cf2611f3239d18919e437e82554cec178028612e
Component: engine
2016-05-22 01:00:57 +02:00
f70f621a66 Move some image related methods & struct to smaller files
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d5baf8ddcfd81734e96f3405b941f5e21b24caff
Component: engine
2016-05-21 22:36:11 +02:00
45541eb90b Fix a typos in docs of networking guide
This fix fixes a typo in the documentation (`dockernetworks.md`)
of networking user guide.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 55b172401851a6338a325ef7930d50ace9efb067
Component: engine
2016-05-21 13:19:05 -07:00
d83ba877bb Document valid chars in image name and tag
- Add link to valid image name and tag formats in referenced files
- Per review comments, updated docs to remove reference to `USERNAME` and
`REGISTRYHOST`.
- Per review comment, removed links from man page.
- Per review comment, added and updated examples on `docker tag`

Signed-off-by: Subhajit Ghosh <isubuz.g@gmail.com>
Upstream-commit: ea98cf74aad3c2633268d5a0b8a2f80b331ddc0b
Component: engine
2016-05-21 19:49:19 +01:00
8a34f4db20 Windows: Default to Hyper-V Containers on client
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ef2db56bcf73b3962548a474bbd4469d26f2c655
Component: engine
2016-05-21 11:29:53 -07:00
c8d36013e6 Rework usage of context.Context in api/client
Make better default usage on context.Context on the `api/client` package
to share the context (it is useless if not shared, which was the case
for a lot of commands).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 4c7f0d268f413b4a55ea638a97382d9316d082af
Component: engine
2016-05-21 15:57:57 +02:00
a24dcb8ba0 Merge pull request #22876 from Microsoft/jjh/docsclarification
Docs: JSON vs Shell clarification
Upstream-commit: e3079b470494a596bc8b35bc682e7c82ac9f0f9f
Component: engine
2016-05-21 11:52:49 +02:00
035b0db1ec Merge pull request #22775 from Microsoft/jjh/removewindowsdiff
Windows: Remove windowsdiff graph driver
Upstream-commit: 7311d687e032b63715da74e327dfc06d3dba3b42
Component: engine
2016-05-21 08:02:20 +02:00
bd09171248 Merge pull request #22863 from Saser/replace-unicode-single-quote
Replace occurrences of U+2018 and U+2019 with U+0027 in manpages
Upstream-commit: 4afc4edd74a49fe35b4e19f9fc813523387d85c0
Component: engine
2016-05-21 07:42:26 +02:00