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

47845 Commits

Author SHA1 Message Date
Jeffrey Morgan
1a50516178 Bump compose version
Signed-off-by: Jeff Morgan <jmorgan@mba.local>
2015-12-04 09:31:56 -08:00
Jess Frazelle
e29f208547 Merge pull request #18404 from jfrazelle/cleanup-maintainers
cleanup people in maintainers file
2015-12-04 09:25:43 -08:00
Ying Li
52aa55076b Merge pull request #333 from jfrazelle/update-maintainers
update maintainers file for parsing
2015-12-04 09:24:35 -08:00
Phil Estes
23b771782a Fix init layer chown of existing dir ownership
This solves a bug where /etc may have pre-existing permissions from
build time, but init layer setup (reworked for user namespaces) was
assuming root ownership.  Adds a test as well to catch this situation in
the future.

Minor fix to wrong ordering of chown/close on files created during the
same initlayer setup.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-12-04 12:18:05 -05:00
Jean-Laurent de Morlhon
90aaae4ab4 Merge pull request #2495 from thaJeztah/update-maintainers
update maintainers file for parsing
2015-12-04 18:04:42 +01:00
Sebastiaan van Stijn
3d83d34e22 update maintainers file for parsing
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-04 17:59:15 +01:00
Sebastiaan van Stijn
704955ee78 update maintainers file for parsing
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-04 17:31:39 +01:00
Sebastiaan van Stijn
c27cc3ae7f update maintainers file for parsing
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-04 17:23:51 +01:00
Aanand Prasad
0a84833474 Merge pull request #2505 from thaJeztah/update-maintainers
update maintainers file for parsing
2015-12-04 16:16:09 +00:00
Sebastiaan van Stijn
7698da57ca update maintainers file for parsing
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-04 16:52:29 +01:00
André Martins
6eef5ab42d Fixed 80-docker.rules file permissions to 644
Signed-off-by: André Martins <aanm90@gmail.com>
2015-12-04 15:31:44 +00:00
Sebastiaan van Stijn
2360ffe0dd update maintainers file for parsing
this updates the MAINTAINERS file to the new format,
so that it can be parsed and collected in the docker/opensource
repository.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-04 16:27:15 +01:00
Sebastiaan van Stijn
5a9bf3a3d3 Merge pull request #18434 from haugene/master
docs: fix typo in bash_history mount example
2015-12-04 16:15:36 +01:00
Kristian Haugene
655766ed95 docs: fix typo in bash_history mount example
Signed-off-by: Kristian Haugene <kristian.haugene@capgemini.com>
2015-12-04 16:09:25 +01:00
Sebastiaan van Stijn
e3fbd6922f Merge pull request #18325 from RsrchBoy/topic/newtorks
newtork -> network (minor spelling correction)
2015-12-04 14:03:55 +01:00
Sebastiaan van Stijn
c60c0c4e9b docs: markdown and textual fixups in reference/run.md
This fixes markdown formatting, and formatting of tables;

 - Our markdown engine doesn't support spanning rows, so
   re-wrapped table contents.
 - Added a CSS-styles to prevent "code" blocks in tables
   from wrapping
 - The "logging drivers" table didn't have a header
 - Aligned table borders in source code for better readability.
 - Standardize on using `-it` in stead of -i -t or -ti
 - Some markup issues
 - Some minor textual fixups

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-04 13:46:22 +01:00
Sebastiaan van Stijn
cb6a1a6042 Merge pull request #14466 from Mashimiao/add-support-blkio_throtte_bps
Add support for blkio read/write bps device
2015-12-04 12:29:58 +01:00
Sylvain Baubeau
ef4ab7a885 Use bulk delete to remove segments in Swift driver
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com>
2015-12-04 12:16:49 +01:00
Sebastiaan van Stijn
605c56295f Merge pull request #18384 from Mashimiao/weight-device-docs-fix
docs: fix blkio-weight-device option args
2015-12-04 12:04:23 +01:00
Wen Cheng Ma
c424c8c32c Correct the message of ErrorCodeNoSuchContainer to "No such container"
Fixes issue #18424

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
2015-12-04 15:00:08 +08:00
Andrea Luzzardi
6aa6f76f3e Merge pull request #1463 from cpuguy83/1430_tls_closewrite
Ensure CloseWrite is called for hijacked TLS conns
2015-12-03 19:51:19 -08:00
Brian Goff
c57c8a329e Ensure CloseWrite is called for hijacked TLS conns
Golang's `*tls.Conn` does not support `CloseWrite`, this means that
connections using TLS will not be able to properly close on hijacked
connections.

This copies Go's tls.Dial and instead returns an internal
`tlsClientConn` type that does store the raw net.Conn and implements
`CloseWrite`.
Implementation is mostly copied from
`github.com/docker/docker/api/client/hijack.go`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-12-03 22:48:28 -05:00
Andrea Luzzardi
9386efdfb1 Merge pull request #1425 from jimmyxian/set-memory-wappiness-default-value
set MemorySwappiness default value
2015-12-03 19:36:06 -08:00
Alexander Morozov
7c1c96551d Merge pull request #18412 from aaronlehmann/runcommand-race
Fix race in RunCommandWithOutputForDuration
2015-12-03 19:35:04 -08:00
Jess Frazelle
a65502f751 Merge pull request #18413 from jfrazelle/update-go-version
update go version
2015-12-03 18:18:47 -08:00
Doug Davis
c80d03db77 Merge pull request #18409 from tonistiigi/fix-sha-prefix-inspect
Vendor distribution and fix inspect by sha256 prefix
2015-12-03 20:59:47 -05:00
Ying Li
e3cee0cdbd Refactor the client TestInitRepo test into reusable helper functions.
Also, eliminate the timestamp JSON constant and just generate a new
one for the tests.

The client test now also uses KeyFileStore and certs.Manager to
verify the keys and certs on disk, rather than directly manipulating
the files themselves.  This way, if the exact implementation of
KeyFileStore or certs.Manager changes, this test won't fail so long
as KeyFileStore and certs.Manager are self-consistent.

Signed-off-by: Ying Li <ying.li@docker.com>
2015-12-03 17:52:22 -08:00
Ma Shimiao
cc0e407e17 docs: fix weight-deivce option args
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-04 09:28:35 +08:00
Ma Shimiao
3f15a055e5 Add support for blkio read/write bps device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-04 09:26:03 +08:00
Xian Chaobo
63498b1a80 set MemorySwappiness default value
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com>
2015-12-04 09:25:32 +08:00
Xian Chaobo
0bd250bcf0 Merge pull request #1494 from dongluochen/clientUpdate
Godep update github.com/samalba/dockerclient
2015-12-04 09:15:27 +08:00
Daniel Nephin
8f48fa4747 Merge pull request #2491 from dnephin/bump-1.5.2
WIP: Bump 1.5.2
2015-12-03 17:11:51 -08:00
Jessica Frazelle
19e5c01230 remove parallel we no longer use it
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 17:04:01 -08:00
Jessica Frazelle
b7b707af2e update go version
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:37:13 -08:00
Alexander Morozov
4e6bea5964 Merge pull request #18411 from aaronlehmann/unit-test-timing
Adjust TestDockerCmdWithTimeout timeout to improve reliability
2015-12-03 16:34:36 -08:00
Aaron Lehmann
2704fd9156 Fix race in RunCommandWithOutputForDuration
This function was starting a goroutine that modifies one of its return
values. The intent is for the goroutine to only influence the return
value when it's causing the function to return, but it's racy and can
also modify the return value when the function is returning due to the
timeout. Fix the goroutine to not modify return values directly.

Also, give the channel a buffer so that the goroutine doesn't block
forever after a timeout.

Fixes #18305

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-03 16:34:01 -08:00
Jessica Frazelle
831af89991 add docs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:52 -08:00
Jessica Frazelle
ec6d3392f1 hacky workaround for dockerinit static binary needing libseccomp.a for debs and rpms
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:51 -08:00
Jessica Frazelle
cde9e8bc83 update packagers.md and kernel config check
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:50 -08:00
Jessica Frazelle
ae76f7e23e update bash completion for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:49 -08:00
Jessica Frazelle
ed5853de40 update hack/vendor.sh scripts and run vendor
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:48 -08:00
Jessica Frazelle
6707f4b9b6 inital seccomp support
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:30:44 -08:00
Jessica Frazelle
255004ef33 update debs/rpms for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:20:05 -08:00
Jessica Frazelle
d616a09763 dockerfile update for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-12-03 16:20:03 -08:00
Carol Fager-Higgins
bdf78fa771 added cs engine minor changes to upgrade doc
changed code from start to restart in upgrade doc
mentioned diff cs engine upgrade process in RNs

Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com>
2015-12-03 16:09:01 -08:00
Aaron Lehmann
13d768b8ee Adjust TestDockerCmdWithTimeout timeout to improve reliability
I saw a failure of TestDockerCmdWithTimeout. This test starts a command
that produces output after 10 ms, but uses a 5 ms timeout, so normally
the command will be killed before the output. The time intervals are so
small that the timeout may not reliably trigger before the output, which
can cause the test to fail.

This commit changes the test to only fail if the process is still alive
after 10 seconds. This means the test will confirm that the timeouts are
happening, but not attempt to gauge that the timeouts are happening
within milliseconds of when they are expected (which can't be done
reliably).

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-12-03 14:42:32 -08:00
Michael Crosby
2856a30482 Merge pull request #18402 from Microsoft/jjh/timeout
Windows CI Fix: Timeout change
2015-12-03 14:33:09 -08:00
David Lawrence
414aeb4c42 Merge pull request #329 from endophage/generalize_server_keys
Generalize server keys
2015-12-03 14:22:09 -08:00
Michael Crosby
168b490062 Merge pull request #18347 from tiborvass/container_package
Move Container to its own package (carry of 17969)
2015-12-03 14:10:16 -08:00
Tonis Tiigi
61d6240069 Add test for inspect with a sha256 prefix
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-12-03 14:06:30 -08:00