1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

24311 Commits

Author SHA1 Message Date
Vincent Demeester
fb48bf518b Move some container related methods and structs to smaller files
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-24 21:31:15 +02:00
Vincent Demeester
ce07eac570 Merge pull request #22906 from nshalman/patch-1
Clarification about 'docker build --build-arg'
2016-05-24 15:33:27 +02:00
Nahum Shalman
fd7d99ed28 Clarification about 'docker build --build-arg'
See #22860

Signed-off-by: Nahum Shalman <nshalman@omniti.com>
2016-05-24 09:25:11 -04:00
Vincent Demeester
6a385a0022 Merge pull request #22900 from AkihiroSuda/fix22020
update docs/reference/commandline/cp.md
2016-05-24 14:06:02 +02:00
Akihiro Suda
cb1635c9cf update docs/reference/commandline/cp.md
Close #22020

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2016-05-24 11:09:38 +00:00
Vincent Demeester
d76d38c7d0 Merge pull request #22590 from yongtang/22463-docker-daemon-events
Emit events for docker daemon
2016-05-24 11:05:39 +02:00
Vincent Demeester
bf7bae9662 Merge pull request #22928 from friism/patch-3
remove duplicated text
2016-05-24 08:38:40 +02:00
Alexander Morozov
d7dfe9103b Merge pull request #22541 from crosbymichael/graph-restore
Implement graph driver restore on reboot
2016-05-23 22:57:23 -07:00
Tõnis Tiigi
a5aba7752a Merge pull request #22926 from justincormack/seccomp-test
Fix error channel size in seccomp test
2016-05-23 22:28:24 -07:00
Michael Friis
5271a69411 remove duplicated text
Signed-off-by: Michael Friis <friism@gmail.com>
2016-05-23 19:01:30 -07:00
Yong Tang
62014aaf9a 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>
2016-05-23 19:00:47 -07:00
Yong Tang
382c152a73 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>
2016-05-23 19:00:47 -07:00
Justin Cormack
3598f2e331 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>
2016-05-23 18:14:55 -07:00
Brian Goff
9bc6c4ef80 Merge pull request #22919 from LK4D4/carry_22754
cli: remove unnecessary initErr type
2016-05-23 20:21:08 -04:00
Michael Crosby
8bb4d31b10 Remove mountedLayer Mount and Unmount
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-23 16:52:58 -07:00
Michael Crosby
36a82c2032 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>
2016-05-23 16:03:40 -07:00
Michael Crosby
4bac8bce98 Add windows graph driver ref counter
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-23 16:03:40 -07:00
Michael Crosby
e19499710e Remove ref counting from layer store
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-23 15:57:23 -07:00
Michael Crosby
5b6b8df0c1 Add reference counting to aufs
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-23 15:57:23 -07:00
Michael Crosby
1ba05cdb6a 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>
2016-05-23 15:57:23 -07:00
Michael Crosby
31e903b0e1 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>
2016-05-23 15:57:23 -07:00
Michael Crosby
290be017c5 Remove overlay pathCache
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-23 15:57:23 -07:00
Michael Crosby
009ee16bef Restore ref count
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-05-23 15:57:23 -07:00
muge
b65e57bed5 cli: remove unnecessary initErr type
Signed-off-by: ZhangHang <stevezhang2014@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-05-23 13:04:10 -07:00
Sebastiaan van Stijn
91bc4cca58 Merge pull request #22875 from Microsoft/jjh/nativeconsoleon
Windows: Turn on native console by default
2016-05-23 21:19:54 +02:00
Sebastiaan van Stijn
2cd8b876ad Merge pull request #22665 from isubuz/20788-doc-valid-tag-name
docs: add valid chars in image name and tag
2016-05-23 20:45:27 +02:00
Alexander Morozov
9f1a121259 Merge pull request #22774 from Microsoft/jjh/client
Windows: Daemon default to Hyper-V containers on client
2016-05-23 11:29:50 -07:00
Alexander Morozov
3ab9049be3 Merge pull request #22856 from thaJeztah/dont-warn-when-net-none
Suppress "IPv4 forwarding" warning for --net=none
2016-05-23 11:11:21 -07:00
Alexander Morozov
0ac881b705 Merge pull request #22873 from jstarks/fix_bs_del
Windows: Work around Windows BS/DEL behavior
2016-05-23 11:10:33 -07:00
Tibor Vass
5f95750ab4 Merge pull request #22878 from vdemeester/better-default-context
Rework usage of context.Context in api/client
2016-05-23 13:43:08 -04:00
Brian Goff
b316bc42fe Merge pull request #22884 from vdemeester/moving-daemon-horn
Move some image related methods & struct to smaller files
2016-05-23 12:26:00 -04:00
Alexander Morozov
f18224de14 Merge pull request #22892 from alexellis/20784-builder-intg2unit-tests-typo
Typo fix wiildcard -> wildcard
2016-05-22 12:07:11 -07:00
Alex Ellis
86d48aa111 Typo fix wiildcard -> wildcard
Signed-off-by: Alex Ellis <alexellis2@gmail.com>
2016-05-22 18:39:35 +01:00
Vincent Demeester
07dc6bfb46 Merge pull request #22889 from thaJeztah/carry-22151-granular-vendoring
Allow granular vendoring
2016-05-22 18:30:59 +02:00
Vincent Demeester
07f79621ea Merge pull request #22890 from thaJeztah/docs/slashes
fix docs not building if branch-name contains slashes
2016-05-22 17:49:08 +02:00
Vincent Demeester
e0653413ec Merge pull request #22706 from tkopczynski/20784-builder-intg2unit-tests
Reimplement more builder integration tests as unit tests
2016-05-22 17:48:30 +02:00
Sebastiaan van Stijn
9552e24af6 fix docs not building if branch-name contains slashes
similar to the changes made in a4192471cd,
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>
2016-05-22 17:33:41 +02:00
Tibor Vass
80f61c4108 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>
2016-05-22 16:44:25 +02:00
Sebastiaan van Stijn
96817cbdee Merge pull request #22747 from sdurrheimer/zsh-completion-images-filters
Add zsh completion for 'docker images' filters
2016-05-22 16:30:18 +02:00
Sebastiaan van Stijn
c0c36bc150 Merge pull request #22885 from yongtang/05212016-typo-in-dockernetworks-md
Fix a typos in docs of networking guide
2016-05-22 15:54:21 +02:00
Steve Durrheimer
11da243273 Add zsh completion for 'docker images' filters
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2016-05-22 13:01:08 +02:00
Tomasz Kopczynski
cf2611f323 Reimplementing more builder integration tests as unit tests
Signed-off-by: Tomasz Kopczynski <tomek@kopczynski.net.pl>
2016-05-22 01:00:57 +02:00
Vincent Demeester
d5baf8ddcf Move some image related methods & struct to smaller files
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-05-21 22:36:11 +02:00
Yong Tang
55b1724018 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>
2016-05-21 13:19:05 -07:00
Subhajit Ghosh
ea98cf74aa 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>
2016-05-21 19:49:19 +01:00
John Howard
ef2db56bcf Windows: Default to Hyper-V Containers on client
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-05-21 11:29:53 -07:00
Vincent Demeester
4c7f0d268f 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>
2016-05-21 15:57:57 +02:00
Sebastiaan van Stijn
e3079b4704 Merge pull request #22876 from Microsoft/jjh/docsclarification
Docs: JSON vs Shell clarification
2016-05-21 11:52:49 +02:00
Vincent Demeester
7311d687e0 Merge pull request #22775 from Microsoft/jjh/removewindowsdiff
Windows: Remove windowsdiff graph driver
2016-05-21 08:02:20 +02:00
Vincent Demeester
4afc4edd74 Merge pull request #22863 from Saser/replace-unicode-single-quote
Replace occurrences of U+2018 and U+2019 with U+0027 in manpages
2016-05-21 07:42:26 +02:00