4f1c66a50e
Bump version to 1.8.0
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
(cherry picked from commit d9f7fd9493e42d34a4be640a8c24781b8d7b4726)
2015-07-24 20:28:37 -07:00
afb831d35e
Merge pull request #14979 from runcom/fix-flacky-TestRunNonRootUserResolvName
...
Fix TestRunNonRootUserResolvName flackiness
2015-07-24 21:50:44 -04:00
5bdd4d0ec4
Merge pull request #14966 from mrjana/vendor18
...
Vendoring libnetwork
2015-07-24 17:58:23 -07:00
30d4c70d28
Fix TestRunNonRootUserResolvName flackiness
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-25 02:45:17 +02:00
4f5b677fd9
Merge pull request #14546 from dmcgowan/trusted-notary-integration
...
Notary integration
2015-07-24 17:44:14 -07:00
542685d856
Merge pull request #14976 from calavera/revert_unconfined_aa_policy
...
Revert "Introduce a dedicated unconfined AA policy"
2015-07-24 17:31:28 -07:00
2ad81da856
Vendoring libnetwork
...
Vendoring libnetwork commit f1c5671f1ee2133055144e566cd8b3a0ae4f0433
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-07-24 17:11:47 -07:00
78906612a2
Merge pull request #14935 from stevvooe/registry-moratorium
...
Impose moratorium on remote registry access
2015-07-24 16:45:05 -07:00
935810bd20
Merge pull request #14977 from jfrazelle/fix-lxc
...
fix lxc
2015-07-24 16:43:46 -07:00
94ab0d312f
Revert "Introduce a dedicated unconfined AA policy"
...
This reverts commit 87376c3adddavid.calavera@gmail.com >
2015-07-24 16:35:51 -07:00
259cadb0b1
Rename to flags and environment variables to content trust
...
Update help line to allow 90 characters instead of 80
The trust flag pushes out the help description column wider, requiring more room to display help messages.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-24 16:31:18 -07:00
3e90b12d42
Added tests for expired snapshots and timestamps
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-24 16:31:18 -07:00
268fa5af47
Add tests simulating an evil server
...
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com >
2015-07-24 16:31:18 -07:00
871d2b96ed
Add build integration cli tests
...
Clean up tests to remove duplicate code
Add tests which run pull and create in an isolated configuration directory.
Add build test for untrusted tag
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-24 16:31:12 -07:00
0a5b8c40c0
ignore certain tests on lxc driver
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-24 16:10:59 -07:00
5ab4b60e11
Merge pull request #14969 from tianon/utopic-eol
...
Remove Ubuntu 14.10 (Utopic Unicorn) from build-deb targets
2015-07-24 15:48:34 -07:00
a38b544ef0
fix memory swappiness lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-24 15:46:51 -07:00
0547b5fb2a
#14474 skip DockerSuite.TestRunCapAddCHOWN on lxc
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
2015-07-24 15:16:07 -07:00
86c7ea4863
Merge pull request #14637 from metalivedev/patch-1
...
Document that load supports compressed tarballs.
2015-07-24 23:38:43 +02:00
d951ef128f
Merge pull request #14522 from carlossg/patch-1
...
Clarify filters option in list containers doc
2015-07-24 23:13:32 +02:00
eeb6d0a71b
Add test for incorrect nonroot passphrase
...
Fix failing tests for create, push, and pull
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-24 14:08:20 -07:00
1406cb35fd
Add trust tests for Docker create, run, push, and pull
...
Created date util function
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com >
2015-07-24 14:08:20 -07:00
356b07c896
Add more integration tests for trusted push and pull
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-07-24 14:08:20 -07:00
578b1521df
Add notary integration to docker build
...
The Dockerfile is rewritten with images references on FROM
instructions resolved to trusted digests. The rewritten Dockerfile
is swapped with the original one during context upload.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-24 14:08:20 -07:00
3021b7a4a0
Refactor api/client/build.go
...
Separated preparation of context and Dockerfile for
the various different methods of specifying them.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-24 14:08:20 -07:00
58a1de9b59
Add integration cli trust tests
...
Added notary server to docker base image.
Created trust suite which runs trust server for running trusted commands.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-24 14:08:20 -07:00
ed13c3abfb
Use notary library for trusted image fetch and signing
...
Add a trusted flag to force the cli to resolve a tag into a digest via the notary trust library and pull by digest.
On push the flag the trust flag will indicate the digest and size of a manifest should be signed and push to a notary server.
If a tag is given, the cli will resolve the tag into a digest and pull by digest.
After pulling, if a tag is given the cli makes a request to tag the image.
Use certificate directory for notary requests
Read certificates using same logic used by daemon for registry requests.
Catch JSON syntax errors from Notary client
When an uncaught error occurs in Notary it may show up in Docker as a JSON syntax error, causing a confusing error message to the user.
Provide a generic error when a JSON syntax error occurs.
Catch expiration errors and wrap in additional context.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-24 14:08:20 -07:00
2084eee02c
Merge pull request #14967 from Microsoft/10662-fixpaniconwindowsdaemon
...
Windows: Fixes panic on daemon binary
2015-07-24 16:48:37 -04:00
2b847df8c2
Merge pull request #14939 from rtrauntvein/docs-autobuild
...
Fix broken link in automated build doc
2015-07-24 13:48:14 -07:00
84e917b876
Merge pull request #14835 from aaronlehmann/registry-lint-cleanup
...
Improve documentation and golint compliance of registry package
2015-07-24 16:23:23 -04:00
a83e4e4a34
Remove Ubuntu 14.10 (Utopic Unicorn) from build-deb targets
...
As of July 23, 2015, it is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2015-July/000198.html ) and will receive no further updates.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-07-24 13:21:01 -07:00
b405e89d5c
Windows: Fixes panic on daemon binary
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-24 12:30:49 -07:00
4fcb9ac40c
Improve documentation and golint compliance of registry package
...
* Add godoc documentation where it was missing
* Change identifier names that don't match Go style, such as INDEX_NAME
* Rename RegistryInfo to PingResult, which more accurately describes
what this structure is for. It also has the benefit of making the name
not stutter if used outside the package.
Updates #14756
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-24 11:55:07 -07:00
44e327b29e
Merge pull request #14964 from tiborvass/fix-reexec
...
reexec: Use in-memory binary /proc/self/exe on linux instead of os.Args[0]
2015-07-24 11:51:56 -07:00
5aee8807a6
reexec: Use in-memory binary on linux instead of os.Args[0]
...
This keeps reexec working properly even if the on-disk binary was replaced.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-24 14:15:50 -04:00
e1dea0c485
Merge pull request #14920 from jfrazelle/release-script-updates-for-new-repo
...
warn the script is depreciated
2015-07-24 11:09:35 -07:00
ff271f5190
warn the script is depreciated
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-24 10:34:41 -07:00
3a07e7d115
Merge pull request #14958 from LK4D4/fix_valid
...
Fix option validation for log-drivers without it
2015-07-24 09:57:36 -07:00
4eee075f22
Merge pull request #14865 from calavera/update_init_scripts
...
Update init scripts to use `docker daemon`.
2015-07-24 09:47:03 -07:00
d68c55bc72
Fix option validation for log-drivers without it
...
There is no option validation for "journald" log-driver, so it makes no
sense to fail in that case.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-24 09:00:53 -07:00
f32295eda6
Merge pull request #14877 from calavera/deprecate_docker_d
...
Add -d to the deprecated feature list for 1.8.
2015-07-24 17:44:23 +02:00
9c0bb22571
Merge pull request #14925 from calavera/fix_volume_symlink_test
...
Remove reference to old Volumes field in inspect struct.
2015-07-24 10:41:00 -04:00
1fb29e6c3c
Clarify filters option in list containers and list images docs
...
Based on the list containers with filters options it would seem that filtering containers with label `test=docker-java` could be done with `{"test":["docker-java"]}` which doesn't work
The options that work are `{"label":["test"]}` and `{"label":["test=docker-java"]}`
As seen in https://github.com/docker-java/docker-java/pull/262
Signed-off-by: Carlos Sanchez <carlos@apache.org >
2015-07-24 11:57:18 +02:00
f5a4a8da15
Vendor notary
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-24 01:31:50 -07:00
48250832a3
Add cmdline docs for signing and verification flows
...
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com >
2015-07-24 01:31:50 -07:00
58bab11ee2
Merge pull request #14700 from charleswhchan/patch-2
...
Add benefit to using automated build.
2015-07-24 08:22:59 +02:00
8e66e627d7
Fix broken link in automated build doc
...
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com >
2015-07-23 23:12:06 -07:00
c9ff01ffc7
* Add benefit to using automated build.
...
* Wording based on suggestions by @thaJeztah, @moxiegirl in PR #14700 .
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-23 21:01:23 -07:00
7674f21686
Merge pull request #13771 from tiborvass/daemon-cli
...
New `docker daemon` command
2015-07-23 19:30:39 -07:00
24f7d0afc9
Impose moratorium on remote registry access
...
A moratorium has been added to the road map to add a moratorium on adding
remote registry access to commands that don't already do so.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-07-23 19:09:20 -07:00
163acd07e2
Merge pull request #14696 from rtrauntvein/patch-1
...
Fix link to examples documentation
2015-07-23 18:25:31 -07:00
d5e085572d
Merge pull request #14926 from dmcgowan/prune-tar-split
...
Fix pruning in vendor script
2015-07-23 17:43:17 -07:00
e246f1e4ee
Update docs to use the new docker daemon command
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-23 20:31:43 -04:00
e7fc632147
Add and modify tests for legacy and new daemon invokations
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-23 20:31:43 -04:00
4f62dec548
Add index.md to examples docs
...
Signed-off-by: Ryan Trauntvein <rtrauntvein@novacoast.com >
2015-07-23 17:24:44 -07:00
cd9dd55233
Merge pull request #14919 from tianon/empty-ps-headers
...
Fix "docker ps" with no containers regression
2015-07-23 16:52:43 -07:00
96ce3a194a
cli: new daemon command and new cli package
...
This patch creates a new cli package that allows to combine both client
and daemon commands (there is only one daemon command: docker daemon).
The `-d` and `--daemon` top-level flags are deprecated and a special
message is added to prompt the user to use `docker daemon`.
Providing top-level daemon-specific flags for client commands result
in an error message prompting the user to use `docker daemon`.
This patch does not break any old but correct usages.
This also makes `-d` and `--daemon` flags, as well as the `daemon`
command illegal in client-only binaries.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-23 19:44:46 -04:00
490e78a642
Merge pull request #14557 from maaquib/14418-dangling-link-in-runmd
...
Fixing dangling link in docs/reference/commandline/run.md
2015-07-23 16:29:17 -07:00
ae027c0864
Merge pull request #14589 from paetling/ae-update_net_docs
...
add to docs that ports do not get exposed when using --net
2015-07-23 16:22:21 -07:00
82685367d8
Keep license files
...
Currently the vendor script removes directories which do not have imported go packages, however this also ends up removing license files which may be other directories.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-23 16:12:21 -07:00
bb43bdf6c5
Remove reference to old Volumes field in inspect struct.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-23 16:10:31 -07:00
a8546df89d
Fix pruning on tar split
...
Currently the vendor script prunes files which are currently checked in.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-23 15:21:32 -07:00
c6f4c192fe
Merge pull request #14545 from Djelibeybi/oraclelinux6-rpm
...
Updated docker-engine.spec to build on Oracle Linux 6.
2015-07-23 13:29:48 -07:00
f57fc03e3b
Fix "docker ps" with no containers regression
...
The header row was not being printed when "docker ps" was invoked without containers thanks to the new format support, and we instead received a single blank line.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-07-23 13:23:24 -07:00
4af94efcf0
Merge pull request #14831 from duglin/VendorDist
...
Vendor latest distributions so we can use the new errcode stuff
2015-07-23 13:17:55 -07:00
f28877257b
Merge pull request #14034 from hqhq/hq_checkconfig_xattr
...
Some check_config enhancement
2015-07-23 13:01:59 -07:00
1e40915e9d
Merge pull request #14854 from rhvgoyal/unmount-base
...
docker: Unmount -init layer root before taking a snapshot
2015-07-23 15:17:07 -04:00
4e035031b0
Merge pull request #14900 from duglin/AddFilterToDoc
...
Add filter to /images/json docs
2015-07-23 11:57:12 -07:00
9dcd0cc1ee
Merge pull request #14887 from Microsoft/10662-stupidtypo
...
Windows: Stupid copy/paste error
2015-07-23 14:49:17 -04:00
b874ef8f43
Do Docker edits so we can use the new distribution code
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-23 10:24:46 -07:00
8b69552b50
Vendor latest distributions so we can use the new errcode stuff
...
ping @stevvooe @RichardScothern
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-23 10:24:46 -07:00
8c28363993
Merge pull request #13933 from ypid/mkimage-no-compression
...
Do not compress rootfs archive in mkimage.sh.
2015-07-23 10:22:07 -07:00
ac9fc03c74
Merge pull request #14855 from ewindisch/apparmor-unconfined
...
Introduce a dedicated unconfined AA policy
2015-07-23 10:21:51 -07:00
e5d8fb9658
Merge pull request #14903 from jfrazelle/fix-experimental-rpm-debs
...
pass DOCKER_EXPERIMENTAL into build images
2015-07-23 10:05:00 -07:00
2cf9fec111
Merge pull request #14901 from albers/completion-log-opt-fixes
...
Fixes to bash completion for log driver options
2015-07-23 10:03:29 -07:00
76d6751600
pass DOCKER_EXPERIMENTAL into build images
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-23 09:42:22 -07:00
9e438ffb61
Merge pull request #14891 from jgeiger/fix_typo_in_builder_docs_for_dockerignore
...
Fix typo in builder.mb .dockerignore example
2015-07-23 18:26:16 +02:00
d44e334a6e
Merge pull request #14893 from Evalle/14653-fix-sles-issue
...
Fixing SLES12 issue
2015-07-23 18:22:38 +02:00
c9937c3a80
Merge pull request #14905 from jfrazelle/fix-fedora-install
...
fix fedora release
2015-07-23 09:17:48 -07:00
8192a9ac6c
fix fedora release
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-23 09:16:35 -07:00
c2346f6406
Merge pull request #14898 from runcom/sockRequestRaw-close-body
...
Ensure body is closed after error is checked
2015-07-23 10:11:44 -04:00
18faf6f94e
Ensure body is closed after error is checked
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-23 14:34:38 +02:00
a20bf5e61c
Add filter to /images/json docs
...
Closes #14894
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-23 05:29:09 -07:00
de40f3997a
Complete all known driver options if no log driver was specified
...
Without this fix, `docker --log-opt ` would not complete anything
because the completions were driver specific.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-23 14:19:13 +02:00
6de8dd1a6e
Fix problem with = in completion of docker global options
...
Without this fix, `docker --log-driver fluentd --log-opt fluentd-tag=b`
would complete `b` to `build`.
Completion of the commands has to be nailed to __docker_pos_first_nonflag
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-23 13:52:06 +02:00
94119c58a1
Fixing SLES12 issue
...
Signed-off-by: evalle <shmarnev@gmail.com >
2015-07-23 08:59:23 +02:00
9086c16f42
Fix typo in builder.mb .dockerignore example
...
Signed-off-by: jgeiger <jgeiger@gmail.com >
2015-07-22 23:54:46 -06:00
d593130fda
Merge pull request #14880 from Microsoft/10662-paniconremotetest
...
Stop SIGSEGV on test dial not reachable
2015-07-22 23:21:12 -04:00
c5053d4700
Merge pull request #14886 from duglin/FixDepDoc
...
Fix typo in deprecation doc
2015-07-22 23:15:09 -04:00
7e4db0a370
Merge pull request #12850 from coolljt0725/add_ulimi_to_build
...
Add ulimit to docker build
2015-07-22 23:11:47 -04:00
cef5cb2dcb
Windows: Stupid copy/paste error
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-22 19:30:47 -07:00
877dbbbde8
Add ulimit to docker build.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-23 10:26:06 +08:00
ea3dcee913
Fix typos in deprecation doc
...
thanks @tiborvass
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-22 18:45:12 -07:00
09b86c46b8
Stop SIGSEGV on test dial not reachable
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-22 18:44:04 -07:00
48d057f8a9
Merge pull request #14884 from aaronlehmann/redundant-image-checks
...
Avoid redundant HEAD requests for identical layers on push
2015-07-22 18:28:39 -07:00
810d3b2642
Avoid redundant HEAD requests for identical layers on push
...
pushV2Tag already deduplicates layers, but the scope of this
deduplication is only for a particular tag. If we are pushing all tags
in a repository, we may check layers several times. Fix this by moving
the layersSeen map from the pushV2Tag function to the v2Pusher struct.
In addition to avoiding some useless round-trips, this makes the "docker
push" output less confusing. It formerly could contain many repeated
lines like:
124e2127157f: Image already exists
124e2127157f: Image already exists
...
Add test coverage based on the "docker push" output: a hash should not
appear multiple times when pushing multiple tags.
Fixes #14873
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-22 17:54:20 -07:00
5fdc102396
Merge pull request #14878 from icecrime/14756_golint_on_ci
...
Enable validate-lint as part of CI
2015-07-22 16:32:29 -07:00
a3857cc379
Merge pull request #14580 from rohitkadam19/patch-1
...
Update docker_remote_api_v1.17.md
2015-07-22 19:22:37 -04:00
f218192754
Merge pull request #14638 from jfrazelle/new-repo-install-script
...
update install script/docs for new apt and yum repos
2015-07-22 15:25:27 -07:00
bc8b8e03b4
Enable validate-lint as part of CI
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-07-22 15:23:34 -07:00
3198e76b77
Merge pull request #14862 from vdemeester/validate-lint-all-files
...
Update validate-lint to lint all go files
2015-07-22 15:18:02 -07:00
451d3f5950
update install script for new repos
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-22 15:08:19 -07:00
877d740d48
update docs for new install script
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-22 15:08:14 -07:00
9a1728a427
Add -d to the deprecated feature list for 1.8.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-22 15:05:23 -07:00
a628155a72
Merge pull request #13900 from duglin/Deprecate
...
Define Docker's deprecation policy
2015-07-22 23:23:37 +02:00
fa34f07ec0
Update validate-lint to lint all go files
...
By default, using go with package will only validate the go file for the
current platform (or at last misses file_windows.go for example). This
tries to fix that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-22 23:21:18 +02:00
f82ebe5932
Merge pull request #14839 from jfrazelle/better-io-error
...
better i/o timeout error on pull
2015-07-22 14:10:50 -07:00
27b828c9e4
Define Docker's deprecation policy
...
Announce the cmd line options that are targetted for removal
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-22 14:09:49 -07:00
4160d1af7d
Merge pull request #14528 from estesp/add-readme-links
...
Add links and correct locations in project/README.md
2015-07-22 23:05:32 +02:00
a7d8450312
Merge pull request #14864 from ewindisch/apparmor-engine-policy
...
Add AppArmor policy for the docker binary
2015-07-22 13:56:33 -07:00
80fec1dbaf
Merge pull request #14872 from jfrazelle/fix-debs-apparmour
...
update deb dockerfiles
2015-07-22 13:35:24 -07:00
9055eb0ce4
Add links and correct locations in project/README.md
...
After removing the duplicate ROADMAP in a separate PR, a few other
issues were noted in README.md which are fixed here:
- the directory is project, not hack
- make.sh is no longer in the current dir since hack/ is not project/
anymore
- MAINTAINERS is no longer here as a markdown file, but is a TOML file
in the root of the project
- links were added to all files to make it easier to follow from here
to the appropriate location
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-07-22 16:31:12 -04:00
3ee7297b7e
Merge pull request #14869 from calavera/remove_duplicated_cp_handlers_init
...
Remove duplicated code parsing parameters for the archiving handlers.
2015-07-22 13:25:34 -07:00
d106a2ea2a
Merge pull request #14613 from stefanberger/nohidevols2
...
Do not hide user provided network mounts [v2]
2015-07-22 16:24:22 -04:00
d3ba2457d9
Merge pull request #14769 from clintonskitson/add_plugindocs_rexray
...
updated plugin docs to include REX-Ray
2015-07-22 22:12:41 +02:00
933d9f2e0d
Merge pull request #14799 from coolljt0725/docs_fix_devicemapper_default_basesize
...
Docs: update the devicemapper default basesize from 10G to 100G
2015-07-22 22:07:38 +02:00
1fff0a5cc5
actually update deb dockerfiles
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-22 13:06:04 -07:00
53fb4d6fb6
Merge pull request #14871 from jfrazelle/change-leeroy-uri
...
move leeroy under docker
2015-07-22 13:03:22 -07:00
9bc502ecde
move leeroy under docker
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-22 12:57:13 -07:00
1639288b0a
Merge pull request #14067 from vbatts/vbatts-tar-split
...
graph: layer tar disassembly and reassembly
2015-07-22 12:53:26 -07:00
c328e0c827
Merge pull request #14628 from estesp/update-docker-py
...
Update docker-py commit to current master (~1.3.1 release)
2015-07-22 12:41:41 -07:00
1612ff9726
Remove duplicated code parsing parameters for the archiving handlers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-22 12:39:46 -07:00
1c6fe58efc
Merge pull request #14442 from cpuguy83/refactor_logdrvier_reader
...
Refactor log driver reader
2015-07-22 11:54:35 -07:00
19ba7f9e23
Merge pull request #14753 from flavio/zfs-initialization-errors
...
ZFS driver: raise better errors during init
2015-07-22 14:27:46 -04:00
346ce4f8d2
Update init scripts to use docker daemon.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-22 11:24:38 -07:00
39dae54a3f
Add AppArmor policy for the engine
...
Wraps the engine itself with an AppArmor policy.
This restricts what may be done by applications
we call out to, such as 'xz'.
Significantly, this policy also restricts the policies
to which a container may be spawned into. By default,
users will be able to transition to an unconfined
policy or any policy prefaced with 'docker-'.
Local operators may add new local policies prefaced
with 'docker-' without needing to modify this policy.
Operators choosing to disable privileged containers
will need to modify this policy to remove access
to change_policy to unconfined.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-22 14:20:50 -04:00
40b922418c
Merge pull request #14699 from estesp/docker-ps-format
...
Carry #10255 : Docker ps format
2015-07-22 10:58:34 -07:00
6bd389b9db
Do not hide user provided network mounts [v2]
...
Prevent the docker daemon from mounting the created network files over
those provided by the user via -v command line option. This would otherwise
hide the one provide by the user.
The benefit of this is that a user can provide these network files using the
-v command line option and place them in a size-limited filesystem.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com >
2015-07-22 13:44:21 -04:00
65fb04228e
Update docker-py to current master (~docker-py 1.3.1)
...
The docker-py commit used in the standard `Dockerfile` is from Feb. 2015
and is out of date with the current API level and has fixes for things
like the new docker cli config location and registry v2 changes/API
responses as well.
Also pass "NOT_ON_HOST=true" to docker-py test suite so that tests
relying on direct HOST interaction (versus running in a container) are
skipped.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-07-22 13:17:59 -04:00
fe68ac806b
Merge pull request #14858 from icecrime/14756_update_linted_packages
...
Update linted package list
2015-07-22 10:11:51 -07:00
542b58d8f7
ps --format: Add config.js doc, fix gofmt, add integration tests
...
Re-add the docs from @calavera's PR to the moved cli cmd reference docs.
Fix gofmt and vet issues from carried commits
Add integration test for using format with --no-trunc and multi-names
Fix custom_test map order dependency on expected value check
Add docs to reference/commandline/ps.md
Remove "-F" flag option from original carried PR content
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-07-22 12:51:16 -04:00
7d8859a4f5
Merge pull request #14217 from ankushagarwal/ubuntu-15.04
...
Add support for 15.04, add systemd note for 15.04
2015-07-22 08:56:02 -07:00
b7184f8574
Update linted package list
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-07-22 08:46:42 -07:00
22347fdb63
graph: isolate the (dis)assembly logic
...
with the current duplication of code in the grap.go split-up, this puts
all assembly/disassembly logic into isolated functions
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-07-22 11:36:15 -04:00
5a00326d29
graph: use tar archive entries for TarLayer
...
if there is a tar-data.json.gz present for an image layer, then use it
to create the tar archive, instead of the traditional graphdriver Diff.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Conflicts:
graph/graph.go
2015-07-22 11:36:15 -04:00
ba1f76cbfa
graph: variablize file names
...
and add a comment.. :-)
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Conflicts:
graph/graph.go
2015-07-22 11:36:15 -04:00
5d9f06599c
graph: preserve tar archive entries
...
Preserve the entries from the tar archive for layers added to the graph.
With these entries and relative filesystem path, the tar archives can be
reassembled later.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-07-22 11:36:15 -04:00
7fb061832a
vendor: adding tar-split dependency for graph
...
tar-split is a facility to disassemble and reassemble tar archives
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-07-22 11:36:10 -04:00
87376c3add
Introduce a dedicated unconfined AA policy
...
By using the 'unconfined' policy for privileged
containers, we have inherited the host's apparmor
policies, which really make no sense in the
context of the container's filesystem.
For instance, policies written against
the paths of binaries such as '/usr/sbin/tcpdump'
can be easily circumvented by moving the binary
within the container filesystem.
Fixes GH#5490
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-22 11:28:32 -04:00
875fffdff8
Merge pull request #14851 from bfirsh/golint-integration-cli
...
Golint integration-cli
2015-07-22 11:28:19 -04:00
a751c0a52f
Merge pull request #14790 from hqhq/hq_golint_build
...
Fix golint warnings for builder
2015-07-22 08:17:04 -07:00
fe26669205
docker: Unmount -init layer root before taking a snapshot
...
When we are creating a container, first we call into graph driver to take
snapshot of image and create root for container-init. Then we write some
files to it and call into graph driver again to create container root
from container-init as base.
Once we have written files to container-init root, we don't unmount it
before taking a snapshot of it. Looks like with XFS it leaves it in such
a state that when we mount the container root, it goes into log recovery
path.
Jul 22 10:24:54 vm2-f22 kernel: XFS (dm-6): Mounting V4 Filesystem
Jul 22 10:24:54 vm2-f22 kernel: XFS (dm-6): Starting recovery (logdev: internal)
Jul 22 10:24:54 vm2-f22 kernel: XFS (dm-6): Ending recovery (logdev: internal)
This should not be required. So let us unmount container-init before use
it as a base for container root and then XFS does not go into this
internal recovery path.
Somebody had raised this issue for ext4 sometime back and proposed the same
change. I had shot it down at that point of time. I think now time has
come for this change.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-07-22 10:32:53 -04:00
f0d0a52d80
Merge pull request #14817 from runcom/golint-pkg-mount
...
pkg: mount: golint
2015-07-22 09:23:26 -04:00
a10cb08bbb
Merge pull request #14802 from rhatdan/error
...
If a user hits this error it would be helpful to know tagstore name.
2015-07-22 06:17:38 -07:00
5328cc346f
Merge pull request #14850 from runcom/14846-fix-get-images-search-content-type
...
Fix wrong Content-Type returned by /images/search API
2015-07-22 06:16:16 -07:00
6b3c928140
Fix golint warnings for integration-cli
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-07-22 14:03:50 +01:00
4815fdc334
Merge branch 'master' of github.com:docker/docker into error
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-07-22 08:06:19 -04:00
1a5d6a94c9
Fix wrong Content-Type returned by /images/search API
...
/images/search was replying with Content-Type text/plain instead
of application/json.
Fix #14846
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-22 11:07:41 +02:00
0f5c9d301b
pkg: mount: golint
...
Fix the following warnings:
pkg/mount/mountinfo.go:5:6: type name will be used as mount.MountInfo by other packages, and that stutters; consider calling this Info
pkg/mount/mountinfo.go:7:2: struct field Id should be ID
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-22 10:26:10 +02:00
757c4f0d5c
Merge pull request #14821 from stevvooe/coding-style-guidelines
...
Adding Go coding style guidelines
2015-07-22 09:08:43 +02:00
50d2597e49
Merge pull request #13711 from calavera/version_volumes_inspect
...
Expose new mount points structs in inspect.
2015-07-22 09:02:00 +02:00
8c4a282a57
Fix golint warnings for builder
...
Addresses: #14756
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-22 13:29:03 +08:00
30b951ff08
Merge pull request #14842 from hqhq/hq_remove_rootuid
...
Remove unused parameter in NewTtyConsole
2015-07-21 21:37:21 -07:00
ff011ededb
Merge pull request #14804 from dave-tucker/golint_nat
...
golint: Fix issues in pkg/nat
2015-07-21 20:38:40 -07:00
06162fed8b
Merge pull request #14822 from runcom/host-config-links-on-start
...
Allow starting a container with an existing hostConfig which contains links
2015-07-21 20:06:26 -07:00
052b23e290
Merge pull request #14770 from albers/completion-log-opt
...
Bash completion for log drivers and their options
2015-07-21 19:58:12 -07:00
b6c5f6d075
Merge pull request #14794 from HuKeping/ci
...
CI: use dockerCmd in integration-cli when possible
2015-07-21 19:57:33 -07:00
012b67c3ea
CI: use dockerCmd in integration-cli when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-07-22 17:55:41 +08:00
162ae444af
Merge pull request #14677 from vincentbernat/fix/zsh-completion-update-4
...
zsh: update zsh completion for docker command
2015-07-21 19:56:03 -07:00
5dda570d50
Merge pull request #14688 from Microsoft/10662-hookupmac
...
Windows: Hook up user supplied MAC
2015-07-21 19:55:21 -07:00
7a06e85270
Merge pull request #14812 from LK4D4/fix_cgroup_parent_tests
...
Fix cgroup parent tests
2015-07-21 19:53:48 -07:00
dda1d66ac7
Merge pull request #14808 from cpuguy83/bump_md2man
...
Bump go-md2man to 1.0.3
2015-07-21 19:53:26 -07:00
af3059855c
Remove unused parameter in NewTtyConsole
...
It's introduced in
68ba5f0b69h.huangqiang@huawei.com >
2015-07-22 10:32:31 +08:00
ca3dae523b
better i/o timeout error on pull
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-21 19:08:15 -07:00
ca552a953e
added REX-Ray as volume plugin to plugin docs
...
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com >
2015-07-21 21:00:27 -05:00
d3b3ebc3a4
remove dead code after decoupling from jsonlog
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-07-21 20:47:35 -04:00
c0391bf554
Split reader interface from logger interface
...
Implement new reader interface on jsonfile.
Moves jsonlog decoding from daemon to jsonfile logger.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-07-21 20:47:31 -04:00
c986f85f73
Merge pull request #13171 from jlhawn/archive_copy
...
docker cp to and from containers
2015-07-21 16:59:44 -07:00
15d01d6e6c
golint: Fix issues in pkg/nat
...
Updates #14756
Signed-off-by: Dave Tucker <dt@docker.com >
2015-07-22 00:47:41 +01:00
879f440a99
Merge pull request #14833 from icecrime/14756_update_lint_script
...
Update validate-lint script
2015-07-21 19:28:19 -04:00
42533e323c
Merge pull request #14829 from RichardScothern/registry-tls
...
Configure TLS for private v2 registry mirrors.
2015-07-21 19:23:39 -04:00
36106a20ca
Merge pull request #14682 from duglin/Issue14621
...
Remove panic in nat package on invalid hostport
2015-07-21 15:48:51 -07:00
d52b2b98ba
Merge pull request #14830 from Microsoft/10662-removebadcomment
...
Windows: Remove erroneous comment only (no code change)
2015-07-22 00:39:58 +02:00
1c3cb2d31e
Expose new mount points structs in inspect.
...
Keep old hashes around for old api version calls.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-21 15:33:05 -07:00
e54b1e081a
docs: Updated for docker cp and its API changes
...
Documented changes to API to enable new `docker cp` behavior.
Added documentation on `docker cp` usage and behavior.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-21 15:30:20 -07:00
6b36a488e7
Remove v1 registry mirror configuration from LookupEndpoints.
...
V1 mirrors do not mirror the index and those endpoints should
only be indexes.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-07-21 15:21:41 -07:00
cb57b25689
Configure TLS for private registry mirrors.
...
If a registry mirror is using TLS, ensure that certs for it
are picked up from /etc/docker/certs.d
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-07-21 15:21:25 -07:00
418135e7ea
integration-cli: New docker cp integration tests
...
Adds several integration tests for `docker cp` behavior with over a dozen
tests for each of:
container -> local
local -> container
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-21 15:19:52 -07:00
93c3e6c91e
api/client: New and Improved docker cp behavior
...
Supports copying things INTO a container from a local file or from a tar
archive read from stdin.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-21 15:19:52 -07:00
db9cc91a9e
api/server: StatPath, ArchivePath, ExtractToDir
...
Adds http handlers for new API endpoints:
GET ContainersArchivePath
Return a Tar Archive of the contents at the specified location in a
container. Deprecates POST ContainersCopy. Use a HEAD request to stat
the resource.
PUT ContainersExtractToDir
Extract the Tar Archive from the request body to the directory at the
specified location inside a container.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-21 15:19:52 -07:00
7f02cc420a
Update validate-lint script
...
Add a set of newly linted packages, and fix the script.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-07-21 15:02:46 -07:00
0d17cba922
Merge pull request #14820 from aaronlehmann/registry-dead-code
...
Remove dead code in registry package
2015-07-21 17:45:49 -04:00
bd30d27636
Windows: Remove erroneous comment
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-21 14:25:08 -07:00
d57ea8da25
Adding Go coding style guidelines
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-07-21 13:47:02 -07:00
c88ce893a5
Merge pull request #14805 from dave-tucker/golint_namesgen
...
golint: Lint pkg/namesgenerator
2015-07-21 13:45:31 -07:00
65121e5fce
Allow starting a container with an existing hostConfig which contains links
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-21 22:10:00 +02:00
9e76e184e4
Remove unused types in registry package
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-21 11:53:57 -07:00
962dc622d9
Remove dead code in registry package
...
The only uses of RequestAuthorization and its associated functions were
removed in 19515a7ad8aaron.lehmann@docker.com >
2015-07-21 11:45:53 -07:00
c32dde5baa
daemon: container ArchivePath and ExtractToDir
...
The following methods will deprecate the Copy method and introduce
two new, well-behaved methods for creating a tar archive of a resource
in a container and for extracting a tar archive into a directory in a
container.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-21 11:20:10 -07:00
a74799b701
pkg/archive: new utilities for copying resources
...
Adds TarResource and CopyTo functions to be used for creating
archives for use with the new `docker cp` behavior.
Adds multiple test cases for the CopyFrom and CopyTo
functions in the pkg/archive package.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-21 11:03:25 -07:00
3ee15acaad
Merge pull request #14659 from calavera/promote_volumes_experimental_to_master
...
Promote volume drivers from experimental to master.
2015-07-21 10:39:17 -07:00
d796bb9151
Merge pull request #14815 from LK4D4/remove_tty_terminal
...
Remove unused TtyTerminal interface
2015-07-21 19:36:43 +02:00
943bf44686
Merge pull request #13617 from Microsoft/10662-sql
...
Windows: Statically linkable SQLite3
2015-07-21 10:12:40 -07:00
6ae377ffa0
Remove unused TtyTerminal interface
...
It was used only by integration tests, which now gone.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-21 09:56:28 -07:00
e4f1cf787c
Merge pull request #14780 from icecrime/14756_add_golint
...
Add golint to the development toolbox
2015-07-21 09:50:58 -07:00
10bcaca914
Windows: Statically linkable SQLite3
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-21 09:33:46 -07:00
c4d45b6a29
Promote volume drivers from experimental to master.
...
Remove volume stubs and use the experimental path as the only path.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-21 09:32:44 -07:00
06b922c63f
Merge pull request #14801 from HuKeping/golint
...
golint: use golint to check package util
2015-07-21 18:09:39 +02:00
17ce34116a
golint: use golint to check package util
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-07-22 05:34:13 +08:00
6cce8d1838
Add golint to the development toolbox
...
Add golint to the Dockerfile, and a `validate-lint` task to the
Makefile. Currently, the linter will process a harcoded list of packages
that will expand as we fix more warnings. Eventually, the linter should
process all subpackages of the repo (excluding vendored code).
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-07-21 09:00:36 -07:00
844fc5f77c
Fix cgroup parent tests
...
After merging mounting cgroups in container this tests doing wrong
checks. Cgroup paths could be prepended by other cgroups from host.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-21 08:59:17 -07:00
6c95040e3b
Merge pull request #14765 from runcom/fix-dockerCmd-refactor
...
Refactor missed dockerCmd changes
2015-07-21 11:53:28 -04:00
380959dd68
Merge pull request #14609 from ewindisch/apparmor-policy
...
Move AppArmor policy to contrib & deb packaging
2015-07-21 08:48:02 -07:00
9818d8fa22
Merge pull request #14796 from WeiZhang555/golint-network
...
golint on daemon/network package
2015-07-21 17:37:40 +02:00
c5667bc569
golint: Lint pkg/namesgenerator
...
Also addded a couple more tests
Updates #14756
Signed-off-by: Dave Tucker <dt@docker.com >
2015-07-21 16:33:34 +01:00
80d99236c1
Move AppArmor policy to contrib & deb packaging
...
The automatic installation of AppArmor policies prevents the
management of custom, site-specific apparmor policies for the
default container profile. Furthermore, this change will allow
a future policy for the engine itself to be written without demanding
the engine be able to arbitrarily create and manage AppArmor policies.
- Add deb package suggests for apparmor.
- Ubuntu postinst use aa-status & fix policy path
- Add the policies to the debian packages.
- Add apparmor tests for writing proc files
Additional restrictions against modifying files in proc
are enforced by AppArmor. Ensure that AppArmor is preventing
access to these files, not simply Docker's configuration of proc.
- Remove /proc/k?mem from AA policy
The path to mem and kmem are in /dev, not /proc
and cannot be restricted successfully through AppArmor.
The device cgroup will need to be sufficient here.
- Load contrib/apparmor during integration tests
Note that this is somewhat dirty because we
cannot restore the host to its original configuration.
However, it should be noted that prior to this patch
series, the Docker daemon itself was loading apparmor
policy from within the tests, so this is no dirtier or
uglier than the status-quo.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-21 11:05:53 -04:00
7be8336fb5
golint on daemon/network package
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-07-21 22:49:49 +08:00
1ca737875d
Merge pull request #14725 from charleswhchan/issue-14433
...
Issue #14433
2015-07-21 07:48:54 -07:00
dd7d4d1101
Bump go-md2man to 1.0.3
...
Fixes an issue with curly braces being escaped when they should not be.
This was particularly an issue in places where `--format '{{ ... }}'`
is used in the man docs.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-07-21 10:42:02 -04:00
a7d61882c0
Merge pull request #14778 from thaJeztah/remove-rhel6-rpm-from-generate
...
Remove reference to CENTOS6 from generate script
2015-07-21 07:27:29 -07:00
739f7b1da6
Merge pull request #14731 from Evalle/14729-Fix-ubuntu-doc-issue
...
Fixing ubuntu doc issue
2015-07-21 15:51:11 +02:00
5a29f0ac88
Merge pull request #14798 from coolljt0725/minor_fix_TestLogsStderrInStdout
...
Minor fix of TestLogsStderrInStdout
2015-07-21 09:33:34 -04:00
96a4469835
If a user hits this error it would be helpful to know tagstore name.
...
There are several bug reports on this error happening, and error is
not helpful unless you read the code. Google brings up removing
the repositories.btrfs file.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-07-21 09:26:27 -04:00
36cc6a985b
Docs: update the devicemapper default basesize from 10G to 100G
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-21 20:46:31 +08:00
2e7daffd7b
Minor fix of TestLogsStderrInStdout
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-21 20:37:14 +08:00
1e9394103c
Merge pull request #14727 from vdemeester/opts-docs-updates
...
Update documentation according to opts updates (#13694 )
2015-07-21 14:19:29 +02:00
dc8b765930
Update documentation according to opts updates
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-21 14:08:19 +02:00
197c9010bc
Merge pull request #14766 from runcom/remove-ref-from-libcontainer
...
Remove reference to docker/libcontainer
2015-07-21 12:49:36 +02:00
f0473eaf01
Merge pull request #14744 from gesellix/add-gradle-docker-remote-api-plugin
...
Add gradle docker remote api plugin
2015-07-21 08:34:08 +02:00
d5aeb3398b
Second level completions for --log-opt
...
Advanced completion for some log driver options:
gelf-address, syslog-address, syslog-facility.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-21 08:25:14 +02:00
2eda00c861
Merge pull request #14757 from rhatdan/man
...
Fix man pages
2015-07-21 16:08:02 +10:00
d241d2f36c
vendor fsnotify
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-07-20 22:47:03 -04:00
37209190c7
Docker ps custom formatting.
...
Docker-DCO-1.1-Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-20 22:46:55 -04:00
de0e883331
docker ps: add fields for ordering and column selection
...
* api/client/ps.go: Refactor CmdPs to use a fields list of
characters to determine which columns to print on `docker ps`
invocation.
This adds an ability for the docker command to print the columns of
output in arbitrary order.
Signed-off-by: Jeff Mickey <j@codemac.net >
Docker-DCO-1.1-Signed-off-by: Jeff Mickey <j@codemac.net >
2015-07-20 22:45:21 -04:00
efd56bbe6f
Merge pull request #14779 from duglin/BetterErrMsg14774
...
Add better output for TestLinksEtcHostsContentMatch to help debug #14774
2015-07-20 20:40:06 -04:00
4d0990a753
Merge pull request #14762 from LK4D4/lint_reexec
...
Add docstring to reexec.Command
2015-07-20 20:37:27 -04:00
4c0fb85729
Merge pull request #14776 from MHBauer/cliconfig-lint
...
golint fixes for cliconfig
2015-07-21 02:22:09 +02:00
09a3b57f94
Merge pull request #14775 from runcom/move-nat-tests
...
move nat tests from container's unit test to nat's ones
2015-07-20 20:06:34 -04:00
9738b9319b
Add docstring to reexec.Command
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-20 17:00:18 -07:00
dea49b7474
golint for cliconfig
...
- fully capitalize HTTP in HTTPHeaders
- comment for CONFIGFILE
- camelcase and privatize oldConfigfile, defaultIndexserver
- remove unused var errConfigFileMissing
- comments for methods and functions throughout
- external references to renamed variables changed
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-07-20 16:48:58 -07:00
6751a49d14
Add better output for TestLinksEtcHostsContentMatch to help debug #14774
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-20 16:46:51 -07:00
18ca5d7c0e
Remove reference to CENTOS6 from generate script
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-07-21 01:21:33 +02:00
37d737fc2c
Merge pull request #14691 from Microsoft/10662-start
...
Windows: hostconfig on start
2015-07-21 00:52:19 +02:00
f2aff58483
move nat tests from container's unit test to nat's ones
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-21 00:29:24 +02:00
cc7fe0d2d9
Merge pull request #14771 from Microsoft/10662-image2image
...
Fixing Image struct to no longer use Graph.
2015-07-20 15:25:06 -07:00
8b7923620a
Merge pull request #14768 from fredlf/style-guide-edits
...
Small edits and clean up
2015-07-21 00:23:56 +02:00
9001ea26e7
Fixing Image struct to no longer use Graph.
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-20 13:59:53 -07:00
bd8386c127
Merge pull request #14764 from sevki/14756-lint
...
golint fix TLs->TLS in docker/
2015-07-20 13:19:42 -07:00
38acec94c4
Completion: Add support for '=' in arguments to __docker_pos_first_nonflag
...
This solves several problems that arise from the special treatment of
"=" in Bash.
The fix was required as some log drivers have options in a key=value
form. It also addresses the --option=value and the negated boolean syntax
(--boolean=false).
Note that this is not a general fix for these problems, it is limited to
the __docker_pos_first_nonflag function.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-20 21:22:56 +02:00
6609cfb5e7
Small edits and clean up
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com >
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com > (github: fredlf)
2015-07-20 11:59:48 -07:00
bd328da555
Refactor missed dockerCmd changes
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-20 20:55:57 +02:00
691e3a3e70
Remove reference to docker/libcontainer
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-20 20:30:22 +02:00
faa8b658e7
Driver-specific completions for --log-opt
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-20 20:24:01 +02:00
ce3156f1eb
fix mixed typo TlS -> TLS
...
Signed-off-by: Sevki Hasirci <s@sevki.org >
2015-07-20 21:14:45 +03:00
e09d0febe6
Add missing log drivers to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-20 20:13:59 +02:00
16ea3cf3a3
golint fix TLs->TLS in docker/
...
Signed-off-by: Sevki Hasirci <s@sevki.org >
2015-07-20 20:50:03 +03:00
46cbfcb168
Merge pull request #14746 from jfrazelle/remove-rhel-centos-6-rpm
...
remove centos/rhel 6 from rpm builder
2015-07-20 10:44:18 -07:00
fc2f90fc63
Merge pull request #14741 from HuKeping/ci-refactor
...
CI: use dockercmd when possible
2015-07-20 09:49:40 -07:00
27ac154d05
CI: use dockercmd when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-07-21 04:40:15 +08:00
ee7af0d2cb
Merge pull request #14671 from hqhq/hq_use_dockerCmd
...
Use dockerCmd when possible
2015-07-20 09:44:42 -07:00
732141442a
Fix man pages
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-07-20 11:47:59 -04:00
77bbee3d00
Merge pull request #14716 from LK4D4/update_libcontainer
...
Update libcontainer to v0.0.2
2015-07-20 11:33:19 -04:00
c6a3517246
Merge pull request #14724 from coolljt0725/14603-dockerCmd-integration-cli-3
...
Refactor: use dockerCmd when possible in integraiton-cli tests
2015-07-20 16:00:38 +02:00
f95b3a6b6a
ZFS driver: raise better errors during init
...
The ZFS driver should raise proper errors when the ZFS utility is
missing or when there's no zfs partition active on the system. Raising the
proper errors make possible to silently ignore the ZFS storage
driver when no default storage driver is specified.
Previous to this commit it was no longer possible to start the
docker daemon in that way:
docker -d --storage-opt dm.loopdatasize=2GB
The above command resulted in an exit error because the ZFS driver
tried to use the storage options.
Signed-off-by: Flavio Castelli <fcastelli@suse.com >
2015-07-20 15:24:48 +02:00
3a1596f0f5
zsh: update zsh completion for docker command
...
zsh completion is updated with the content of
felixr/docker-zsh-completion.
- felixr/docker-zsh-completion@a93e1cb7bd Fix completion of repositories with tags
- felixr/docker-zsh-completion@590ea70596 Respect provided `--host` flag when invoking docker
- felixr/docker-zsh-completion@6c557babaa Several cosmetic improvements
- felixr/docker-zsh-completion@5b63cc591a Update completion for `inspect`
- felixr/docker-zsh-completion@b7d8f2f7cc Order completions alphabetically
- felixr/docker-zsh-completion@63f6a06224 Factor completion for `build`, `create` and `run`
- felixr/docker-zsh-completion@ade49ee47f Enforce positional arguments being last
- felixr/docker-zsh-completion@850b6b6d95 Update completion for build/commit/export/exec/history/import
- felixr/docker-zsh-completion@01bfd8c075 Remove completion for `insert` and duplicate of `import`
- felixr/docker-zsh-completion@c64a1d730a Update completion for `stats` to add `--no-stream` flag
- felixr/docker-zsh-completion@5e81d78b52 Update completion for `log` to add `--since` flag
- felixr/docker-zsh-completion@b3c146a1a2 Update completion for `run` to add `--group-add` flag
- felixr/docker-zsh-completion@8d4f196ad8 Don't trigger expensive completion function for flags
- felixr/docker-zsh-completion@bd5aaa124d Add completion for `--help` everywhere
- felixr/docker-zsh-completion@3a67a0e8c4 Return appropriate status code on completion
- felixr/docker-zsh-completion@4dfcb450ea Add Steve as a regular contributor.
- felixr/docker-zsh-completion@996a1c6def Add completion for top-level flags
- felixr/docker-zsh-completion@b6df75905f Ensure short/long option are not allowed twice
- felixr/docker-zsh-completion@75b6a500a0 Complete repositories with tags only on repository match
- felixr/docker-zsh-completion@5e6292135f Factorize completion of images/repositories/tags
- felixr/docker-zsh-completion@1c504eb677 Handle repositories with ":"
- felixr/docker-zsh-completion@0a05bf818b Update completion for `pause' and `unpause'
- felixr/docker-zsh-completion@b3a63253e2 Containers name can include Swarm host
In summary:
- Swarm support
- Handling repositories with ":"
- Rework how completion of images/repositories/tags work:
- felixr/docker-zsh-completion@5e6292135f
- felixr/docker-zsh-completion@75b6a500a0
- felixr/docker-zsh-completion@a93e1cb7bd
The remaining changes are here to sync changes done in Docker repository
(mostly from PR #14074 and #14555 , by @sdurrheimer). With some minor changes:
- boolean flags don't complete their arguments (true/false)
- reuse of `--host` argument is done with `$opt_arg` to avoid parsing
error
- build/create/run common options are factorized out
- `--help` flag is handled differently
- `pause` and `unpause` accepts several containers as far as I know, so
the change is reverted
- some more, but difficult to notice (more completion for some flags I think)
Some labels are reverted, mostly because I did the merge by copy/pasting
new options instead of modifying existing options.
This commit is partial. The way the `--help` option is handled triggered
a major change due to the way things are quoted. Those changes were
partially and programmaticaly reverted in this commit only to minimize
the changes to review. The next commit will restore the full changes.
Signed-off-by: Vincent Bernat <vincent@bernat.im >
2015-07-20 14:25:48 +02:00
46d7762f26
Merge pull request #14614 from hqhq/hq_simplify_swappiness
...
Simplify swappiness check
2015-07-20 13:51:39 +02:00
6f8ddec1d0
Simplify swappiness check
...
As suggested in https://github.com/docker/docker/pull/14004/files#r34022527
The concern there is we can't differentiate whether user explicitly
asked for an invalid value of -1 or he did not specify anything.
I don't think this would be a problem, because:
- like all other default values like zero, we can't differentiate
user specify it or not, most of which, zeros are also invalid, so
default is default, we show these default values in help info,
so users would know if they set value as default, it'll be like
they set nothing.
- we can't do this kind of string check in REST api request, so
it'll make the behave different from docker command and RESTapi.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-20 16:10:10 +08:00
668e2369cc
dockerCmd when possible
...
Addresses: #14603
integration-cli/docker_cli_daemon_experimental_test.go (hqhq)
integration-cli/docker_cli_daemon_test.go (hqhq)
integration-cli/docker_cli_diff_test.go (hqhq)
integration-cli/docker_cli_events_test.go (hqhq)
integration-cli/docker_cli_events_unix_test.go (hqhq)
integration-cli/docker_cli_exec_test.go (hqhq)
integration-cli/docker_cli_exec_unix_test.go (hqhq)
integration-cli/docker_cli_experimental_test.go (hqhq)
integration-cli/docker_cli_export_import_test.go (hqhq)
integration-cli/docker_cli_help_test.go (hqhq)
integration-cli/docker_cli_history_test.go (hqhq)
integration-cli/docker_cli_images_test.go (hqhq)
integration-cli/docker_cli_import_test.go (hqhq)
integration-cli/docker_cli_info_test.go (hqhq)
integration-cli/docker_cli_inspect_test.go (hqhq)
integration-cli/docker_cli_kill_test.go (hqhq)
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-20 14:55:40 +08:00
eef6eda7d2
Recfactor: Use dockerCmd when possible in integration-cli tests
...
Part of #14603
integration-cli/docker_cli_links_test.go (coolljt0725)
integration-cli/docker_cli_links_unix_test.go (coolljt0725)
integration-cli/docker_cli_logs_test.go (coolljt0725)
integration-cli/docker_cli_nat_test.go (coolljt0725)
integration-cli/docker_cli_network_test.go (coolljt0725)
integration-cli/docker_cli_stats_test.go (coolljt0725)
integration-cli/docker_cli_tag_test.go (coolljt0725)
integration-cli/docker_cli_top_test.go (coolljt0725)
integration-cli/docker_cli_version_test.go (coolljt0725)
integration-cli/docker_cli_wait_test.go (coolljt0725
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-20 14:44:22 +08:00
008d57bf7f
Merge pull request #14747 from moxiegirl/update-docs-dockerfile
...
Updating to use the new base
2015-07-20 12:00:02 +10:00
9847c0c8b0
Add support for 15.04, add systemd note for 15.04
...
Fixes #12002
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-19 18:33:55 -07:00
e0bceb7064
Updating to use the new base
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-19 15:39:43 -07:00
af5fb9b7d0
remove centos6 from rpm builder
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-19 14:30:48 -07:00
ccc78c9968
Merge pull request #14715 from icecrime/14365_remove_rhel6_from_docs
...
Update RHEL/Centos/Fedora installation docs
2015-07-19 13:00:50 -07:00
a51684ff8f
add gradle-docker-plugin, update docker-client url
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
2015-07-19 21:28:11 +02:00
38e7069668
remove unused row-even and row-odd css classes
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
2015-07-19 21:27:12 +02:00
08d5424c04
Issue #14433
...
Try to improve the cache behavior for `ADD` and `COPY` commands.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-19 12:19:28 -07:00
32764fe3b9
Merge pull request #14676 from duglin/Issue14675
...
Add missing 'Names' field to /containers/json API output
2015-07-19 06:53:25 -07:00
120c21c97c
Fixing ubuntu doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com >
2015-07-18 18:24:45 +02:00
a89370039a
Merge pull request #14667 from charleswhchan/patch-5
...
Trim excess from image. Based on the context, the email itself is sufficient.
2015-07-18 11:14:28 +02:00
c6cde91b7d
Add dockerCmdWithStdoutStderr function
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-18 10:48:28 +08:00
a0a0b8499e
Merge pull request #14722 from duglin/FixInspectExecIDTest
...
Move inspect into the loop on InspectExecID test
2015-07-17 18:21:49 -07:00
f06620ece3
Move inspect into the loop on InspectExecID test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-17 17:30:24 -07:00
7f353a11e4
Merge pull request #13681 from tiborvass/carry-11784
...
Carry 11784: rmi dangling is unsafe when pulling
2015-07-17 16:17:18 -07:00
f0f261a899
Update libcontainer to v0.0.2
...
This is fix for proper setup of nested containers cgroups.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-17 15:05:17 -07:00
465192cb28
Merge pull request #14706 from duglin/FixInspectTest
...
Fix InspectExecID test
2015-07-17 14:37:23 -07:00
340bd135dd
Update RHEL/Centos/Fedora installation docs
...
Remove mentions of older systems.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-07-17 14:04:19 -07:00
415f744d0c
Merge pull request #11485 from wlan0/rollover_log
...
Add rollover log driver, and --log-driver-opts flag
2015-07-17 22:41:26 +02:00
a192105d3b
Merge pull request #14413 from vbatts/vbatts-graph-cleanup
...
graph: comment clarification about shadowed `err`
2015-07-17 13:39:27 -07:00
12b6083c8f
Remove panic in nat package on invalid hostport
...
Closes #14621
This one grew to be much more than I expected so here's the story... :-)
- when a bad port string (e.g. xxx80) is passed into container.create()
via the API it wasn't being checked until we tried to start the container.
- While starting the container we trid to parse 'xxx80' in nat.Int()
and would panic on the strconv.ParseUint(). We should (almost) never panic.
- In trying to remove the panic I decided to make it so that we, instead,
checked the string during the NewPort() constructor. This means that
I had to change all casts from 'string' to 'Port' to use NewPort() instead.
Which is a good thing anyway, people shouldn't assume they know the
internal format of types like that, in general.
- This meant I had to go and add error checks on all calls to NewPort().
To avoid changing the testcases too much I create newPortNoError() **JUST**
for the testcase uses where we know the port string is ok.
- After all of that I then went back and added a check during container.create()
to check the port string so we'll report the error as soon as we get the
data.
- If, somehow, the bad string does get into the metadata we will generate
an error during container.start() but I can't test for that because
the container.create() catches it now. But I did add a testcase for that.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-17 13:02:54 -07:00
98ed9a55f4
Merge pull request #14693 from LK4D4/update_libcontainer
...
Update libcontainer
2015-07-17 13:02:04 -07:00
25d9f38852
Merge pull request #13680 from jfrazelle/new-apt-yum-repos
...
WIP: new apt yum repos for release scripts
2015-07-17 12:29:21 -07:00
a763637eae
Merge pull request #13951 from calavera/plugins_path
...
Separate plugin sockets and specs.
2015-07-17 21:11:31 +02:00
e939a30039
Merge pull request #14709 from rhvgoyal/base-size-100G
...
devicemapper: Change default basesize to 100G
2015-07-17 12:41:28 -04:00
fb34537a99
Merge pull request #14685 from Microsoft/10662-revendorhcsshim
...
Windows: Revendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
2015-07-17 12:31:58 -04:00
97be366961
Merge pull request #14708 from icecrime/14445_remove_workflow_from_maintainers
...
Remove reviewing process from MAINTAINERS
2015-07-17 09:03:53 -07:00
1b67c38f6f
fix 8926: rmi dangling is unsafe when pulling
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-17 11:39:57 -04:00
ff05f9c285
Merge pull request #14445 from icecrime/reviewing_process_and_labels
...
Document and adjust reviewing process and labels
2015-07-17 08:25:41 -07:00
7b83b0e15c
Merge pull request #14605 from brahmaroutu/gccgo_scheduler
...
Go Scheduler issue with sync.Mutex
2015-07-17 08:16:32 -07:00
424d5e55a2
devicemapper: Change default basesize to 100G
...
Current default basesize is 10G. Change it to 100G. Reason being that for
some people 10G is turning out to be too small and we don't have capabilities
to grow it dyamically.
This is just overcommitting and no real space is allocated till container
actually writes data. And this is no different then fs based graphdrivers
where virtual size of a container root is unlimited.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-07-17 11:10:23 -04:00
b900aaac46
Merge pull request #14701 from charleswhchan/patch-6
...
Add missing space
2015-07-17 10:42:48 -04:00
a40e337882
graph: clarify the need for named error
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-07-17 10:01:52 -04:00
c5c98c31a1
Fix InspectExecID test
...
The check for the end of the loop was off by one which is why we saw
errors on the following inpsect() call instead of a timeout
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-17 06:46:37 -07:00
ceca4109fa
Add missing space
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-16 22:49:46 -07:00
ac3f7c71b8
Merge pull request #14698 from duglin/AddErr
...
Add missing 'err' to Fatalf to help debug an issue
2015-07-16 21:42:42 -07:00
97c5f64001
Add missing 'err' to Fatalf to help debug an issue
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-16 20:27:14 -07:00
9ca913d0f1
Go Scheduler issue with sync.Mutex using gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-17 01:33:58 +00:00
15cb7dfc9e
Merge pull request #14578 from mountkin/fix-rmi-image-not-found
...
don't allow deleting the image of running containers
2015-07-16 18:02:51 -07:00
c86189d554
Update libcontainer
...
Replaced github.com/docker/libcontainer with
github.com/opencontainers/runc/libcontaier.
Also I moved AppArmor profile generation to docker.
Main idea of this update is to fix mounting cgroups inside containers.
After updating docker on CI we can even remove dind.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-16 16:02:26 -07:00
8801906ced
Merge pull request #14620 from hqhq/hq_cgroup_ro_optional
...
Remove cgroup read-only flag when privileged
2015-07-16 16:00:02 -07:00
39ad38ccf9
Windows: hostconfig on start
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-16 15:33:13 -07:00
5d3043649a
Merge pull request #14690 from LK4D4/update_libnetwork
...
Update libnetwork
2015-07-16 15:13:24 -07:00
6c0795747b
Separate plugin sockets and specs.
...
Check if there is a plugin socket first under `/run/docker/plugins/NAME.sock`.
If there is no socket for a plugin, check `/etc/docker/plugins/NAME.spec` and
`/usr/lib/docker/plugins/NAME.spec` for spec files.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-16 14:20:07 -07:00
b84ceb3d0a
Update github.com/docker/libnetwork to 2a5cb84758b5115d99d8f82c84845417c6c345a3
...
This update includes removal of libcontainer dependency.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-16 13:58:38 -07:00
a207ce6ae4
Windows: Hook up user supplied MAC
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-16 13:20:14 -07:00
212525f951
Merge pull request #14664 from calavera/fix_load_tag_with_digest
...
Check if a tag name to load is a valid digest.
2015-07-16 12:46:05 -07:00
83ad0536c1
Windows: Vendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-07-16 12:07:20 -07:00
5365e6b463
Merge pull request #13375 from tiborvass/distribution-refactor
...
Vendor distribution client v2
2015-07-16 11:54:08 -07:00
1ec25653d8
Check if a tag name to load is a valid digest.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-16 10:53:56 -07:00
19515a7ad8
Update graph to use vendored distribution client for the v2 codepath
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-16 13:13:47 -04:00
276c640be4
remove pkg/transport and use the one from distribution
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-16 13:13:46 -04:00
745820fec0
Vendor docker distribution registry client and dependencies
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-16 13:13:46 -04:00
48a01a317c
Merge pull request #14679 from tiborvass/fix-docker-py-search-test
...
Fix issue where Search API endpoint would panic due to empty AuthConfig
2015-07-16 13:12:31 -04:00
b32c4cb459
Fix issue where Search API endpoint would panic due to empty AuthConfig
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-16 12:38:44 -04:00
8c77e39627
Merge pull request #14571 from charleswhchan/patch-2
...
Documentation: Split apt-get example onto multiple lines
2015-07-16 18:32:56 +02:00
ac8299ae15
Merge pull request #14623 from HuKeping/refactor-dockercmd
...
Refactor : Use dockerCmd in integration-cli tests
2015-07-16 09:24:59 -07:00
71868228c7
Refactor : Use dockerCmd in integration-cli tests
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-07-17 04:07:12 +08:00
97515a35ca
Merge pull request #14604 from Microsoft/10662-addbridge
...
Windows: Plumb through -b on daemon
2015-07-16 08:44:40 -07:00
081991c01e
Add missing 'Names' field to /containers/json API output
...
Closes #14675
Wasn't sure how far back I needed to go so I did just a few.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-16 08:23:55 -07:00
b70428c4dd
Merge pull request #14670 from chenchun/fix_fluentd_link
...
Fix fluentd link name
2015-07-16 10:44:54 -04:00
c4d2b34d13
Split apt-get example onto multiple lines. Use extra spaces to align the code block.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-16 06:42:07 -07:00
397de38ae6
Updated usage information because of removed short parameters.
...
Signed-off-by: Robin Schneider <ypid@riseup.net >
2015-07-16 10:44:58 +02:00
ed23ecd305
Fix fluentd link name
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
2015-07-16 14:23:56 +08:00
ce6410cd4c
don't allow deleting the image of running containers
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-07-16 13:14:48 +08:00
f373bd97c3
Trim excess from image. Based on the context, the email itself is sufficient.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-15 20:15:57 -07:00
cd642973fa
Merge pull request #14661 from LK4D4/vet_warns
...
Fix some formatting calls
2015-07-15 16:41:18 -07:00
a81dcaef93
Merge pull request #13993 from Ramzec/index_iteration
...
graph: use truncindex consistently to iterate graph entries
2015-07-15 16:39:59 -07:00
c850e97c84
Add release-deb & release-rpm scripts.
...
These will create the apt & yum repos for the deb/rpms generated by build-deb
and build-rpm.
Adds sign-repo script which signs the repo metadata with a gpg key.
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-15 15:54:00 -07:00
57c43960f8
Remove reviewing process from MAINTAINERS
...
The pull request reviewing process and labeling strategy is described as
part of a dedicated file in `project/REVIEWING.md`: remove the existing
description from the `MAINTAINERS` file.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-07-15 13:56:04 -07:00
6157937f67
Document reviewing process and labels
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-07-15 13:14:21 -07:00
4a5fd6c0f9
add tianon's suites.sh file
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-15 12:48:49 -07:00
a5142f6ac3
Fix some formatting calls
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-15 12:25:50 -07:00
46aea60fb0
Merge pull request #14332 from ankushagarwal/failedLogin
...
Add 500 check for registry api call
2015-07-15 11:19:31 -07:00
e98a881570
Merge pull request #14624 from vdemeester/14603-dockerCmd-integration-cli-1
...
Integration test refactors to use dockerCmd
2015-07-15 14:03:58 -04:00
386f11a63d
Merge pull request #14555 from sdurrheimer/master
...
Zsh completion updates and improvements
2015-07-15 10:40:41 -07:00
308ecafad8
Merge pull request #14655 from duglin/CleanupBuild
...
Cleanup build tmp dir stuff
2015-07-15 09:42:24 -07:00
e46c7060cc
Merge pull request #14643 from dmcgowan/fix-canonical-repo-info
...
Set canonical name correctly
2015-07-15 09:39:01 -07:00
e0728035fe
Merge pull request #14636 from calavera/bump_changelog
...
Bump changelog from 1.7.1
2015-07-15 08:56:03 -07:00
39e380b97a
Merge pull request #14657 from anatolyborodin/typo_fix
...
Fix a typo: change "such Bash" to "such as Bash" in dockerfile_best-practices.md
2015-07-15 11:29:38 -04:00
5f9d1bc018
Fix a typo: change "such Bash" to "such as Bash"
...
Signed-off-by: Anatoly Borodin <anatoly.borodin@gmail.com >
2015-07-15 17:10:22 +02:00
1df7a2f940
Merge pull request #14644 from charleswhchan/patch-4
...
Remove duplicated period in link
2015-07-15 10:34:01 -04:00
13c08b898b
Cleanup build tmp dir stuff
...
If there's an error while unpacking the build context then we weren't erasing
the tmp dir created to persist the context.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-15 06:23:19 -07:00
a031b6476c
Merge pull request #14574 from SvenDowideit/elastic-ip-webhooks
...
Trusted build servers moved to AWS and use an elastic IP
2015-07-15 12:20:50 +10:00
174870e64f
Trusted build servers moved to AWS and use an elastic IP
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-07-14 19:20:09 -07:00
8e7f2fc2e7
Merge pull request #14584 from Jason-Green-Aver/patch-1
...
Add missing periods to elements in ROADMAP.md
2015-07-15 12:01:31 +10:00
35746ef97f
Merge pull request #14635 from jfrazelle/update-rpm-url
...
update urls for rpms
2015-07-14 18:04:17 -07:00
3a23203255
Remove duplicated period in link
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-14 17:50:19 -07:00
7f48cd7dce
Set canonical name correctly
...
Currently canonical name gets set to the local name and displayed in the errors.
Canonical name should be the unique and canonical name for an image.
Use docker.io as the canonical domain for images on the public registry.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-14 17:45:49 -07:00
8c7cd78650
Merge pull request #14639 from calavera/fix_read_write_check
...
Fix read-write check for volumes.
2015-07-14 16:36:01 -07:00
918229cbdf
Document that load supports compressed tarballs.
...
As per
https://github.com/docker/docker/blob/ecdbf868842f702e2b824aa1e11097809d48a659/pkg/archive/archive.go#L96
Signed-off-by: Andy Rothfusz <github@developersupport.net >
2015-07-14 15:51:06 -07:00
82a54001fd
Fix read-write check for volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-14 15:50:43 -07:00
c7d4a4b2b4
Merge pull request #14521 from mattmoor/authenticated-search
...
Add the X-Docker-Token header to the /v1/search requests.
2015-07-14 15:43:28 -07:00
24bb36297c
update urls for rpms
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-14 15:26:11 -07:00
b49cbe289f
Bump version to 1.8.0-dev.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-14 15:24:48 -07:00
2932069dc7
Bump to version 1.7.1
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-14 15:23:55 -07:00
ecdbf86884
Merge pull request #13694 from vdemeester/opts-test-coverage
...
Tests, refactor and coverage on package opts
2015-07-14 15:09:48 -07:00
4e9280ffdb
Merge pull request #14304 from vieux/http_proxy_support
...
add support for base path in docker cli -H
2015-07-14 13:21:51 -07:00
5c295460da
Use dockerCmd when possible ( #14603 )
...
- integration-cli/docker_cli_attach_test.go
- integration-cli/docker_cli_attach_unix_test.go
- integration-cli/docker_cli_build_test.go
- integration-cli/docker_cli_build_unix_test.go
- integration-cli/docker_cli_by_digest_test.go
- integration-cli/docker_cli_commit_test.go
- integration-cli/docker_cli_config_test.go
- integration-cli/docker_cli_cp_test.go
- integration-cli/docker_cli_create_test.go
- integration-cli/docker_cli_pause_test.go
- integration-cli/docker_cli_port_test.go
- integration-cli/docker_cli_port_unix_test.go
- integration-cli/docker_cli_proxy_test.go
- integration-cli/docker_cli_ps_test.go
- integration-cli/docker_cli_pull_test.go
- integration-cli/docker_cli_push_test.go
- docker_api_attach_test.go
- docker_api_containers_test.go
- docker_api_events_test.go
- docker_api_exec_resize_test.go
- docker_api_exec_test.go
- docker_api_images_test.go
- docker_api_info_test.go
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-14 21:52:43 +02:00
d2fe5bd12f
Merge pull request #14618 from hqhq/hq_add_check_for_swappiness
...
Add hostConfig check for MemorySwappiness
2015-07-14 15:24:50 -04:00
e5fa2a740d
Merge pull request #14629 from LK4D4/pubsub_timer_off
...
pkg/pubsub: Don't use time.After if there is no timeout
2015-07-14 13:06:57 -04:00
899f6f2a89
Merge pull request #14252 from sallyom/docs-use-lowercase
...
Modify man pages for image-naming
2015-07-14 18:34:36 +02:00
bc6ad1608c
Don't use time.After if there is no timeout
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-14 09:14:51 -07:00
7080f5d1cf
Add docstring to pubsub.Publisher
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-14 09:10:14 -07:00
cf09e435c8
Merge pull request #14608 from vincentbernat/fix/zsh-reviewers
...
zsh: remove Vincent Bernat from reviewers for ZSH completion
2015-07-14 07:08:06 -07:00
aaf1426995
Merge pull request #14494 from HuKeping/update-docs
...
docs: update docs for API history
2015-07-14 08:16:00 -04:00
29660f263e
docs: update docs for API history
...
The response of hitory API includes more information now.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-07-14 19:54:24 +08:00
91a2d9cc7d
Several cosmetic improvements in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-07-14 11:34:33 +02:00
12f67141f9
Zsh completion update for the following commits:
...
- Add fluentd logging driver to zsh completion #12876
- Add inspect --type flag to zsh completion #13187
- Respect -H option in zsh completion #13195
- Fix number of argument limit for pause and unpause in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-07-14 11:32:26 +02:00
a7f5e1c4c3
Remove cgroup read-only flag when privileged
...
Fixes : #14543
It needs libcontainer fix from:
https://github.com/opencontainers/runc/pull/91
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-14 15:00:41 +08:00
4290bdefab
Add dockerCmdWithError
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-14 08:35:06 +02:00
daffcc044b
Merge pull request #14458 from hqhq/hq_fix_docs_create
...
Docs: fix commandline doc create.md and run.md
2015-07-14 08:10:41 +02:00
19c7b65ea6
Add hostConfig check for MemorySwappiness
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-14 13:52:57 +08:00
154820aca6
Merge pull request #14595 from LK4D4/pubsub_bench
...
Benchmark and race test for pkg/pubsub
2015-07-13 23:04:44 -04:00
59aa3b27ca
Add missing periods to elements in ROADMAP.md
...
Signed-off-by: Jason Green <Jason.Green@AverInformatics.Com >
2015-07-13 23:01:34 -04:00
c3b77bbe8b
Docs: fix commandline doc create.md and run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-14 09:26:59 +08:00
5ca3e7c54c
Merge pull request #14021 from rhvgoyal/detect-pool-loopback-devices
...
devicemapper: Check loop devices of existing pool
2015-07-13 21:15:23 -04:00
35b0223921
Merge pull request #10717 from mrunalp/feature/group_add
...
Adds support for specifying additional groups.
2015-07-13 17:08:05 -07:00
e221291a25
Merge pull request #14194 from phemmer/cli-version-format
...
add --format flag to `docker version`
2015-07-13 17:04:06 -07:00
41588a5766
add --format flag to docker version
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com >
2015-07-13 19:10:56 -04:00
60b34cb957
Merge pull request #14599 from brahmaroutu/gccgo_timeduration
...
time duration should be nano seconds, gccgo treats it as zero
2015-07-13 16:44:45 -06:00
73bd855dcc
Merge pull request #14581 from vdemeester/14573-docs-docker-bestpractice-fix
...
Fixes TOC in dockerfile_best_practices.md
2015-07-13 15:14:56 -07:00
23d0676c07
Merge pull request #14607 from brahmaroutu/increase_timeout
...
increase timeout to run tests on slow platforms
2015-07-13 14:56:17 -07:00
d03923732f
Fixes TOC in dockerfile_best_practices.md
...
Decided to put the link in a reference word.
Closes #14573
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-13 23:46:04 +02:00
5e331ad41a
Merge pull request #14343 from Pensu/14232-Add-Warning-To-Ubuntu-Script
...
14232 add warning to ubuntu script
2015-07-13 14:38:58 -07:00
4185809659
Merge pull request #14518 from Microsoft/10662-infowarnings
...
Windows: Remove meaningless warnings on docker info
2015-07-13 14:30:57 -07:00
363cc51e82
Merge pull request #14205 from YanFeng-Adam/patch
...
update testcase mount/sharedsubtree_linux_test.go
2015-07-13 14:28:30 -07:00
5dbb217bcb
zsh: remove Vincent Bernat from reviewers for ZSH completion
...
Signed-off-by: Vincent Bernat <vincent@bernat.im >
2015-07-13 23:15:16 +02:00
b98edced9e
Increase timeout to run tests on slow platforms
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-13 21:13:17 +00:00
3f0fa1f643
Removed short parameters and use Bash features to make code shorter. Thanks to @tianon.
...
Signed-off-by: Robin Schneider <ypid@riseup.net >
2015-07-13 22:56:15 +02:00
15f9766691
Merge pull request #14567 from Microsoft/10662-fixbuilder
...
Windows: Fix builder
2015-07-13 13:50:52 -07:00
c2b9fa8c9a
Merge pull request #14516 from Microsoft/10662-mergeLXCconf
...
Windows: Tidy up daemon\utils*.go
2015-07-13 14:47:25 -06:00
655b1d2367
Merge pull request #14556 from Evalle/14497-fix-install-script
...
Fix issue with detection logic of Centos in install.sh
2015-07-13 13:47:08 -07:00
1da3843149
Merge pull request #14601 from runcom/cleanup-deleteImages
...
Cleanup not needed calls to deleteImages
2015-07-13 14:04:20 -06:00
05a86905a2
Modify man pages for image-naming
...
This PR adds recommendations in man pages to use only [a-z0-9-_.] when
naming and tagging images. The purpose of this is to add consistency
and to make image naming caps rules seem less arbitrary.
This PR addresses confusion with:
1. BaseImage:Tagged (not allowed)
2. baseimage:Tagged (allowed)
3. baseimage/tagged:V1 (allowed)
4. baseimage/Tagged:V1 (not allowed)
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-07-13 15:49:41 -04:00
9158ddef89
Merge pull request #14596 from Microsoft/quieter-clean-exec-commands
...
Quieter debug logging for clean exec commands
2015-07-13 15:43:27 -04:00
e0ec0cc115
Windows: Plumb through -b on daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-13 12:41:48 -07:00
33039aa129
Fix issue with detection logic of Centos in install.sh
...
Signed-off-by: evalle <shmarnev@gmail.com >
2015-07-13 20:50:31 +02:00
7fb456589b
Fixup rebase.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-07-13 14:50:30 -04:00
d77d0268eb
Adds documentation for additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-07-13 14:47:28 -04:00
0b7938e845
Adds test for additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-07-13 14:47:28 -04:00
e0d96fb3ef
Adds support for specifying additional groups.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-07-13 14:47:28 -04:00
d3566fa0b1
Cleanup not needed calls to deleteImages
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-13 20:30:53 +02:00
6c4e14b3e2
time duration should be nano seconds, gccgo treats it as zero
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-13 18:01:43 +00:00
4ef67b79bc
Merge pull request #14597 from albers/docs-typo-1
...
Fix typo in documentation
2015-07-13 19:56:54 +02:00
b271593c34
Quieter debug logging for clean exec commands
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-13 10:36:36 -07:00
0f466c36b9
Merge pull request #14500 from runcom/add-diff-emtpy-arg-test
...
Add diff command with emtpy string testcase
2015-07-13 11:30:31 -06:00
41def26c1b
Fix typo in documentation
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-13 19:17:33 +02:00
0badebe734
Merge pull request #14426 from albers/completion-events
...
Add some missing events to bash completion
2015-07-13 10:05:36 -07:00
b39c330a18
Merge pull request #14587 from rhatdan/man
...
Man page fixes
2015-07-13 10:59:55 -06:00
a20994fd54
Merge pull request #14508 from jfrazelle/deb-rpm-make
...
add deb and rpm targets to makefile
2015-07-13 09:48:43 -07:00
e13f9edfed
Merge pull request #14583 from sagarhani/patch-1
...
Added entry for Sir M.Visvesvaraya
2015-07-13 10:47:08 -06:00
7ba54a4628
Merge pull request #14569 from vdemeester/pkg-fileutils-tests
...
Add missing tests and docs for pkg/fileutils
2015-07-13 09:29:30 -07:00
8aa7ba731a
Race test for pkg/pubsub package
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-13 09:05:47 -07:00
161f5b2790
Merge pull request #14554 from Ajeey/added-notable-indian-scientists
...
Added notable indian scientists to names-generator.go
2015-07-13 09:05:47 -07:00
e5da4d62ef
Benchmark for pkg/pubsub package
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-13 09:02:16 -07:00
eb174dbb1e
Merge pull request #14553 from WPH95/fix-install
...
Fix failure on adding source list for ubuntu
2015-07-13 09:00:26 -07:00
1f963af697
Merge pull request #14586 from Tenk42/14362-Improve-sockRequestRaw-check
...
Improve sockRequest and sockRequestRaw check
2015-07-13 15:59:39 +02:00
24c09006c9
Merge pull request #14588 from rhatdan/ro
...
We now support multiple roModes
2015-07-13 09:53:55 -04:00
ca4ff1ae36
add to docs that ports do not get exposed when using --net
...
Signed-off-by: paetling <paetling@gmail.com >
2015-07-13 09:46:39 -04:00
441ae6c943
Merge pull request #14004 from ktraghavendra/13938_container_swappiness
...
Add the memory swappiness tuning option to docker.
2015-07-13 09:22:08 -04:00
b28d6eaa94
We now support multiple roModes
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-07-13 09:19:15 -04:00
3eea6f753a
Robert P.J. Day found this problems in man pages
...
Example in docker search has an extranious -t
docker rmi has a typo
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-07-13 08:59:03 -04:00
fa6925aa9b
Improve sockRequest and sockRequestRaw check
...
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com >
2015-07-13 21:49:08 +09:00
45dbdabdc7
Added entry for Sir M.Visvesvaraya
...
Signed-off-by: Sagar Hani <sagarhani33@gmail.com >
2015-07-13 17:20:45 +05:30
d51ae591e0
Update docker_remote_api_v1.17.md
...
HostConfig had misplaced comma(,) for Devices and SecurityOpt keys. Corrected comma position.
Signed-off-by: rohitkadam19 <rohit.d.kadam@gmail.com >
2015-07-13 15:51:27 +05:30
b0da494aa3
Merge pull request #14559 from Microsoft/10662-todo1
...
Windows: Move daemon check back centrally
2015-07-12 21:22:43 -07:00
b58565e9d6
Merge pull request #14568 from runcom/test-vet-fixes
...
Add minor vet fixes
2015-07-12 14:00:44 -07:00
09adf87f23
Add missing tests and docs for pkg/fileutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-12 22:43:42 +02:00
26ce3f4c90
Add minor vet fixes
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-12 19:16:38 +02:00
2ceb114607
Windows: Fix builder
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-12 09:06:18 -07:00
dfc6c04fa3
Add test coverage to opts and refactor
...
- Refactor opts.ValidatePath and add an opts.ValidateDevice
ValidePath will now accept : containerPath:mode, hostPath:containerPath:mode
and hostPath:containerPath.
ValidateDevice will have the same behavior as current.
- Refactor opts.ValidateEnv, opts.ParseEnvFile
Environment variables will now be validated with the following
definition :
> Environment variables set by the user must have a name consisting
> solely of alphabetics, numerics, and underscores - the first of
> which must not be numeric.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-12 10:33:30 +02:00
921da495d2
Add the memory swappiness tuning option to docker.
...
Memory swappiness option takes 0-100, and helps to tune swappiness
behavior per container.
For example, When a lower value of swappiness is chosen
the container will see minimum major faults. When no value is
specified for memory-swappiness in docker UI, it is inherited from
parent cgroup. (generally 60 unless it is changed).
Signed-off-by: Raghavendra K T <raghavendra.kt@linux.vnet.ibm.com >
2015-07-12 13:16:33 +05:30
62a75fca68
Windows: Move daemon check back centrally
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-11 12:42:46 -07:00
ee685dca0d
Fixing dangling link in docs/reference/commandline/run.md
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
2015-07-11 14:10:54 -04:00
c27b93ea26
Added notable indian scientists to names-generator.go
...
Signed-off-by: Ajey Charantimath <ajey.charantimath@gmail.com >
2015-07-11 20:11:22 +05:30
80e90499aa
Fix failure on adding source list for ubuntu
...
For hybrid cloud, some ubuntu vm images doesn't have the directory
`/etc/apt/sources.list.d` which cause failure on creating
`/etc/apt/sources.list.d/docker.list`.
To fix this issue, create this directory first (if it doesn't exist).
Signed-off-by: Penghan Wang <ph.wang@daocloud.io >
2015-07-11 22:37:02 +08:00
865d3a1488
Updated docker-engine.spec to build on Oracle Linux 6.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
2015-07-11 09:53:00 +10:00
9264d38424
Merge pull request #14537 from stevvooe/allow-one-character-repository-names
...
Allow one character repository names
2015-07-10 15:41:53 -07:00
4aeb84612f
Merge pull request #14371 from Microsoft/10662-graphdriver
...
Windows: Graph driver implementation
2015-07-10 15:35:00 -07:00
ff8cef3326
Merge pull request #13986 from tg123/master
...
prompt a cli login if receive 401 from registry v2 auth server
2015-07-10 15:33:42 -07:00
703248da20
Merge pull request #13669 from ewindisch/readonly-proc
...
Make /proc, /sys, & /dev readonly for readonly containers
2015-07-10 15:32:13 -07:00
892ac93ec9
Merge pull request #14501 from duglin/FixCommitDocs
...
Align 'docker commit' docs with the code
2015-07-10 15:21:29 -07:00
a828415286
Merge pull request #14533 from natebrennand/update-docker-config-docs
...
update reference to config file
2015-07-10 15:20:52 -07:00
52f4d09ffb
Windows: Graph driver implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-10 14:33:11 -07:00
b7e8169274
Merge pull request #13554 from Microsoft/10662-winexec
...
Windows: The real Windows exec driver is here.
2015-07-10 17:13:10 -04:00
5bf98dd997
Merge pull request #12856 from duglin/ConfigLocation
...
Add support for DOCKER_CONFIG/--config to specify config file dir
2015-07-10 23:05:49 +02:00
9ae9d4c87a
Windows: Exec driver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-10 13:36:56 -07:00
451789cf88
Allow one character repository name components
...
The docker/distribution dependency was updated in the previous commit to allow
repository name components to only consist of a single letter. The unit tests
have been updated to cement this change.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-07-10 14:06:15 -06:00
bfd5202c17
Update docker/distribution dependency
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-07-10 14:05:38 -06:00
daced1d303
Add support for DOCKER_CONFIG/--config to specific config file dir
...
Carry #11675
Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-10 12:51:34 -07:00
20ac0e6164
Merge pull request #14306 from Microsoft/validatepsfilter
...
Validate status= filter to docker ps
2015-07-10 15:43:01 -04:00
6827782bef
update reference to config file
...
`docker login` in 1.7 produces a config file in `~/docker/config.json`
instead of a `~/.dockercfg`.
Signed-off-by: Nate Brennand <nate.brennand@clever.com >
2015-07-10 18:55:47 +00:00
5bf335d0a2
Merge pull request #14450 from hqhq/hq_fix_oom_kill_disable_doc
...
Fix docs for oom-kill-disable
2015-07-10 11:15:02 -07:00
471fbc9b99
Merge pull request #14478 from atilacamurca/patch-1
...
Update run.md
2015-07-10 11:13:51 -07:00
1dd2fda394
Merge pull request #13312 from hqhq/hq_enable_cgroupfs
...
Add cgroup bind mount by default
2015-07-10 10:45:05 -07:00
c4b85baf3d
Merge pull request #14527 from duglin/MoreExecTests
...
More extensive testing of new GC of execs
2015-07-10 10:42:28 -07:00
615681f517
Windows: Remove meaningless warnings on docker info
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-10 10:06:20 -07:00
72b75cd4e7
More extensive testing of new GC of execs
...
This is a follow-on to PR #14520 .
PR #14520 is the quick fix to get the testing working again.
This PR makes sure that the list of execs associated with a container goes
from zero to one (as a new exec is run), then back to zero when the exec is
finished. However, we should be able to query the exec while the container
is still around, and even though the exec isn't listed in the container's
inspect data.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-10 07:27:11 -07:00
469e234ded
Merge pull request #14520 from duglin/FixExecTest
...
Minor fix to the exec inspect test
2015-07-10 09:57:43 -04:00
899c85b405
Minor fix to the exec inspect test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-10 06:19:03 -07:00
f18fb5b3ef
Add cgroup bind mount by default
...
Libcontainer already supported mount container's own cgroup into
container, with this patch, we can see container's own cgroup info
in container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-10 13:12:09 +08:00
5a170484d1
Add the X-Docker-Token header to the /v1/search requests.
...
By adding this header AuthTransport will add Basic authentication to the request and allow 'docker search' results to include private images.
Signed-off-by: Matt Moore <mattmoor@google.com >
2015-07-09 20:56:23 -07:00
6e64e0548f
Merge pull request #14514 from hqhq/hq_fix_file_leak
...
Fix file leak in integration-cli
2015-07-09 21:52:59 -04:00
3875be9830
Windows: Tidy up daemon\utils*.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-09 18:47:32 -07:00
4893ecc112
Merge pull request #14512 from Microsoft/10662-fixdockerinfo
...
Windows: Fix docker info not to SIGSEGV
2015-07-09 17:16:49 -07:00
4348ad68f8
Windows: Fix docker info not to SIGSEGV
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-09 16:37:54 -07:00
56e8a99b61
Merge pull request #14480 from Microsoft/fix-windows-ci
...
Fix Windows CI fail due to GH13866
2015-07-09 16:37:41 -07:00
e64af7a70e
Merge pull request #14505 from kostickm/12905-port-container-attach-tests
...
Port POST container attach tests
2015-07-09 16:27:03 -07:00
7df186dac7
Merge pull request #14509 from Microsoft/10662-remove-linux
...
Windows: Remove linux
2015-07-09 15:42:53 -07:00
382799a642
Merge pull request #14476 from crosbymichael/execid-growth-fix
...
Prevent uncontrolled exec config growth
2015-07-09 15:36:11 -07:00
7d3bbe9d34
Windows: Remove linux
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-09 15:15:25 -07:00
a29af0cc42
Merge pull request #14507 from estesp/remove-old-roadmap
...
No need for the old project/ROADMAP.md
2015-07-09 15:11:26 -07:00
548caddaf6
No need for the old project/ROADMAP.md
...
Now that we have ROADMAP.md in the root of the project, the outdated and
non-specific ROADMAP.md in project/ can be removed.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-07-09 18:05:09 -04:00
34ab8c4326
Use mark and sweep for exec command removal
...
This takes the final removal for exec commands in two steps. The first
GC tick will mark the exec commands for removal and then the second tick
will remove the config from the daemon.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-07-09 14:51:10 -07:00
21a07a63c9
add deb and rpm targets to dockerfile
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-09 14:51:02 -07:00
c9e2a71509
Merge pull request #14484 from LK4D4/check_dockerinit_lxc
...
Check dockerinit only if lxc driver is used
2015-07-09 14:47:03 -07:00
0f9c458730
Merge pull request #14457 from Djelibeybi/oraclelinux-rpms
...
Add support for building docker-engine RPM on Oracle Linux 7.
2015-07-09 14:44:42 -07:00
f18c4f23cc
Change generate.sh so that the yum command for packages remains generic across distros.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
2015-07-10 07:34:47 +10:00
dce90c0bdd
Merge pull request #14502 from calavera/help_release_announce_text
...
Help the release captain to announce the released packages.
2015-07-09 14:27:24 -07:00
eae99e9da7
Help the release captain to announce the released packages.
...
Add a few links to the release output that the release captain can use to announce the release.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-09 14:19:05 -06:00
0bf0e5a6ef
Align 'docker commit' docs with the code
...
It was missing some variants and 'maintainer' isn't actually supported.
Also sorted the list of allowed cmds in the code just to make it easier
to diff with the docs.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-09 13:17:47 -07:00
a8715ea220
Port POST container attach tests
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-07-09 12:52:45 -07:00
c1b524486c
Fix Windows CI fail due to GH13866 and patch up tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-09 10:09:45 -07:00
9d84d4c2cc
Add diff command with emtpy string testcase
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-09 18:46:38 +02:00
37771c122b
Merge pull request #14498 from calavera/fix_volume_from_references
...
Fix volumes-from mount references.
2015-07-09 12:34:27 -04:00
5369b6cf29
Merge pull request #14348 from sunyuan3/TestPullImageWithAllTagFromCentralRegistry
...
Add TestPullImageWithAllTagFromCentralRegistry test case.
2015-07-09 09:56:53 -06:00
3d029c3bf3
Fix volumes-from mount references.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-09 09:01:57 -06:00
d28b0ba115
Fix file leak in integration-cli
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-09 18:52:18 +08:00
0afd7bde02
Merge pull request #14381 from Mashimiao/cleanup-client-unused-code
...
api/client: unify format of args check
2015-07-09 06:42:57 -04:00
f0e90606cd
Merge pull request #13989 from squaremo/netplugin_docs
...
Mention network driver plugins and point to protocol docs
2015-07-09 09:27:05 +02:00
ca3e4ccb80
Merge pull request #14241 from ZJU-SEL/fix-ulimit-usage
...
Fix ulimit usage of nproc
2015-07-09 08:23:26 +02:00
54ac3ad736
Clarify that nproc is not for per container
...
Fix ulimit nproc spec in daemon
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
2015-07-09 02:40:47 +00:00
cab02a5bbc
Merge pull request #14456 from Djelibeybi/issue14042
...
Remove RPM specific dependencies
2015-07-08 17:17:55 -07:00
d2cde4fa66
update doc
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-07-08 15:42:41 -07:00
47a7f770f4
add support for base path in docker cli -H
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-07-08 15:42:40 -07:00
885e7f2a1e
Merge pull request #14479 from LK4D4/fix_test_inspect
...
Remove prefix dots from inspects in tests
2015-07-08 15:10:51 -07:00
2df65c32d7
Merge pull request #14402 from mrjana/mh
...
Vendoring libnetwork
2015-07-08 17:15:13 -04:00
96bc377a8d
Check dockerinit only if lxc driver is used
...
This allow you to run dynamically linked docker without compiling
dockerinit.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-08 14:12:51 -07:00
5f017bba48
Add GC loop to clean exec command refs on daemon
...
This adds an event loop for running a GC cleanup for exec command
references that are on the daemon. These cannot be cleaned up
immediately because processes may need to get the exit status of the
exec command but it should not grow out of bounds. The loop is set to a
default 5 minute interval to perform cleanup.
It should be safe to perform this cleanup because unless the clients are
remembering the exec id of the process they launched they can query for
the status and see that it has exited. If they don't save the exec id
they will have to do an inspect on the container for all exec instances
and anything that is not live inside that container will not be returned
in the container inspect.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-07-08 13:47:59 -07:00
67058e388b
Remove prefix dots from inspects in tests
...
Dots prepended to key in inspectField function
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-08 12:41:05 -07:00
42eb82ae92
Merge pull request #14477 from Microsoft/10662-runconfig-oopsie
...
Windows: Wrong build tag in runconfig
2015-07-08 15:34:05 -04:00
7121a2ae46
Update run.md
...
Put a space after the `###` in the Example section. On the github parser the result file looks ok, but in the docker page (<https://docs.docker.com/reference/run/ >) looks ugly.
Signed-off-by: Átila Camurça <camurca.home@gmail.com >
2015-07-08 16:09:40 -03:00
2f566f747b
Merge pull request #14459 from lexandro/add-dockery-to-client-libs
...
Adding dockery as client lib to the docs
2015-07-08 20:52:24 +02:00
4cd9301692
Windows: Wrong build tag in runconfig
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-08 11:38:28 -07:00
04c9f86bdc
Remove exec config from container after exit
...
This removes the exec config from the container after the command exits
so that dead exec commands are not displayed in the container inspect.
The commands are still kept on the daemon so that when you inspect the
exec command, not the container, you are still able to get it's exit
status.
This also changes the ProcessConfig to a pointer.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-07-08 10:55:42 -07:00
3833c990e7
Merge pull request #14471 from icecrime/14451_devmapper_startup_panic
...
Fix panic on devicemapper initialization
2015-07-08 11:18:00 -06:00
f089899023
Fix panic on devicemapper initialization
...
The ability to save and verify base device UUID (#13896 ) introduced a
situation where the initialization would panic when removing the device
returns EBUSY.
Functions `verifyBaseDeviceUUID` and `saveBaseDeviceUUID` now take the
lock on the `DeviceSet`, which solves the problem as `removeDevice`
assumes it owns the lock.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-07-08 09:10:20 -07:00
c9a4c1401f
Add TestPullImageWithAllTagFromCentralRegistry test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-07-08 19:47:33 +08:00
cd454fef5a
Adding dockery as client lib to the docs
...
Signed-off-by: Robert Stern <lexandro2000@gmail.com >
2015-07-08 12:09:34 +02:00
9a4cbb358d
api/client: unify format of args check
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-07-08 17:29:47 +08:00
7e4725cb66
Adding a warning to Ubuntu script
...
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com >
2015-07-08 12:28:30 +05:30
0117330ae7
Add support for building docker-engine RPM on Oracle Linux 7.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
2015-07-08 16:12:19 +10:00
e3b5889783
Remove specific dependencies and let RPM auto-generate the dependencies on libraries during build.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
2015-07-08 15:30:42 +10:00
f5ebcfe1dc
Merge pull request #14429 from coolljt0725/fix_cp_created_container
...
Fix copy from a "created" container. Fixes #14420
2015-07-07 22:27:01 -06:00
159e830068
Merge pull request #14379 from Mashimiao/add-missing-stream-close
...
api/client: close the returned io.ReadCloser
2015-07-07 21:15:45 -06:00
289ee90b04
Fix copy from a "created" container. Fixes #14420
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-08 11:15:09 +08:00
91a496055c
api/client: close the returned io.ReadCloser
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-07-08 10:06:25 +08:00
c92fb4d517
Fix docs for oom-kill-disable
...
Addresses: #14440
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-08 09:51:10 +08:00
2fe51ecee7
Merge pull request #14100 from rhvgoyal/overlay-docker-inspect
...
overlay: Export metadata for container and image in docker-inspect
2015-07-07 18:11:27 -07:00
9c96304a86
Merge pull request #14315 from Pensu/14176-fix-run-table-rendering
...
Fixing the table rendering in reference/run.md
2015-07-07 18:09:53 -07:00
2cd417df73
Merge pull request #14388 from runcom/14316-fix-events-filters
...
Fix combined image events filters
2015-07-07 18:08:56 -07:00
25151eb24e
Merge pull request #14417 from crosbymichael/attach-stdin
...
Always attach STDIN if -i,--interactive is specified
2015-07-07 18:07:46 -07:00
045ccc4326
Merge pull request #14432 from coolljt0725/umount_rootf_on_cp_fail
...
Always umount container rootfs and volumes on docker cp failed
2015-07-07 21:04:16 -04:00
81c30c3303
Merge pull request #14430 from zmarouf/master
...
fix(docs): Small typoes in the Supported installation page
2015-07-07 18:00:19 -07:00
16f8afb451
Merge pull request #14369 from maximkulkin/14123-dockerize-disk-with-non-en-locale
...
Fix dockerize-disk.sh working in non-en locale
2015-07-07 17:51:29 -07:00
e13b7862ab
Merge pull request #14335 from konstruktoid/issue_14263
...
Mention experimental build
2015-07-07 17:49:37 -07:00
806b3fa145
Merge pull request #13835 from cpuguy83/gen-prc
...
generate plugin clients via template
2015-07-07 17:17:39 -07:00
a5283d2ff3
Merge pull request #13866 from brahmaroutu/runOOM_13766
...
RunOOM test should check to see if Oom Control is enabled
2015-07-07 16:21:46 -07:00
b2b367a6ad
Merge pull request #14427 from Evalle/14404-add-Metatag
...
Adding Group Metatag
2015-07-07 16:43:20 -06:00
f7ea9114d6
Merge pull request #14415 from calavera/warning_on_no_dev_sync
...
Put dm.override_udev_sync_check back.
2015-07-07 14:35:49 -07:00
e27131519f
Warn when udev_sync is not supported.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-07 15:10:24 -06:00
e3966c1031
Merge pull request #14380 from sunyuan3/TestRunCapAddCHOWN
...
add TestRunCapAddCHOWN test case
2015-07-07 12:36:14 -07:00
9af7afb9eb
Revert "Fix implicit DeviceMapper selection"
...
This reverts commit 0a376291b2david.calavera@gmail.com >
2015-07-07 12:27:19 -07:00
a14b1f1e9d
Merge pull request #14441 from embray/patch-1
...
Update windows.md
2015-07-07 15:14:37 -04:00
cc955ae73c
added ability to iterate over all indexes and use index.Iterate() instead of ReadDir() to walk over the graph
...
Signed-off-by: Roman Strashkin <roman.strashkin@gmail.com >
2015-07-07 22:13:28 +03:00
a8f8748f7a
Merge pull request #14398 from ankushagarwal/gitignore-iml
...
Removing .idea from .gitignore
2015-07-07 12:10:54 -07:00
bfc5966d0b
Merge pull request #14094 from rghv/master
...
Added entries of a few ancient Indian mathematicians who did cool things centuries ago.
2015-07-07 12:03:28 -07:00
bebf534439
devicemapper: Check loop devices of existing pool
...
Often it happens that docker is not able to shutdown/remove the thin
pool it created because some device has leaked into some mount name
space. That means device is in use and that means pool can't be removed.
Docker will leave pool as it is and exit. Later when user starts the
docker, it finds pool is already there and docker uses it. But docker
does not know it is same pool which is using the loop devices. Now
docker thinks loop devices are not being used. That means it does not
display the data correctly in "docker info", giving user wrong information.
This patch tries to detect if loop devices as created by docker are
being used for pool and fills in the right details in "docker info".
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-07-07 14:13:29 -04:00
2ea4d90da4
Merge pull request #14422 from Microsoft/10662-dumpstacks
...
Windows: Win32 event for sigusr1 linux equivalence
2015-07-07 10:54:00 -07:00
12c85f3671
Update windows.md
...
With apologies (it wasn't clear from the contributing guidelines how this project feels about PRs for one or two word doc fixes).
Signed-off-by: Erik M. Bray <erik.m.bray@gmail.com >
2015-07-07 13:51:17 -04:00
cd72c7f3bb
Merge pull request #14421 from dmcgowan/fix-duplicate-layers
...
Fix duplicate layers in manifest
2015-07-07 10:50:45 -07:00
10bbf62081
Merge pull request #14375 from coolljt0725/fix_test_events_default_empty
...
Fix test TestEventsDefaultEmpty. Fixes #14360
2015-07-07 10:37:40 -04:00
833cdd28ed
Merge pull request #14307 from kolyshkin/readme-fixes
...
README.md: fix cgroups/namespaces name and link
2015-07-07 06:09:20 -07:00
61418e39d5
Merge pull request #14428 from sunyuan3/TestPushBusyboxImage
...
Correct wrong comment of TestPushBusyboxImage.
2015-07-07 14:44:08 +02:00
13c36ce65e
Always umount container rootfs and volumes on docker cp failed
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-07 20:27:45 +08:00
3bee3a2927
fix(docs): Small typoes in the Supported installation page
...
-> https://docs.docker.com/installation/
Signed-off-by: Zeid Marouf <zeid.marouf@gmail.com >
2015-07-07 11:09:12 +02:00
f244ed2531
Correct wrong comment of TestPushBusyboxImage.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-07-07 16:10:37 +08:00
270d7e1af8
Merge pull request #14406 from duglin/tweakCmdlineHelp
...
Fix example in cmdline help text to have correct output
2015-07-07 09:26:13 +02:00
244141a8aa
Merge pull request #13987 from larsks/bug/7583
...
Update docker commit man page re: volumes
2015-07-07 09:16:54 +02:00
0db7c2a9a6
Adding Group Metatag
...
Signed-off-by: evalle <shmarnev@gmail.com >
2015-07-07 09:08:55 +02:00
ea26b38784
Add some missing events to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-07 09:04:15 +02:00
81964ca555
Merge pull request #14275 from ankushagarwal/runtime-metrics-docs-stats
...
Add Docker stats to runtime metrics article
2015-07-07 08:21:31 +02:00
a25ee91f1c
Merge pull request #14095 from timwraight/master
...
Clarify .dockerignore example for Markdown files
2015-07-07 07:59:39 +02:00
68efb27e99
daemon.md: fix placement of exec driver heading
...
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
2015-07-06 22:51:31 -07:00
7e309aed4e
README.md: fix cgroups/namespaces name and link
...
The features Docker relies on are called "cgroups" and "namespaces",
so fix the language accordingly.
Also for cgroups, provide a link to Linux kernel documentation that
is more relevant (and deep) than the Wikipedia article.
Cc: Ankush Agarwal <ankushagarwal11@gmail.com >
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
2015-07-06 22:45:56 -07:00
c6dc6bcbb8
Vendoring libnetwork
...
Vendoring libnetwork commit: 8fb0a8bc9e3166216ca3da2d0bb15332f6685745
- Fixes breakage in k/v store handling logic in experimental
- Adds back all the fixes that went in 1.7.1 to master
- Change VXLAN port in overlay driver to IANA assigned port
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-07-06 20:53:03 -07:00
2802831218
Fix test TestEventsDefaultEmpty. Fixes #14360
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-07 11:27:00 +08:00
58edd21c05
Merge pull request #14409 from vdemeester/fix-testRequires-network
...
Fix integration tests with testRequires(c, Network)
2015-07-06 23:08:34 -04:00
f4b08c7f5e
Windows: Win32 event for sigusr1 linux equivalence
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-06 18:58:53 -07:00
aea0fd0115
Fix example in cmdline help text to have correct output
...
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-06 17:51:09 -07:00
35081ea4b6
Fix duplicate layers in manifest
...
Currently the layer array is initialized with the first layer then the first layer is appened to the layer list. Adding the first layer twice causes the layer to appear twice in the manifest, making a duplicate push and pull attempt occur.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-06 17:31:06 -07:00
2905fe4806
Merge pull request #14414 from jfrazelle/fix-rpms
...
fix rpms
2015-07-06 17:12:38 -07:00
6ffce0131c
Merge pull request #14154 from chrismckinnel/master
...
Fix a broken link to .dockerignore
2015-07-06 15:48:25 -07:00
274c838ced
Add Docker stats to runtime metrics article
...
Fixes #13170
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-06 15:40:26 -07:00
691b2851f7
Always attach STDIN if -i,--interactive is specified
...
There is no reason to error out or not do what the user expects when -i
is specified on the cli. We should always attach to the stdin of the
container in this situation.
Closes #14390
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-07-06 15:24:23 -07:00
4f69609ac2
Merge pull request #14411 from duglin/Issue14407
...
Add some missing events to the API docs
2015-07-06 23:29:56 +02:00
e7fb38410d
RunOOM test should check to see if Oom Control is enabled
...
closes #13766
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-06 21:15:55 +00:00
76a853de6e
fix rpms
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-06 14:14:26 -07:00
6e4c6da819
Fix integration tests with testRequires(c, Network)
...
It seems http://hub.docker.com is not accessible anymore, so switching
to https://hub.docker.com for testRequires(c, Network).
Adds a Timeout check on the TestRequirement to *panic* if there is a
timeout (fail fast).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-06 22:08:35 +02:00
4bb3c253e8
Add some missing events to the API docs
...
Closes #14407
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-06 11:39:37 -07:00
c7492126ef
Merge pull request #14127 from vbatts/vbatts-dm-active-external
...
pkg/devicemapper: external device activation
2015-07-06 14:07:33 -04:00
b0f7a1c62c
Removing .idea from .gitignore
...
The project cannot include every editor's
ignore files. Contributers can use a local
global gitignore : https://help.github.com/articles/ignoring-files
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-06 10:41:38 -07:00
a974789537
Update docker commit man page re: volumes
...
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.
Addresses comments in #7583
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com >
2015-07-06 10:16:21 -04:00
26a35dd09b
Merge pull request #14344 from Mashimiao/add-json-check-for-execcreate
...
api/server: Add missing json check
2015-07-05 19:04:12 -04:00
7fde07ea16
Merge pull request #14394 from moxiegirl/carry-pr-13361
...
Carries and closes 13361
2015-07-05 11:30:17 +02:00
2c5e044b59
Carries and closes 13361
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-04 18:12:52 -07:00
7aa554c444
Merge pull request #14392 from moxiegirl/fix-fedora-table
...
Table formatting was broken
2015-07-04 16:30:17 -07:00
57286aad25
Merge pull request #14235 from mlarcher/mlarcher-patch-2
...
Add workaround in docs for git bash usage issue
2015-07-04 21:00:53 +02:00
f240bb5e94
Merge pull request #14309 from Tenk42/14287-wheezy-link-broken-on-debian-page
...
Fixing Wheezy link on debian installation page
2015-07-04 14:57:00 -04:00
762214ccc8
Table formatting was broken
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-04 07:32:58 -07:00
36958ba49b
Merge pull request #14374 from Mashimiao/clinent-load-tiny-typo-fix
...
client/load: tiny typo fix
2015-07-04 00:24:21 +02:00
19e6de2654
Fix combined image events filters
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-04 00:19:08 +02:00
90bc5513a9
Merge pull request #14383 from runcom/runconfig-merge-cleanup
...
add break after key is found in for loop
2015-07-03 15:18:09 -07:00
a5be803458
Add break after key is found in for loop
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-03 20:37:34 +02:00
bca32648f4
Merge pull request #14195 from ch3lo/master
...
update in Kitematic OS support
2015-07-03 18:05:27 +02:00
1b3bde47ef
update in Kitematic OS support
...
Kitematic now support Windows
Signed-off-by: Marcelo Salazar R <chelosalazar@gmail.com >
2015-07-03 12:32:00 -03:00
230179c8dc
add TestRunCapAddCHOWN test case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-07-03 23:25:52 +08:00
a89f4e36ab
Merge pull request #14159 from tristan0x/patch-1
...
docker-hub Admin right gives access to build logs
2015-07-03 16:56:04 +02:00
515df52f19
Rewrite DockerHub group permissions documentation
...
On behalf of @moxiegirl
https://gist.github.com/moxiegirl/1c34957b9edc0f6d528c#file-gistfile1-md
Signed-off-by: Tristan Carel <tristan.carel@gmail.com >
2015-07-03 16:29:30 +02:00
0dedadd4d6
Merge pull request #14377 from coolljt0725/validate_restart_policy
...
Validate restart policy. Fixes #14351
2015-07-03 07:01:44 -05:00
f3faf59925
Validate restart policy. Fixes #14351
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-03 17:33:33 +08:00
33be2c5d2e
Add workaround in docs for git bash usage issue
...
When using boot2docker through git bash, there is a nasty issue when trying to share a folder, due to how git bash parses the URIs. The issue is explained in [issue #12751 ](https://github.com/docker/docker/issues/12751 ) but needs more visibility in the docs.
Signed-off-by: Matthieu Larcher <github@ringabell.org >
2015-07-03 09:07:44 +02:00
7b0666f568
Merge pull request #14378 from airandfingers/patch-2
...
Edit "Working with Containers" page for readability
2015-07-03 08:43:50 +02:00
0ed7fd46b6
Edit "Working with Containers" page for readability
...
Signed-off-by: ayoshitake <airandfingers@gmail.com >
2015-07-02 23:10:36 -07:00
801a7fed19
api/server: Add missing json check
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-07-03 08:52:32 +08:00
87cfc2bc58
client/load: tiny typo fix
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-07-03 08:37:27 +08:00
d7326bd787
Merge pull request #14190 from ankushagarwal/experimentalDownloadLink
...
Document the location of experimental binary
2015-07-02 20:14:15 -04:00
7dc8e77cc7
Merge pull request #14295 from Lennie/patch-1
...
Fix for broken link
2015-07-02 19:24:57 -04:00
7bf26d44b0
Validate status= filter to docker ps
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-02 16:12:42 -07:00
8630ad1530
Fix dockerize-disk.sh working in non-en locale
...
One part of script relies on messages that are
output by some system tool. In non-en locale
those messages get localized which breaks the
script.
This patch enforces en locale for that system
tool.
Signed-off-by: Maxim Kulkin <maxim.kulkin@gmail.com >
2015-07-02 16:08:12 -07:00
a45576ab40
Merge pull request #14104 from mariusGundersen/patch-1
...
Spelling
2015-07-03 01:03:58 +02:00
01cfb70b0a
Document the location of experimental binary
...
Some devs might want to download the binary directly,
especially for systems where the install script does not
work.
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-02 15:59:13 -07:00
5b2d14fbbf
Merge pull request #14349 from hqhq/hq_error_for_todisk
...
Show error message when todisk failed
2015-07-02 15:56:56 -07:00
9356c76d9f
Merge pull request #14064 from jfrazelle/no-cache-for-experimental
...
add no cache for experimental builds bc cloudfront
2015-07-02 17:24:29 -04:00
0cc664fae3
add no cache for experimental builds bc cloudfront
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-02 13:50:11 -07:00
88f02c2f33
Add 500 check for registry api call
...
Partially Addresses #14326
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-02 12:41:24 -07:00
5400d8873f
Make /proc, /sys, /dev readonly for readonly containers
...
If a container is read-only, also set /proc, /sys,
& /dev to read-only. This should apply to both privileged and
unprivileged containers.
Note that when /dev is read-only, device files may still be
written to. This change will simply prevent the device paths
from being modified, or performing mknod of new devices within
the /dev path.
Tests are included for all cases. Also adds a test to ensure
that /dev/pts is always mounted read/write, even in the case of a
read-write rootfs. The kernel restricts writes here naturally and
bad things will happen if we mount it ro.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-02 19:08:00 +00:00
71f8ca30ce
Merge pull request #14359 from cpuguy83/14354_events_send_resp_immediately
...
Send resp immediately on GET /events
2015-07-02 12:00:45 -07:00
f0ed68f852
Merge pull request #14292 from calavera/fix_driver_detection
...
Fix implicit DeviceMapper selection
2015-07-02 11:33:55 -07:00
e3d488e280
Merge pull request #13851 from ewindisch/no-allow-rc4
...
Remove RC4 from the list of registry cipher suites
2015-07-02 13:11:40 -04:00
36f6b7331e
Merge pull request #14350 from moysesb/fixdoc
...
Fixed outdated comment.
2015-07-02 10:06:31 -07:00
0a376291b2
Fix implicit DeviceMapper selection
...
DeviceMapper must be explicitly selected because the Docker binary might not be linked to the right devmapper library.
With this change, Docker fails fast if the driver detection finds the devicemapper directory but the driver is not the default option.
The option `override_udev_sync_check` doesn't make sense anymore, since the user must be explicit to select devicemapper, so it's being removed.
Docker fails to use devicemapper only if Docker has been built statically unless the option was explicit.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-02 09:21:27 -07:00
d0a299c027
Send resp immediately on GET /events
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-07-02 11:45:24 -04:00
f58758ce36
Merge pull request #14355 from vdemeester/log-to-logrus
...
Replace latest log by logrus
2015-07-02 08:20:16 -07:00
10e114fb95
Replace latest log by logrus
...
Related to #11618 and #11614
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-02 16:11:52 +02:00
9300eb6684
Merge pull request #13825 from Mashimiao/unify-help-message
...
Unify docker commands' usage in man and help
2015-07-02 15:31:57 +02:00
9b782d3af3
add support for maximum log size, and max number of log files
...
Signed-off-by: wlan0 <sidharthamn@gmail.com >
2015-07-02 06:26:06 -07:00
ddc9bc6c56
Merge pull request #14341 from ankushagarwal/ubuntuUglyDocs
...
Fix missing newline
2015-07-02 15:17:27 +02:00
8b0e40bb38
Fixed outdated comment.
...
Synchronized the comment for httputils/mimetype.DetectContentType
with the actual code.
Signed-off-by: Moysés Borges <moysesb@gmail.com >
2015-07-02 08:17:11 -03:00
af7f81878f
Show error message when todisk failed
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-02 18:24:35 +08:00
f38232b475
Unify docker commands' usage in man and help
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-07-02 10:33:26 +08:00
942a0f994f
Fix missing newline
...
Fixes #14340
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-01 18:16:22 -07:00
98f988f62c
Merge pull request #13187 from shishir-a412ed/docker_inspect_issue
...
Flag Addition: --type flag added for docker inspect command
2015-07-02 01:31:15 +02:00
f51d77f86e
Merge pull request #12548 from camallen/docker_host_docs
...
add note in docs about DOCKER_HOST env var overriding unix socket config
2015-07-02 01:27:47 +02:00
75864dcb38
Merge pull request #14324 from aboch/ds
...
Stats API to retrieve nw stats from libnetwork
2015-07-01 15:19:46 -07:00
9b9a4b2e59
Merge pull request #14329 from runcom/14318-fix-regression-cap-add-drop-as-single-string
...
Fix regression in parsing capabilities
2015-07-01 13:28:07 -07:00
1751b40b04
Merge pull request #14333 from LK4D4/fix_tags
...
Fix windows tag in pkg/term
2015-07-01 16:27:57 -04:00
9b42de0e57
remove bashism
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
2015-07-01 22:19:24 +02:00
7b3492df0c
Fix windows tag in pkg/term
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-01 13:16:16 -07:00
21ec389fe1
mention the daily experimental build
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
2015-07-01 22:12:57 +02:00
10a3061c5f
Fix regression in parsing capabilities list when a single string is given
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-01 21:28:02 +02:00
8b40e44c39
Stats API to retrieve nw stats from libnetwork
...
- Container networking statistics are no longer
retrievable from libcontainer after the introduction
of libnetwork. This change adds the missing code
for docker daemon to retireve the nw stats from
Endpoint.
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-07-01 11:15:16 -07:00
358c022cac
Merge pull request #14321 from MattHauglustaine/14266-return-envfile-parse-bufio-error
...
Return bufio error when parsing env file
2015-07-01 11:06:33 -07:00
53b897ce9c
Merge pull request #13744 from turtlebender/feature/whitelist-label-for-commit
...
Support LABEL as change for `docker commit`
2015-07-01 10:57:33 -07:00
5fd0563505
Merge pull request #14322 from runcom/14320-fix-regression-attach-cont-notfound
...
Return not found before hijacking in attach/wsattach
2015-07-01 13:22:03 -04:00
be5e1498c3
Merge pull request #14134 from vdemeester/runconfig-test-coverage
...
Refactor and add tests coverage on package runconfig
2015-07-01 10:15:26 -07:00
88d32a6109
Fix regression in containers attach/wsattach api, return not found before hijacking
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-01 18:16:17 +02:00
2cb74e6915
Flag Addition: --type flag added for docker inspect command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-07-01 12:14:01 -04:00
1d7a62d776
Merge pull request #14314 from sunyuan3/TestRmiBlank
...
Add the expected error verification for TestRmiBlank.
2015-07-01 09:09:56 -07:00
d02540a44a
Merge pull request #14305 from aboch/nwst
...
Import latest libnetwork
2015-07-01 09:07:40 -07:00
0dadf11bec
Add unit tests for ParseEnvFile.
...
Add unit tests of the ParseEnvFile function. Test for:
* good file
* empty file
* non existent file
* badly formatted file
Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com >
2015-07-01 17:43:03 +02:00
e848494017
Return bufio error if set in ParseEnvFile
...
Return an error value if bufio failed to properly read a token.
Avoids running a container with partial environment.
Fixes : #14266
Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com >
2015-07-01 17:17:48 +02:00
2179dd00dd
Add the expected error verification for TestRmiBlank.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-07-01 19:34:43 +08:00
636ec6383b
Fixing the table rendering in reference/run.md
...
Signed-off-by: Peeyush Gupta <gpeeyush@linux.vnet.ibm.com >
2015-07-01 16:07:39 +05:30
d4aec5f0a6
Refactor test and add coverage to runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-01 10:16:36 +02:00
82b444e3fa
Fixing Wheezy link
...
Signed-off-by: Quentin Tayssier <qtayssier@gmail.com >
2015-07-01 13:01:00 +09:00
126b1b2923
Import latest libnetwork
...
- To bring in interface which retrieves endpoint statistics
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-06-30 14:16:16 -07:00
bb2cd98b28
Merge pull request #14238 from rileytg/fix-graphdb-test-typo
...
fixed typo in graphdb_test failure message
2015-06-30 14:15:02 -07:00
27af9a52a1
Merge pull request #14303 from cpuguy83/fix_nat_import
...
Nat was moved to pkg/nat
2015-06-30 13:56:11 -07:00
d9af8551f8
Nat was moved to pkg/nat
...
Somehow this import was missed
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-30 16:48:17 -04:00
a2621ac6da
Merge pull request #14294 from mavenugo/bnone
...
fixed incorrect assumption on --bridge=none treated as disable network
2015-06-30 13:40:52 -07:00
caa4acc7b1
Merge pull request #14297 from pwaller/move-nat-pkg
...
Move /nat to /pkg/nat
2015-06-30 13:23:30 -07:00
c9328c6ccf
fixed incorrect assumption on --bridge=none treated as disable network
...
libnetwork host, none and bridge driver initialization is incorrectly
disabled if the daemon flag --bridge=none. The expected behavior of
setting --bridge as none is to disable the bridge driver alone and let
all other modes to be operational.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-30 13:04:28 -07:00
a453da2114
Merge pull request #13962 from unclejack/shrink_docs_images
...
docs: shrink some big images
2015-06-30 21:55:44 +02:00
2de810df3f
Merge pull request #14231 from ankushagarwal/checkValidPort
...
Validate hostConfig on daemon. Check for invalid port specifications
2015-06-30 15:54:24 -04:00
2d8dd6b93e
Merge pull request #12846 from dave-tucker/network_integration
...
integration-cli: Add Tests for IPv6 and Fixed CIDR
2015-06-30 12:52:07 -07:00
f13b40f6e7
Merge pull request #13524 from calavera/plugin_json_spec
...
Plugins JSON spec.
2015-06-30 15:44:48 -04:00
477201a295
Validate Port specifications on daemon side
...
Fixes #14230
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-06-30 12:14:49 -07:00
bb364ff459
Merge pull request #14268 from unclejack/lower_allocations_execdriver
...
daemon: lower allocations
2015-06-30 12:12:06 -07:00
96417dd6c3
Merge pull request #14211 from icecrime/roadmap
...
Add ROADMAP.md
2015-06-30 11:40:45 -07:00
d6da3736d7
Fix for broken link
...
The link pointed to experimental.md, but that didn't exist. It looks like README.md was intended. Probably experimental.md was renamed.
Signed-off-by: Leen Besselink <github@consolejunkie.net >
2015-06-30 20:10:12 +02:00
aa5fb884b4
Add ROADMAP.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-30 10:17:08 -07:00
9c2374d196
Move /nat to /pkg/nat
...
By convention /pkg is safe to use from outside the docker tree, for example
if you're building a docker orchestrator.
/nat currently doesn't have any dependencies outside of /pkg, so it seems
reasonable to move it there.
This rename was performed with:
```
gomvpkg -vcs_mv_cmd="git mv {{.Src}} {{.Dst}}" \
-from github.com/docker/docker/nat \
-to github.com/docker/docker/pkg/nat
```
Signed-off-by: Peter Waller <p@pwaller.net >
2015-06-30 17:43:17 +01:00
90024b952c
Merge pull request #14267 from ankushagarwal/memory-swap-docs
...
Typo in memory-swap flag
2015-06-30 05:48:47 -07:00
c1477db04f
daemon: lower allocations
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-06-30 01:45:31 +03:00
20467faf13
Merge pull request #14269 from vdemeester/pkg-parsers-test-coverage
...
Add and refactor tests for pkg/parsers{,*}
2015-06-29 15:24:14 -07:00
18d5d3ba03
Merge pull request #14133 from Microsoft/10662-netmode
...
Windows: Refactor network modes
2015-06-29 15:02:42 -07:00
475ae0889e
Merge pull request #14218 from calavera/fix_exec_user
...
Default process user to container config user.
2015-06-29 14:31:45 -07:00
b81472a6d8
Add test coverage to pkg/parsers
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-06-29 22:30:11 +02:00
c5e6a4b307
Windows: Refactor network modes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-29 13:13:55 -07:00
e7e48bcfdd
Typo in memory-swap flag
...
Fixes #14253
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-06-29 13:12:08 -07:00
0faa4518ed
Default process user to container config user.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-29 12:52:05 -07:00
77396bd66a
Merge pull request #14222 from erikdw/fix-casing-of-vmware-in-main-doc
...
Use proper casing for VMware in README
2015-06-29 15:16:01 -04:00
4fd284bde0
Merge pull request #14244 from ankushagarwal/patch-1
...
Update README.md
2015-06-29 11:53:25 -07:00
f05e503aec
Mention network driver plugins and point to protocol docs
...
Signed-off-by: Michael Bridgen <mikeb@squaremobius.net >
Signed-off-by: Tom Denham <tom.denham@metaswitch.com >
2015-06-29 19:08:23 +01:00
0aea0e4072
Merge pull request #14261 from jeremyprice/basics-doc-typo-fix
...
fix(docs): removed extra quote character in heading
2015-06-29 11:05:54 -07:00
d543a01e17
Merge pull request #14061 from runcom/clean-builder-daemon-config
...
Add struct to configure Builder commit
2015-06-29 11:04:05 -07:00
333ac3a3eb
Plugins JSON spec.
...
Allow full configuration of external plugins via a JSON document.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-29 10:32:18 -07:00
cb2079e218
Merge pull request #14193 from stevvooe/concurrent-pull-fix
...
Attempt to protect on disk image store with mutex
2015-06-29 10:28:02 -07:00
985fd1c6cc
Merge pull request #14243 from moxiegirl/carry-pr-13323
...
Closes #13323 and carries
2015-06-29 08:33:34 -07:00
d612782023
fix(docs): removed extra quote character in heading
...
Signed-off-by: Jeremy Price <jprice.rhit@gmail.com >
2015-06-29 09:46:50 -05:00
a386a00a3c
Merge pull request #14147 from ericsage/patch-1
...
Fix Typo in experimental docs
2015-06-29 10:41:09 -04:00
e1afbbf247
Merge pull request #13876 from vdemeester/pkg-jsonlog-test-coverage
...
Add test coverage to pkg/jsonlog
2015-06-29 16:39:56 +02:00
2dfb7f3b7d
integration-cli: Add Tests for IPv6 and Fixed CIDR
...
This patch adds tests for the `--ipv6` and `--fixed-cidr` daemon flags
Signed-off-by: Dave Tucker <dt@docker.com >
2015-06-29 14:45:00 +01:00
078b23a37d
Closes #13323 and carries
...
Entering comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-29 06:18:41 -07:00
37846bff58
Remove RC4 from the list of registry cipher suites
...
The registry client's TLS configuration used the
default cipher list, including RC4. This change
copies the default cipher list from Golang 1.4 and
removes RC4 from that list. RC4 ciphers are considered
weak and vulnerable to a number of attacks.
Uses the tlsconfig package to define allowed ciphers.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-06-29 09:15:13 -04:00
9bbdaa9280
Update README.md
...
cgroups and namespaces links are broken. They point to blog.dotcloud.com which is dead. Updating the links to point to informative pages.
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-06-29 01:10:27 -07:00
40a41ffdf0
Merge pull request #14198 from cpuguy83/14170_fix_entrypoint_as_string
...
Fix unmarshalling of Command and Entrypoint
2015-06-28 19:47:26 -06:00
c9175d681b
fixed typo in graphdb_test failure message
...
Signed-off-by: Riley Guerin <rileytg.dev@gmail.com >
2015-06-28 16:54:05 -07:00
2cca502c05
update testcase mount/sharedsubtree_linux_test.go
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-06-27 14:34:32 -04:00
e7a9a0bed8
Add test coverage to pkg/jsonlog
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-06-27 10:13:47 +02:00
9030f53165
Use proper casing for VMware in README
...
Signed-off-by: Erik Weathers <erikdw@gmail.com >
2015-06-26 19:16:29 -07:00
7571e6d900
Merge pull request #13779 from estesp/tls-confusing-error
...
Add better client-side error for failed certificate verification
2015-06-27 02:08:04 +02:00
d175ef6773
Add better client error for client certificate failure (missing or denied)
...
This adds a more meaningful error on the client side so the "bad
certificate" error coming from the TLS dial code has some context for
the user.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-06-26 16:23:05 -07:00
389b806945
Merge pull request #13740 from Microsoft/10662-securitywarning
...
Windows: Security warning based on server OS
2015-06-26 13:09:03 -07:00
2d15b35f7a
Merge pull request #14120 from mdavranche/tempDir
...
tempDir (in the root dir), must be created after the root dir.
2015-06-26 11:46:55 -07:00
126529c6d0
Windows: Security warning based on server OS
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-26 10:33:45 -07:00
31ae9d876a
Merge pull request #14126 from laijs/fix-file-permission
...
docs: fix file's permissions
2015-06-26 10:08:06 -07:00
f46ac8c51c
Merge pull request #14162 from dnozay/patch-1
...
more friendly message for when docker daemon is not running.
2015-06-26 09:27:21 -07:00
17d6f00ec2
Fix unmarshalling of Command and Entrypoint
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-26 09:00:57 -07:00
b96f109344
Merge pull request #12876 from tagomoris/logger-driver-fluentd
...
Add new Logging driver "fluentd"
2015-06-26 08:41:10 -07:00
b49c9850a6
Merge pull request #14200 from moxiegirl/create-install-index
...
Adding installation index
2015-06-26 02:14:44 -07:00
d5de3ed09e
Adding installation index
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-26 02:12:27 -07:00
3c5b17cf7e
Fix a broken anchor tag on the CLI builder page
...
Signed-off-by: Chris McKinnel <chrismckinnel@gmail.com >
2015-06-26 09:43:30 +01:00
7eac23cf8d
Attempt to protect on disk image store with mutex
...
During `(*Graph).Register, there was no protection on adding new layers
concurrently. In some cases, this resulted in corruption of a layer by creating
the directory but not the underlying data. This manifested in several different
IO errors reported in the client. This attempts to fix this by adding a mutex
by Image ID to protect the Register operation.
We do not completely understand the root cause of this corruption other than
the result is somehow tied to this particular function. This fix has been
confirmed to address the issue through testing.
Unfortunately, this fix does not address existing corruption. The user will
have to remove and re-pull the corrupt layer to stop the error from happening
in the future. This change only ensures that the layer will not become corrupt.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-06-25 20:16:37 -07:00
c7ece73fa4
Merge pull request #14046 from mattmoor/token-investigation
...
Unconditionally use AuthTransport.
2015-06-25 19:07:10 -07:00
78f4a9dad4
Update English expressions by review comments
...
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com >
2015-06-26 11:04:26 +09:00
361a582ba0
Add new logging driver: fluentd
...
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com >
2015-06-26 11:03:11 +09:00
dd408891ba
Merge pull request #14139 from jlhawn/fix_build_with_auth
...
[api, builder] Fix build auth config
2015-06-25 17:39:36 -07:00
2e078b24b8
Merge pull request #14187 from Microsoft/docs-version
...
Fix docs for #14047
2015-06-25 16:07:27 -07:00
67473c6d06
overlay: Export metadata for container and image in docker-inspect
...
Export metadata for container and image in docker-inspect when overlay
graphdriver is in use. Right now it is done only for devicemapper graph
driver.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-06-25 17:33:20 -04:00
857e0ba32e
Fix docs for #14047
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-25 13:39:12 -07:00
50a1d0f0ef
Merge pull request #14142 from fl0yd/patch-1
...
Update plugins_volume.md
2015-06-25 13:17:02 -07:00
be33d13f67
Merge pull request #14183 from ChanderG/master
...
Fix minor typo in CONTRIBUTING.md
2015-06-25 13:16:04 -07:00
de9c5473f7
Merge pull request #14178 from csarrazi/patch-1
...
[Easy-Pick] [Documentation] Fix broken links for Fedora
2015-06-25 13:15:26 -07:00
15d8e7bc6b
Merge pull request #14161 from laijs/man_pages
...
man: convert `docker/docs/man` to `docker/man`
2015-06-25 13:12:46 -07:00
8c8e8d624f
Merge pull request #14156 from HuKeping/master
...
Docs: fix wrong example of API Exec
2015-06-25 13:09:36 -07:00
7201127cfb
Merge pull request #14189 from moxiegirl/carry-14079
...
Splitting out the cli command into parts.
2015-06-25 12:05:56 -07:00
561bfb268d
Splitting out the cli command into parts.
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-25 12:02:41 -07:00
c281549610
Merge pull request #14030 from estesp/init-memory-swappiness
...
Initialize swappiness in libcontainer cgroups template
2015-06-25 11:36:54 -07:00
e8b87cfce1
Merge pull request #13907 from chenchun/exitcode
...
Set exit code of old running container as 137
2015-06-25 10:57:48 -07:00
81d6f60935
Merge pull request #14182 from moxiegirl/fix-logging
...
Breaking logging driver material out of run
2015-06-25 10:28:36 -07:00
e0cfe36b8e
Merge pull request #14163 from mrjana/cnm_integ
...
Fix endpoint leave failure for --net=host mode
2015-06-25 10:17:03 -07:00
e9ac7d24a7
Update utils.go
...
make error message when running commands while daemon is down more user-friendly.
```
docker@54.175.201.239 ~: sudo service docker stop
docker stop/waiting
docker@54.175.201.239 ~: docker images
Get http:///var/run/docker.sock/v1.19/images/json : dial unix /var/run/docker.sock: no such file or directory. Are you trying to connect to a TLS-enabled daemon without TLS?
```
Signed-off-by: Damien Nozay <damien.nozay@gmail.com >
2015-06-25 10:15:52 -07:00
b0b2f979c7
Set exit code of old running container as 137
...
Signed-off-by: Chun Chen <chenchun.feed@gmail.com >
2015-06-25 22:30:09 +08:00
e594a2fb54
Fix minor typo in CONTRIBUTING.md
...
Signed-off-by: ChanderG <chandergovind@gmail.com >
2015-06-25 18:23:38 +05:30
31dd97f4ad
Breaking logging driver material out of run
...
- creating index which is overview of configuring logs
- linking to individual journald/fluent material
- leaving behind table and link to index in run
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-25 05:00:49 -07:00
62213219dc
Fix broken fedora documentation
...
The documentation is currently broken for the fedora page. This PR fixes missing the markup.
Signed-off-by: Charles Sarrazin <charles@sarraz.in >
2015-06-25 10:16:46 +02:00
4ab8b88286
Merge pull request #13973 from calavera/fix_zfs_options_doc_location
...
Move zfs options doc to the storage section.
2015-06-24 15:52:13 -07:00
9bb69f9726
Fix endpoint leave failure for --net=host mode
...
When a container is started with `--net=host` with
a particular name and it is subsequently destroyed,
then all subsequent creations of the container with
the same name will fail. This is because in `--net=host`
the namespace is shared i.e the host namespace so
trying to destroy the host namespace by calling
`LeaveAll` will fail and the endpoint is left with
the dangling state. So the fix is, for this mode, do
not attempt to destroy the namespace but just cleanup
the endpoint state and return.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-06-24 12:33:52 -07:00
221fa4c3d1
Docs: fix wrong example of API Exec
...
The last "," should not shown up, otherwise you will get the error
back as below:
- invalid character '}' looking for beginning of object key string.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-06-25 02:03:27 +08:00
afd4d544cf
Merge pull request #14119 from moxiegirl/fix-heading-blanks
...
Fix heading blanks
2015-06-24 08:35:42 -07:00
85e2957409
man: convert docker/docs/man to docker/man
...
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com >
2015-06-24 23:31:12 +08:00
0a9c580fad
Merge pull request #14153 from feixueliantian1/typo
...
Fix Typo in stdcopy.go
2015-06-24 16:11:20 +03:00
16be453e0f
Fix Typo in stdcopy.go
...
Signed-off-by: Yu Chengxia <yuchengxia@huawei.com >
2015-06-24 15:00:14 +08:00
4466d00534
Typo
...
Signed-off-by: Eric Sage <eric.david.sage@gmail.com >
2015-06-23 19:41:55 -07:00
0835b20ace
Update plugins_volume.md
...
Signed-off-by: Mark Oates <fl0yd@me.com >
2015-06-23 15:30:36 -07:00
02c7bbefb8
[api, builder] Fix build auth config
...
With the 1.7 release, we introduced a change to how we store registry
credentials, but the build API endpoint did not expect a change in the format
of that file. This patch fixes this problem so that you can again pull private
images during `docker build`.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-06-23 12:58:17 -07:00
4dd1d1bfa5
Merge pull request #13810 from d23/syslog-facility
...
Add syslog-facility option
2015-06-23 12:05:15 -07:00
d5721f0385
Merge pull request #13833 from Microsoft/10662-dockerbuild
...
Windows: Start docker build working
2015-06-23 11:46:56 -07:00
aa4f495cae
Merge pull request #13966 from mountkin/fix-stats-goroutine-leak
...
fix the goroutine leak in the stats API if the container is not running
2015-06-23 10:06:35 -07:00
5c93c265f6
Merge pull request #14047 from Microsoft/10662-versionadd
...
Add build time to version and tidy output
2015-06-23 09:57:31 -07:00
f23698bb14
docs: fix file's permissions
...
The README.md and the *.png should not have the executable
permissions, remove them.
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com >
2015-06-24 00:09:27 +08:00
9b5875eb9d
Merge pull request #14114 from HuKeping/master
...
Remove useless conversion
2015-06-23 08:10:34 -07:00
250ce20fee
Remove useless conversion
...
It is already type float.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-06-24 00:47:08 +08:00
41f69883d2
tempDir (in the root dir), must be created after the root dir.
...
Signed-off-by: mikael.davranche <mikael.davranche@corp.ovh.net >
2015-06-23 14:53:18 +02:00
960cbd2c8d
Fixes #14117
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-23 05:17:20 -07:00
e81861ea54
Closes #14055 for anchal
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-23 05:14:53 -07:00
609e7b0a55
Add --log-opt to specify facility for syslog driver
...
Signed-off-by: Dennis Docter <dennis@d23.nl >
2015-06-23 14:04:25 +02:00
1cbf5a54da
fix the goroutine leak in the stats API if the container is not running
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-06-23 19:38:15 +08:00
cb6ca19b53
Merge pull request #14110 from webwurst/patch-2
...
Typo
2015-06-23 12:34:16 +02:00
8861d65e97
pkg/devicemapper: external device activation
...
Reported-by: Sheng Yang <shend.yang@rancher.com >
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-06-22 20:28:15 -04:00
51264fa63c
Merge pull request #14111 from bfirsh/update-compose-swarm-docs
...
Fix compose/swarm/network docs
2015-06-22 17:23:57 -07:00
fe1f210c42
Update documentation for compose/swarm/network
...
Thanks to @aanand for help debugging
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-06-22 16:45:22 -07:00
1797f03760
Typo
...
Signed-off-by: Tobias Bradtke <webwurst@gmail.com >
2015-06-23 00:52:16 +02:00
74be85500a
Merge pull request #12812 from sharidas/8373-display-docker-ps-host
...
Display when a container is in --net=host in docker ps
2015-06-22 14:06:07 -07:00
87eae0d659
Add branch and build time to version
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-22 13:00:27 -07:00
e02947b236
Add link to compose/swarm/network to readme
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-06-22 11:38:46 -07:00
2e7399a52b
spelling
...
Signed-off-by: Marius Gundersen <me@mariusgundersen.net >
2015-06-22 20:04:06 +02:00
182d2668a1
Clarify .dockerignore example for Markdown files
...
The current documentation correctly states that dockerignore pattern
searches are non-recursive. However, the example given for Markdown
files seems to contradict this by saying that `*.md` will exclude *all*
Markdown files. This commit clarifies the situation by explicitly
specifying that `*.md` will only exclude files in the root directory of
the project.
Signed-off-by: Tim Wraight <tim.wraight@tangentlabs.co.uk >
2015-06-22 17:53:05 +01:00
a7116c5e2b
Merge pull request #14101 from aanand/compose-swarm-networking-guide
...
Add experimental Compose/Swarm/multi-host networking guide
2015-06-22 09:47:33 -07:00
f39b9a0b0f
Merge pull request #14071 from mavenugo/mhnet
...
Vendoring libnetwork 83743db8ceb2bdbfa0960d9a54ed2f98df4ea846
2015-06-22 08:35:18 -07:00
a5f6407c5b
Add experimental Compose/Swarm/multi-host networking guide
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-06-22 08:33:20 -07:00
1a28fb7583
Added entries for aryabhata, bhaskara, brahmagupta, mahavira, panini and varahamihira - ancient Indian mathematicians
...
Signed-off-by: VinayRaghavanKS <raghavan.vinay@gmail.com >
2015-06-22 19:50:07 +05:30
739996c1d7
Adding container to secondary network to support port mapping
...
With publish-service and default-network support, a container could be
connected to a user-defined network that is backed by any driver/plugin.
But if the user uses port mapping or expose commands, the expectation
for that container is to behave like existing bridge network.
Thanks to the Libnetwork's CNM model, containers can be connected
to the bridge network as a secondary network in addition to the
user-specified network.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-22 04:15:57 -07:00
1e59169509
Reworked ReleaseNetwork to make use of libnetwork's new LeaveAll API
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-22 04:15:57 -07:00
53b0f686f7
Removed the default "bridge" in builder
...
Now that the default network mode is "default" and this mode is chosen
even if the mode is empty string, it is not correct to have builder
still pointing to "bridge" as default (though this is daemon default).
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-22 04:15:56 -07:00
508065a7ad
Vendoring in libnetwork for native multihost networking
...
- brings in vxlan based native multihost networking
- added a daemon flag required by libkv for dist kv operations
- moved the daemon flags to experimental
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-22 04:15:41 -07:00
8a9ed09746
Display when a container is in --net=host in docker ps
...
Display */tcp, */udp when a container is in --net=host in docker ps
Signed-off-by: Sujith Haridasan <sujith.h@gmail.com >
2015-06-22 11:44:33 +05:30
abb85f822d
Merge pull request #14085 from moxiegirl/1.7-release-notes
...
Commenting out the release-notes for 1.6
2015-06-21 20:46:45 -07:00
efef353a29
Commenting out the release-notes for 1.6
...
Original text
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-21 20:41:43 -07:00
c782be0e2a
Merge pull request #14062 from runcom/cleanup-dead-code
...
Remove dead code
2015-06-21 16:01:19 -07:00
4548d3fb77
Merge pull request #14074 from sdurrheimer/master
...
Update the zsh completion
2015-06-21 15:43:09 -07:00
7491f9a9c1
Merge pull request #12099 from moysesb/12078-binary_remote_context
...
Handle binary remote contexts when creating builder jobs.
2015-06-21 13:59:26 -07:00
b2cc6f1b47
Update the zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
2015-06-21 17:33:07 +02:00
fef0e84b2d
Merge pull request #14051 from mavenugo/services
...
experimental services ui
2015-06-20 18:24:37 -07:00
67f9bbcbd4
Merge pull request #11907 from gcuisinier/11094-allow-import-from-file2
...
fix #11094 - Allow 'docker import' to load from local files
2015-06-20 12:17:58 -07:00
4736b17315
Initial Services docs
...
Signed-off-by: Dave Tucker <dt@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-20 11:04:25 -07:00
1ac350a0ec
Support for --publish-service flag in docker run
...
This commit makes use of the CNM model supported by LibNetwork and
provides an ability to let a container to publish a specified service.
Behind the scenes, if a service with the given name doesnt exist, it is
automatically created on appropriate network and attach the container.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-20 11:03:38 -07:00
927d13bc3c
Remove dead code
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-06-20 19:14:15 +02:00
a93a5ee50a
Merge pull request #14054 from konstruktoid/issue_14045
...
rpm name and location
2015-06-20 07:14:22 -07:00
7046651b87
Add struct to configure Builder commit instead of using one defined in daemon
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-06-20 12:53:47 +02:00
52e193bed7
Implemented as proposed by @tianon and @ypid. Restores the default behavior (using xz compression).
...
* `--compression=none` and `--no-compression` to disable compression.
* `--compression=auto` to use the default compression (enabled by default).
* `--compression=xz` to use xz compression (default compression).
* `--compression=gz` to use gzip compression.
Signed-off-by: Robin Schneider <ypid@riseup.net >
2015-06-20 12:14:49 +02:00
3f64b76d4c
work on #11094 allow import from local file
...
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net >
2015-06-20 09:04:43 +02:00
c3997daeb5
Merge pull request #14052 from Microsoft/10662-fixcgroupcheck
...
Windows: Fix cgroup regression
2015-06-19 21:17:39 -04:00
e5ded9c378
Merge pull request #13997 from runcom/drop-old-client
...
Error out if client API version is too old
2015-06-19 17:05:39 -07:00
a0a010e2e3
rpm name and location
...
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
2015-06-20 01:14:58 +02:00
9d0ed1dea0
Windows: Fix cgroup regression
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-19 15:29:47 -07:00
7313a9ae9c
Merge pull request #14044 from duglin/MakeDocs
...
Add back top-level "make docs"
2015-06-19 12:42:11 -07:00
d48bface59
Support downloading remote tarball contexts in builder jobs.
...
Signed-off-by: Moysés Borges <moysesb@gmail.com >
2015-06-19 16:35:00 -03:00
7ce20fad99
Merge pull request #13780 from LK4D4/use_checkv
...
Remove timer and use -check.v for tests formatting
2015-06-19 11:34:31 -07:00
de6d2603f9
Merge pull request #13848 from estesp/tls-server-client-cipher-cleanup
...
Split client and server cipher suite list in TLS defaults
2015-06-19 11:08:19 -07:00
3ee67caf3b
Merge pull request #14032 from lizf-os/fix-sysinfo-regression
...
Fix sysinfo regression
2015-06-19 11:00:13 -07:00
c2315102ff
Unconditionally add AuthTransport.
...
Today, endpoints implementing v2 cannot properly fallback to v1 because the underlying transport that deals with authentication (Basic / Token) doesn't get annotated.
This doesn't affect DockerHub because the DockerHub endpoint appears as 'https://index.docker.io/v1/ ' (in .dockercfg), and the 'v1' tricks this logic just long enough that the transport is always annotated for DockerHub accesses.
Signed-off-by: Matt Moore <mattmoor@google.com >
2015-06-19 10:12:52 -07:00
2bc0d2bf51
Add back top-level "make docs"
...
Just to make life easier on devs so they don't need to 'cd' into
the docs dir just to test their docs edits. This doesn't do anything
more than "cd docs && make docs" so that all of the smarts are still
in the docs's Makefile and not in docker's.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-06-19 09:42:39 -07:00
df73d5e0cd
Merge pull request #14023 from mavenugo/net_ui
...
experimental network ui
2015-06-19 09:26:05 -07:00
742db1737c
attaching services api and UI chain to docker parent
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-19 09:19:09 -07:00
fb85a99f58
Add some cgroup related config check
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-06-19 13:47:48 +08:00
0c4c830289
Add check config for ext3 file system
...
Some distros still use ext3 as default file system, we should check
these configs as well.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-06-19 13:45:07 +08:00
4398693201
Fix sysinfo regression
...
The cleanup to sysinfo package introduced a regression.
If memory cgroup isn't supported and --memory is specified when
starting a container, we should return info instead of nil in
checkCgroupMem(), otherwise we'll access a nil pointer.
Signed-off-by: Zefan Li <lizefan@huawei.com >
2015-06-19 09:44:23 +08:00
b3254dab49
Merge pull request #14031 from tianon/update-frozen-images
...
Update frozen busybox and hello-world images
2015-06-18 18:15:45 -07:00
4d171281bf
Update frozen busybox and hello-world images
...
These have both been updated to no longer include the empty "scratch" layer, and `hello-world` has a fix for http->https.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-18 17:09:57 -07:00
9e9d227677
Initialize swappiness in libcontainer cgroups template
...
By default, the cgroup setting in libcontainer's configs.Cgroup for
memory swappiness will default to 0, which is a valid choice for memory
swappiness, but that means by default every container's memory
swappiness will be set to zero instead of the default 60, which is
probably not what users are expecting.
When the swappiness UI PR comes into Docker, there will be docker run
controls to set this per container, but for now we want to make sure
*not* to change the default, as well as work around an older kernel
issue that refuses to allow it to be set when cgroup hiearchies are in
use.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-06-18 19:27:04 -04:00
1334a2fc39
Merge pull request #14028 from jfrazelle/fix-index-generation-experimental
...
fix s3_url for release script for experimental
2015-06-18 15:22:26 -07:00
0f0f5ecd57
fix s3_url for release script for experimental
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-18 14:54:40 -07:00
4253a1f87e
Remove timer and use -check.v for tests formatting
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-18 14:22:40 -07:00
d7544217dd
Merge pull request #13978 from cpuguy83/cleanup_sysinfo
...
cleanup sysinfo package
2015-06-18 22:27:32 +02:00
b1143f4cb0
Merge pull request #13218 from brahmaroutu/decoder_issue_gccgo
...
Decoder does not work properly with nested pointers using gcc
2015-06-18 13:22:28 -07:00
1487350b85
Merge pull request #14016 from vizv/patch-1
...
fix the url in article "Best practices for writing Dockerfiles"
2015-06-18 13:05:26 -07:00
ebef527b39
Merge pull request #13976 from icecrime/12934_carry
...
LXC execdriver compatibility with recent LXC versions
2015-06-18 15:08:55 -04:00
cca990c67a
Network UI / API docs
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-18 12:07:58 -07:00
da5a3e6dee
register libnetwork API and UI with docker parent chain
...
This commit also brings in the ability to specify a default network and its
corresponding driver as daemon flags. This helps in existing clients to
make use of newer networking features provided by libnetwork.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-18 12:07:58 -07:00
8ea1b54065
Merge pull request #14019 from jfrazelle/bump-version
...
Bump version
2015-06-18 11:25:19 -07:00
53f5f5b7f4
bump version to 1.8.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-18 10:47:53 -07:00
2e0e038fb2
Bump version to v1.7.0
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
(cherry picked from commit 0baf609845
2015-06-18 10:47:25 -07:00
3dd134ceca
Fix the url in comparison of "COPY" and "RUN curl"
...
From context on next line,`tar -xJC` implies
the file is `big.tar.xz` instead of `big.tar.gz`.
Signed-off-by: Wenxuan Zhao <viz@linux.com >
2015-06-18 12:33:46 -04:00
fc793bf1a3
Merge pull request #13830 from clnperez/check-apparmor-file-first
...
Check for apparmor file before reading it
2015-06-18 08:18:01 -04:00
910322a893
Error out if client API version is too old
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-06-18 11:03:07 +02:00
3cb9f7f6aa
add note about DOCKER_HOST env var overriding unix socket config
...
when trying to use docker without sudo and the DOCKER_HOST env var is set docker tries to connect to the specified host instead of using the unix socket.
Signed-off-by: Campbell Allen <campbell.allen@gmail.com >
2015-06-18 06:51:21 +01:00
423e6dc333
Merge pull request #14002 from moxiegirl/hugo-test-fixes
...
Hugo final 1.7 Documentation PR -- please read carefully
2015-06-17 22:00:09 -07:00
328dbd0aa2
Fixing seds, deleting old stuff
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upding sed, adding script to avoid redirects, remove mkdos
Signed-off-by: Mary Anthony <mary@docker.com >
Ignoring graphics with sed
Signed-off-by: Mary Anthony <mary@docker.com >
Fixing kitematic image
Signed-off-by: Mary Anthony <mary@docker.com >
Removing draft
Signed-off-by: Mary Anthony <mary@docker.com >
Fixing link
Signed-off-by: Mary Anthony <mary@docker.com >
removing from the menu
Signed-off-by: Mary Anthony <mary@docker.com >
Updatiing order of project material
Signed-off-by: Mary Anthony <mary@docker.com >
Removing from Regsitry v2 content per Olivier
Signed-off-by: Mary Anthony <mary@docker.com >
tweaking the touchup
Signed-off-by: Mary Anthony <mary@docker.com >
Removing include; only used four places; hugo global var replace
Signed-off-by: Mary Anthony <mary@docker.com >
Entering fixes from page-by-page
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-17 21:05:37 -07:00
baa1664478
Merge pull request #13991 from LalatenduMohanty/adding_new_scientists
...
Proposing Chandrasekhar, Khorana, Saha for name-generator
2015-06-17 21:06:24 -04:00
9b05aa6ee8
cleanup sysinfo package
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-17 20:41:14 -04:00
206acbcf89
Merge pull request #13070 from shishir-a412ed/cleanup_cmd_tag
...
Use distribution's ValidateRepositoryName for remote name validation.
2015-06-17 23:26:27 +02:00
d86345b9f7
Merge pull request #13575 from mattmoor/consistent-push-fallback
...
Make v2 push have v1-fallback behavior consistent with pull.
2015-06-17 13:41:58 -07:00
af845d42a5
Merge pull request #13988 from runcom/fix-old-code-path-removal
...
Remove missed code path for api < 1.12
2015-06-17 12:30:11 -07:00
c107e9d790
Merge pull request #13870 from lindenlab/pull-single-tag
...
Only request a single repository tag when pulling a specific image:tag
2015-06-17 15:29:39 -04:00
3fa2ddc452
Proposing Chandrasekhar, Khorana, Saha for name-generator
...
Signed-off-by: Lalatendu Mohanty <lmohanty@redhat.com >
2015-06-18 00:52:29 +05:30
b8301005ff
Use distribution's ValidateRepositoryName for remote name validation.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-06-17 15:15:16 -04:00
85d3b75dfd
Merge pull request #13896 from rhvgoyal/verify-base-uuid
...
devicemapper: Compare uuid of base device on startup
2015-06-17 11:30:04 -07:00
010470dd53
Merge pull request #13893 from mrunalp/update_libcontainer
...
Updates libcontainer to v2.2.1
2015-06-17 10:47:49 -07:00
3c177dc877
Windows: Docker build starting to work
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-17 10:41:28 -07:00
691ed6ef99
Check for apparmor file before reading it
...
I ran a single integration test and got an error that the file
/sys/module/apparmor/parameters/enabled doesn't exist. I don't have
apparmor installed. So, just check the file first to avoid a confusing
error.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
2015-06-17 11:58:17 -05:00
424bb26b6c
Merge pull request #13827 from moxiegirl/rpm-rhel-centos-fedora
...
RPMs update to installation guides
2015-06-17 08:29:33 -07:00
b6a6c56915
Remove missed code path for api < 1.12
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-06-17 17:00:48 +02:00
fe7b3658bd
prompt a cli login if receive 401 from registry v2 auth server
...
Signed-off-by: tgic <farmer1992@gmail.com >
2015-06-17 19:28:13 +08:00
9ad87523c0
Merge pull request #13292 from coolljt0725/add_bridge_nf_to_docker_info
...
Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info
2015-06-16 22:15:48 -07:00
a27d8f9aa4
Merge pull request #13975 from stevvooe/move-setup-init-layer
...
Move graph.SetupInitLayer to daemon package where it is used
2015-06-16 22:37:51 -04:00
57d12a0e0a
Add bridge-nf-call-iptables/bridge-nf-call-ipv6tables to docker info
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-06-17 09:19:11 +08:00
c06b05b11e
devicemapper: Compare uuid of base device on startup
...
It is easy for one to use docker for a while, shut it down and restart
docker with different set of storage options for device mapper driver
which will effectively change the thin pool. That means any of the
metadata stored in /var/lib/docker/devicemapper/metadata/ is not valid
for the new pool and user will run into various kind of issues like
container not found in the pool etc.
Users think that their images or containers are lost but it might just
be the case of configuration issue. People might use wrong metadata
with wrong pool.
To detect such situations, save UUID of base image and once docker
starts later, query and compare the UUID of base image with the
stored one. If they don't match, fail the initialization with the
error that UUID failed to match.
That way user will be forced to cleanup /var/lib/docker/ directory
and start docker again.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-06-16 21:12:27 -04:00
b7f887a9a2
Move graph.SetupInitLayer to daemon package where it is used
...
An inspection of the graph package showed this function to be way out of place.
It is only depended upon by the daemon code. The function prepares a top-level
readonly layer used to provide a consistent runtime environment for docker
images.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-06-16 16:50:56 -07:00
ba9db62e68
Merge pull request #13685 from yuchangchun1/tag_regx
...
add a more accurate error description for invalid tag name
2015-06-16 16:33:17 -07:00
f9ab04ad13
First pass of updates
...
Working docs
Update after check
update to centos 7 after second test
Updating with hopefully correct urls
Adding thaJetzah's comments
Updating with the new images
Updating after a visual check
Signed-off-by: Mary Anthony <mary@docker.com >
Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-16 16:29:11 -07:00
b6531d4ec3
Merge pull request #13961 from unclejack/linting_changes
...
linting changes
2015-06-16 15:55:18 -07:00
cb979edec0
Fix typo in lxc_template.go
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-16 15:19:43 -07:00
6089e679a2
Make LXC exec driver compatible with recent LXC where lxc.autodev is enabled by default
...
Update LXC to 1.1.2
Signed-off-by: Alex Samorukov <samm@os2.kiev.ua >
2015-06-16 15:19:00 -07:00
2f6e4fdb29
linting changes
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-06-17 01:16:57 +03:00
e69df2589c
Merge pull request #13198 from rhvgoyal/extend-docker-inspect
...
docker-inspect: Extend docker inspect to export image metadata related to graph driver
2015-06-16 15:03:14 -05:00
6e2662b3ba
just adding label to whitelist for commit command ( Fixes #13738 )
...
Signed-off-by: Tom Howe <turtlebender@gmail.com >
2015-06-16 13:59:16 -05:00
b1f984a29f
Merge pull request #13970 from cpuguy83/13964_fix_tlsverify_env
...
Fix DOCKER_TLS_VERIFY being ignored
2015-06-16 10:24:41 -07:00
b674ae0639
Move zfs options doc to the storage section.
...
Zfs options belong to the storage section, but they were added under the exec driver section.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-16 10:12:00 -07:00
c80256a31d
Merge pull request #13915 from tianon/validate-pkg
...
Add new "validate-pkg" bundlescript
2015-06-16 10:09:11 -07:00
952d030be2
Merge pull request #13955 from jfrazelle/update-install-script-w-experimental-gpg
...
add gpg fingerprint for experimental
2015-06-16 12:44:40 -04:00
2420ef8cf1
Merge pull request #13972 from tiborvass/update-go-net
...
Update vendored go.net to use golang.org/x/net canonical path
2015-06-16 09:37:07 -07:00
de6e6d4b28
Merge pull request #13965 from cpuguy83/fix_windows_vfs_import
...
Fix circular import for windows vfs graphdriver
2015-06-16 12:32:24 -04:00
5a6a33f7ac
Fix DOCKER_TLS_VERIFY being ignored
...
DOCEKR_TLS_VERIFY was being ignored because we were just checking if the
`-tlsverify` flag was set, not the actual value, which is defaulted to
the value of `os.Getenv("DOCKER_TLS_VERIFY") != ""`
The problem that this specifically fixes is where the client has set the
`DOCKER_TLS_VERIFY` env var but is connecting to a daemon that is not
verifed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-16 12:04:00 -04:00
d820e00aac
Update vendored go.net to use golang.org/x/net canonical path
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-06-16 11:40:04 -04:00
49834e8d59
Fix circular import for windows vfs graphdriver
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-16 09:08:10 -04:00
57aa0248af
Merge pull request #13960 from yous/fix-static-file-links
...
Remove `sources/` under `docs` directory
2015-06-16 05:54:23 -07:00
b68d0c6612
docs: shrink some big images
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-06-16 13:57:42 +03:00
3f4eeca68f
Remove sources/ under docs directory
...
See #13936 .
Signed-off-by: ChaYoung You <yousbe@gmail.com >
2015-06-16 19:15:48 +09:00
b349a74c71
Only pulling single repository tag on pull for a specific tag. extending TestGetRemoteTags unit test
...
Splitting out GetRemoteTag from GetRemoteTags. Adding registry.ErrRepoNotFound error
Signed-off-by: Don Kjer <don.kjer@gmail.com >
2015-06-16 07:10:09 +00:00
957622d452
add gpg fingerprint for experimental
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-15 18:49:22 -07:00
9dffd032f4
Merge pull request #13950 from Microsoft/10662-vfsforreal
...
Windows - Really fix VFS this time
2015-06-15 21:41:12 -04:00
b81f2ee5f2
Merge pull request #13953 from crosbymichael/network-mtu
...
Get Mtu from default route
2015-06-15 17:13:44 -07:00
ff4e58ff56
Get Mtu from default route
...
If no Mtu value is provided to the docker daemon, get the mtu from the
default route's interface. If there is no default route, default to a
mtu of 1500.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-06-15 16:33:02 -07:00
f48fadd05c
Merge pull request #13941 from unclejack/fix_umask
...
docker/daemon: set umask to the default on startup
2015-06-15 16:19:38 -07:00
4d23f459ad
Merge pull request #13947 from mavenugo/vin
...
Picking up missed out vendor files via hack/vendor.sh
2015-06-15 16:16:02 -07:00
748814a97a
Merge pull request #13935 from asbjornenge/tm_syntax_updates
...
TM syntax updates
2015-06-15 16:12:22 -07:00
6d022bda3b
Updates libcontainer to v2.2.1
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-06-15 18:18:38 -04:00
59cfc08982
Windows - Really fix VFS this time
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-15 15:09:48 -07:00
835f1c9116
Merge pull request #13547 from coolljt0725/fix_unpause_not_running_container
...
Correct the message of pause and unpause a non-running container
2015-06-15 23:56:32 +02:00
86d6a5b11f
Merge pull request #13869 from jlhawn/multi_line_help_usage
...
api/client: Allow for multi-line usage help
2015-06-15 14:50:17 -07:00
b3b04fd85a
Merge pull request #13945 from dmcgowan/distribution-store-digest-on-pull
...
Store layer digests on pull
2015-06-15 14:37:30 -07:00
d409b05970
Merge pull request #13936 from moxiegirl/test-tooling
...
Updated retooling for Hugo to go out with 1.7
2015-06-15 13:57:12 -07:00
f93fee5f48
retooling for hugo
...
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-15 13:19:38 -07:00
dcc4a14ba3
Picking up missed out vendor files via hack/vendor.sh
...
while wokring on another PR, I noticed that hack/vendor.sh was picking
up unrelated files. Maybe a previous update to the hack/vendor.sh failed
to run the script and push the vendor changes ?
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-15 11:38:06 -07:00
3f11e05db2
Merge pull request #13942 from calavera/fix_unshare_mount_regression
...
Fix regression bind mounting shared.
2015-06-15 11:25:35 -07:00
a98ea87e46
Store layer digests on pull
...
Currently digests are not stored on pull, causing a simple re-tag or re-push to send up all layers. Storing the digests on pull will allow subsequent pushes to the same repository to not push up content.
This does not address pushing content to a new repository. When content is pushed to a new repository, the digest will be recalculated. Since only one digest is currently stored, it may cause a new content push to the original repository.
Fixes #13883
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-06-15 11:08:21 -07:00
407a626be6
docker-inspect: Extend docker inspect to export image/container metadata related to graph driver
...
Export image/container metadata stored in graph driver. Right now 3 fields
DeviceId, DeviceSize and DeviceName are being exported from devicemapper.
Other graph drivers can export fields as they see fit.
This data can be used to mount the thin device outside of docker and tools
can look into image/container and do some kind of inspection.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-06-15 14:05:10 -04:00
d8592eaff8
Revert "contrib/init: unshare mount namespace for inits"
...
This reverts commit b6569b6b82david.calavera@gmail.com >
2015-06-15 10:35:17 -07:00
1157fcc4a4
Merge pull request #13926 from Microsoft/10662-createfixup
...
Windows: Fixup compile in daemon_windows.go
2015-06-15 10:17:24 -07:00
637023a5f8
Merge pull request #13502 from coolljt0725/conflict_port_and_netmode
...
Add --net=container with --publish --expose --publish-all error out
2015-06-15 16:25:59 +02:00
6578ad90c3
docker/daemon: set umask to the default on startup
...
This sets up the umask so that it's the same on all systems.
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-06-15 16:47:20 +03:00
dfec4a48c7
Various cleanups added to asbjornenge/Docker.tmbundle (by the TM maintainer) and support for the LABEL instruction
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2015-06-15 00:04:05 +02:00
ac8cbf4952
Updated TextMate install instruction - this bundle is not included in TM 😄 :rocket
...
Docker-DCO-1.1-Signed-off-by: Asbjorn Enge <asbjorn@hanafjedle.net > (github: asbjornenge)
2015-06-15 00:02:10 +02:00
0030df868a
Do not compress rootfs archive in mkimage.sh.
...
* This wastes CPU time for compressing and decompressing.
Signed-off-by: Robin Schneider <ypid@riseup.net >
2015-06-14 20:51:11 +02:00
ee40f29712
Merge pull request #13927 from moxiegirl/carry-13250
...
Carry of PR #13520
2015-06-13 10:29:56 -07:00
f27c9bc6e7
Merge pull request #13895 from calavera/fix_get_env_split
...
Correct getEnv split.
2015-06-13 12:43:45 -04:00
cd44018856
Carry of PR #13520
...
Removinig files
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-13 09:27:30 -07:00
cd36b15ccb
Merge pull request #13860 from jlhawn/cli_call_headers
...
api/client: have cli.call() return headers
2015-06-13 09:14:40 -07:00
c7975f12d6
Windows: Fixup compile in daemon_windows.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-13 09:10:54 -07:00
261af00282
Merge pull request #13682 from mavenugo/ln_vin
...
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
2015-06-13 09:00:33 -07:00
f1ea3e5c74
Merge pull request #13504 from coolljt0725/refactor_verifyhostconfig
...
Refactor verifyHostConfig: change to verifyConfigs and add verify config
2015-06-12 19:59:45 -07:00
b37832e353
Add verify config to verifyContainerSettings
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-06-13 09:31:19 +08:00
422fa7f0a6
Merge pull request #13749 from Microsoft/adduseragent
...
Add GOOS in User-Agent
2015-06-12 17:19:51 -07:00
39bf57e085
Merge pull request #13344 from hqhq/hq_fix_arm64_test
...
Fix unit-test build error on ARM64
2015-06-12 17:11:18 -07:00
6a7a7570bb
Merge pull request #12833 from burke/faster-changes
...
Optimize archive.ChangesDirs on Linux
2015-06-12 17:05:34 -07:00
083300168f
Vendoring in libnetwork to 3be488927db8d719568917203deddd630a194564
...
This PR brings the vendored libnetwork code to
3be488927db8d719568917203deddd630a194564, which pulls in quite a few
fixes to support kvstore, windows daemon compilation fixes,
multi-network support for Bridge driver, etc...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-12 16:10:40 -07:00
cd71c5ed43
Merge pull request #13836 from amylindburg/master
...
Update plugins.md
2015-06-12 15:40:20 -07:00
0a529b6e7a
Update plugins.md
...
Fixed broken link.
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com >
Update plugins.md
Some other broken links!
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com >
Update plugin_api.md
FIxing broken links.
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com >
Update plugins_volume.md
Fixing more links.
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com >
2015-06-12 15:38:15 -07:00
421b9b6859
Merge pull request #13916 from Microsoft/10662-compileserver
...
Windows: Patch up compile after adjustCpuShares
2015-06-12 13:48:22 -07:00
d2c5fcc8d5
Windows: Patch up compile after adjustCpuShares
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-12 13:00:59 -07:00
9465272c28
Add new "validate-pkg" bundlescript
...
This helps ensure that `github.com/docker/docker/pkg/...` is actually safe to use in isolation (ie, doesn't import anything from `github.com/docker/docker` except other things from `pkg` or vendored dependencies).
Adding `github.com/docker/docker/utils` to the imports of `pkg/version/version.go`:
```
---> Making bundle: validate-pkg (in bundles/1.7.0-dev/validate-pkg)
These files import internal code: (either directly or indirectly)
- pkg/version/version.go imports github.com/docker/docker/autogen/dockerversion
- pkg/version/version.go imports github.com/docker/docker/utils
```
And then removing it again:
```
---> Making bundle: validate-pkg (in bundles/1.7.0-dev/validate-pkg)
Congratulations! "./pkg/..." is safely isolated from internal code.
```
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-12 12:28:23 -07:00
5bddafe169
Merge pull request #13912 from icecrime/13902_improve_test
...
Replace "sleep" by "top" in test implementation
2015-06-12 20:24:31 +02:00
e7533d7f81
Merge pull request #13494 from Microsoft/10662-vfsdriveroption
...
Windows: Allow VFS
2015-06-12 11:12:32 -07:00
27e2837c6c
Merge pull request #13911 from cpuguy83/13910_fix_stats_nostream_resp
...
Fixes content-type/length for stats stream=false
2015-06-12 19:53:18 +02:00
e5b7f61f09
Replace "sleep" by "top" in test implementation
...
Eliminate any chance of race condition by replacing a call to sleep by a
call to top, and rely on test cleanup logic to have it exit cleanly.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-12 10:45:42 -07:00
2351557607
Merge pull request #13902 from ibuildthecloud/api-fixes
...
Set omitempty for IP and PublicPort to conform w/ API 1.18
2015-06-12 10:42:07 -07:00
855a056af7
Fixes content-type/length for stats stream=false
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-12 13:06:06 -04:00
09de92b891
Set omitempty for IP and PublicPort to conform w/ API 1.18
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-06-12 09:49:53 -07:00
e89f837bc6
Windows: Allow VFS
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-12 09:21:17 -07:00
5a02d0727b
Merge pull request #13899 from mavenugo/hp
...
Vendoring in libnetwork to fix #13873 .
2015-06-12 07:27:07 -07:00
c98eafe564
Merge pull request #13906 from chenchun/closed_chan
...
Fix send on closed channel bug
2015-06-12 09:37:53 -04:00
e70d680d72
Merge pull request #13903 from dqminh/fix-cli-exec-output
...
TestExecStopNotHanging: log output as string
2015-06-12 09:23:45 -04:00
f3d1826350
Vendoring in libnetwork to fix #13873 .
...
Libnetwork sha# e578e95aa101441481411ff1d620f343895f24fe
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-12 04:58:37 -07:00
a408790de8
Fix send on closed channel bug
...
Signed-off-by: Chun Chen <chenchun.feed@gmail.com >
2015-06-12 15:42:34 +08:00
d898372568
TestExecStopNotHanging: log output as string
...
When cmd failed, log its ouput as string instead of byte array to prevent test
log like: [49 53 ....] exit status 1
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
2015-06-11 22:53:55 -04:00
00b8fec75f
Merge pull request #13773 from dmcgowan/refactor-1-image-graph-separation
...
refactor: separate graph from image
2015-06-11 17:44:37 -07:00
85f895ce68
Correct getEnv split.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-11 14:40:46 -07:00
71ead0ef5c
Merge pull request #13722 from samuelkarp/CpuShareRemoteAPI
...
Adjust disallowed CpuShares in /containers/create
2015-06-11 14:20:50 -07:00
0de7065897
Merge pull request #13801 from bexelbie/bex_manpage_indention
...
Updates man page generation to use go-md2man v1.0.2
2015-06-11 14:12:17 -07:00
98391f0a39
Merge pull request #13890 from moxiegirl/vieux-fix
...
Updating with fix for first line and the vieux/amy comment on website
2015-06-11 13:22:03 -07:00
566466e714
Updating with fix for first line and the vieux/amy comment on website
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-11 12:48:01 -07:00
cada9b54b5
Merge pull request #13865 from Mic92/zfs-selinux
...
zfs: correctly apply selinux context
2015-06-11 12:42:06 -07:00
9b43f5a3a1
Split client and server cipher suite list in TLS defaults
...
Per @ewindisch, removing the CBC ciphers from the client preferred TLS
cipher suites. This will allow a future version of the server to also
remove the CBC ciphers from the accepted list.
This changes the server default to client + additional CBC cipher list,
and client default to the non-CBC ciphers.
Also, cipher order preference is modified so that best and highest-bit count
ciphers are most preferred.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-06-11 14:00:31 -04:00
e3821feb13
Merge pull request #13783 from tianon/vendor-pruning
...
Add intelligent vendor pruning (via "go list")
2015-06-11 10:32:53 -07:00
b0d748325f
Update "vendor/"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-11 09:59:12 -07:00
9e4ee3dea5
Add intelligent vendor pruning (via "go list")
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-11 09:59:12 -07:00
f61d595b55
Adjust "Dockerfile" to build tools we need in isolated mktemp GOPATHs
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-11 09:59:12 -07:00
eb97de7dee
Decoder does not work properly with nested pointers using gcc
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-06-11 16:45:54 +00:00
b27f960504
Merge pull request #13879 from eolamey/13878-nil-ip-opt-as-empty-string
...
Display empty string instead of <nil> when IP opt is nil.
2015-06-11 09:30:52 -07:00
9001c4bc48
Merge pull request #13839 from eolamey/13838-fix-docs-url
...
Fix docs URL not using https.
2015-06-11 08:59:35 -07:00
4fc6449944
Merge pull request #13861 from mrjana/cnm_integ
...
Vendoring libnetwork to fix stale arp cache issue
2015-06-11 09:12:34 -04:00
9ad89281ae
Display empty string instead of <nil> when IP opt is nil.
...
Fixes #13878 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
2015-06-11 11:14:28 +00:00
ef171afdbb
Merge pull request #13590 from mountkin/fix-archive-tests
...
Add the parent directory to changes set if new files are generated
2015-06-11 05:12:45 -04:00
19c31a703f
zfs: correctly apply selinux context
...
fixes #13858
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-06-11 11:11:37 +02:00
5d51118c7c
Update man page Dockerfile to use go-md2man v1.0.1 and go-lang 1.4
...
The main Dockerfile to was updated - this update brings the
sub-directory specific file inline with it.
Fixes #12866
Signed-off-by: Brian Exelbierd <bex@pobox.com >
2015-06-11 08:36:21 +02:00
2b27fe17a1
Merge pull request #13862 from Microsoft/10662-fixelementsrestored
...
Show actual number of elements restored
2015-06-11 07:13:19 +02:00
212dfb45de
Fix docs URL not using https.
...
Fixes #13838 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
2015-06-11 04:50:50 +00:00
386ab25137
Vendoring libnetwork to fix stale arp cache issue
...
Vendoring in libnetwork 90638ec9cf7fa7b7f5d0e96b0854f136d66bff92
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-06-10 19:29:10 -07:00
883d661b69
Merge pull request #13867 from calavera/fix_daemon_cleanup_order
...
Cleanup driver and graph db after stopping containers.
2015-06-10 17:05:41 -07:00
ad9080a87c
Merge pull request #13868 from jfrazelle/update-gitignore-man
...
update gitignore for new manpages
2015-06-10 16:55:15 -07:00
0cdc3b7539
api/client: have cli.call() return headers
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-06-10 16:20:13 -07:00
4cb0c93f92
api/client: Allow for multi-line usage help
...
Subcommands can provide multiple usage synopses.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-06-10 16:14:45 -07:00
0964a664e8
Cleanup driver and graph db after stopping containers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-10 16:11:50 -07:00
f88e620359
update gitignore for new manpages
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-10 16:11:15 -07:00
466efebf0e
Merge pull request #13863 from Microsoft/typoclientutils
...
Typo fix in api\client\utils.go
2015-06-10 15:57:37 -07:00
84aec1e8e6
Typo fix in api\client\utils.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-10 15:24:53 -07:00
141cd2a1f2
Show actual number of elements restored
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-10 15:18:51 -07:00
b6049b5c49
Merge pull request #13804 from moxiegirl/proposal-man-pages
...
PROPOSAL: Moving man pages out of docs
2015-06-10 15:04:19 -07:00
9da65ed84f
Merge pull request #13854 from crosbymichael/revert-shared-root
...
Revert shared container rootfs
2015-06-10 14:12:14 -07:00
eacae64bd8
Moving man pages out of docs
...
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-10 13:43:35 -07:00
add64dc297
Merge pull request #13832 from mapk0y/fix-error-msg
...
fix typo.
2015-06-10 16:38:07 -04:00
05644ccea9
Merge pull request #13272 from Microsoft/10662-daemonrefactorv2
...
Windows: Refactor daemon
2015-06-10 16:28:56 -04:00
17324c91e3
Merge pull request #13015 from mariussturm/master
...
Add logging driver for GELF via UDP
2015-06-10 12:45:12 -07:00
8fb0ca2c35
Windows: Refactor daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-10 12:42:43 -07:00
65d0670d65
Merge pull request #13853 from jfrazelle/fix-hack-make
...
ugh typo in hack scripts fix, introduced by 2b4facdf
2015-06-10 11:53:47 -07:00
c9d71317be
Revert shared container rootfs
...
This is breaking various setups where the host's rootfs is mount shared
correctly and breaks live migration with bind mounts.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-06-10 11:29:27 -07:00
96d06e106f
add UDP GELF logging-driver
...
allows to send container logs to Graylog or Logstash.
Signed-off-by: Marius Sturm <marius@graylog.com >
2015-06-10 20:21:50 +02:00
c5f49886fa
ugh typo in hack scripts fix, introduced by 2b4facdf
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-10 11:00:59 -07:00
12149e8293
Merge pull request #13754 from cpuguy83/13753_fix_events_64
...
Default events since to current time
2015-06-10 10:34:13 -07:00
74c12aa429
Default events since to current time
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-10 12:37:40 -04:00
88e4dff9a9
use go-generate to build volume/driver/proxy.go
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-10 11:42:15 -04:00
5821f13b8c
Merge pull request #13844 from ponsfrilus/master
...
Typo psuedo - pseudo
2015-06-10 11:41:44 -04:00
4c81c9dddc
generate plugin clients via template
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-10 11:41:40 -04:00
46af724e81
Merge pull request #12371 from rhatdan/kill
...
docker kill should return error if container is not running.
2015-06-10 08:32:57 -07:00
de90aef411
Merge pull request #12813 from Microsoft/10662-nolinuxgraph
...
Windows: Don't build Linux graph drivers
2015-06-10 10:01:50 -04:00
e2c6a8be7c
Add the parent directory to changes set if new files are generated
...
The "TestChangesWithChanges" case randomlly fails on my development
VM with the following errors:
```
--- FAIL: TestChangesWithChanges (0.00s)
changes_test.go:201: no change for expected change C /dir1/subfolder != A /dir1/subfolder/newFile
```
If I apply the following patch to changes_test.go, the test passes.
```diff
diff --git a/pkg/archive/changes_test.go b/pkg/archive/changes_test.go
index 290b2dd..ba1aca0 100644
--- a/pkg/archive/changes_test.go
+++ b/pkg/archive/changes_test.go
@@ -156,6 +156,7 @@ func TestChangesWithChanges(t *testing.T) {
}
defer os.RemoveAll(layer)
createSampleDir(t, layer)
+ time.Sleep(5 * time.Millisecond)
os.MkdirAll(path.Join(layer, "dir1/subfolder"), 0740)
// Let's modify modtime for dir1 to be sure it's the same for the two layer (to not having false positive)
```
It seems that if a file is created immediately after the directory is created,
the `archive.Changes` function could't recognize that the parent directory of
the new file is modified.
Perhaps the problem may reproduce on machines with low time precision?
I had successfully reproduced the failure on my development VM as well as
a VM on DigitalOcean.
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-06-10 20:29:29 +08:00
e12839fa5a
Typo psuedo - pseudo
...
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com >
2015-06-10 13:27:55 +02:00
55bdb51659
Merge pull request #13699 from calavera/volume_backwards
...
Allow to downgrade local volumes from > 1.7 to 1.6.
2015-06-09 19:51:06 -07:00
bd9814f0db
Allow to downgrade local volumes from > 1.7 to 1.6.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-09 18:04:59 -07:00
4750e1f77e
Merge pull request #13784 from mrjana/cnm_integ
...
libnetwork: Add garbage collection trigger
2015-06-09 17:24:30 -07:00
c3b962d327
Merge pull request #13831 from LK4D4/update_libcontainer
...
Update libcontainer to v2.1.1
2015-06-09 17:12:20 -07:00
13baeb3b70
Merge pull request #13815 from tiborvass/do-not-send-basic-auth-on-302
...
Do not set auth headers for registry v1 if 302
2015-06-09 15:34:53 -07:00
ceee2595b6
Merge pull request #12583 from Mic92/hack/explicit-bundles
...
Hack/explicit bundles
2015-06-09 14:34:52 -07:00
416e855e9b
fix typo.
...
Signed-off-by: mapk0y <mapk0y@gmail.com >
2015-06-10 06:26:07 +09:00
38acd31e8a
Update libcontainer to v2.1.1
...
It includes fix for mounting / as volume on SELinux.
docker/libcontainer#619
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-09 13:54:57 -07:00
5e86b818ed
Merge pull request #13828 from calavera/plugin_fixes
...
Fix volume plugin serialization.
2015-06-09 13:30:55 -07:00
18ddc2728d
Merge pull request #13805 from aboch/czo
...
Add integ test for unpublished ports in ps o/p
2015-06-09 11:30:06 -07:00
06aef2b5c2
Merge pull request #13819 from Mashimiao/optimize-logic-of-get-container
...
daemon: cleanup getting container logic
2015-06-09 10:42:24 -07:00
30448166de
Fix volume plugin serialization.
...
Unmarshal errors into strings.
Fix `omit` typos.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-09 10:39:46 -07:00
7b9ae696d8
Add integ test for unpublished ports in ps o/p
...
- This is a test to assert the fix #13734
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-06-09 09:40:19 -07:00
90259fed2e
Merge pull request #12031 from jlhawn/build_cache_ignore_mtime
...
Make build cache ignore mtime
2015-06-09 18:26:07 +02:00
3b01dac44d
Merge pull request #13814 from duglin/DocTweak
...
Fix COPY/ADD quoted/json form
2015-06-09 04:56:35 -04:00
73bc885b23
daemon: cleanup getting container logic
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-06-09 14:47:07 +08:00
2b4facdf2e
hack: explicit bundles for integration-cli prequisites
...
no longer load hide critical code such as in .integration-daemon-{start,stop},
if this step failed, it will had logged the corresponding module before:
---> Making bundle: .integration-daemon-start (in bundles/1.7.0-dev/daemon-start)
which is nicer to debug.
This will make it also easier to execute a single tests in an interactive shell.
$ make shell
docker> . hack/make.sh binary .integration-daemon-start .integration-daemon-setup
docker> docker ps
CONTAINER ID IMAGE COMMAND CREATED STATUS PORTS NAMES
docker> go test github.com/docker/docker/integration-cli
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-06-09 07:22:26 +02:00
7f6aa3b783
Merge pull request #13816 from xiekeyang/remove
...
Registry: remove unwanted return variable name
2015-06-08 20:38:30 -07:00
a31be25121
Registry: remove unwanted return variable name
...
Signed-off-by: xiekeyang <xiekeyang@huawei.com >
2015-06-09 10:58:33 +08:00
5e0e71bbe0
Merge pull request #13714 from flavio/add-suse-support-to-docker-installer
...
Added openSUSE and SUSE Linux Enterprise support to install.sh
2015-06-08 17:20:33 -07:00
123a0582b2
Do not set auth headers if 302
...
This patch ensures no auth headers are set for v1 registries if there
was a 302 redirect.
This also ensures v2 does not use authTransport.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-06-08 19:59:39 -04:00
f4a3e8bef0
Fix COPY/ADD quoted/json form
...
Minor tweak to the quoted/json form and made man page look like the Dockerfile
docs. W/o the `,` people may think there should be a space delimited list.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-06-08 16:40:20 -07:00
a2ab067b3c
Merge pull request #13022 from Microsoft/10662-addrsrc
...
Windows: Add resources for manifest and icon
2015-06-08 15:16:10 -07:00
75f63499a0
Merge pull request #12992 from aidanhs/aphs-easy-debug-build
...
Allow passing DOCKER_DEBUG= to `make`
2015-06-08 15:15:49 -07:00
9a9dc5ba96
Windows: Don't build Linux graph drivers
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-08 15:09:33 -07:00
4ad05ed985
Merge pull request #13808 from Microsoft/10662-volumefixcompile
...
Windows: Fix PR13278 compile break
2015-06-08 15:02:47 -07:00
969cb545ae
Merge pull request #13546 from hqhq/hq_checkconfig_rescount
...
Don't check RESOURCE_COUNTERS in new kernel
2015-06-08 14:43:17 -07:00
c69d3b749d
Merge pull request #13790 from jfrazelle/update-authors-mailmap
...
update authors and mailmap
2015-06-08 14:24:32 -07:00
cd7e2a6b2b
[docs] Update builder docs on last-modified times
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-06-08 13:55:02 -07:00
0e10507a1c
[builder] Make build cache ignore mtime
...
Build cache uses pgk/tarsum to get a digest of content which is
ADD'd or COPY'd during a build. The builder has always used v0 of
the tarsum algorithm which includes mtimes however since the whole
file is hashed anyway, the mtime doesn't really provide any extra
information about whether the file has changed and many version
control tools like Git strip mtime from files when they are cloned.
This patch updates the build subsystem to use v1 of Tarsum which
explicitly ignores mtime when calculating a digest. Now ADD and
COPY will result in a cache hit if only the mtime and not the file
contents have changed.
NOTE: Tarsum is NOT a meant to be a cryptographically secure hash
function. It is a best-effort approach to determining if two sets of
filesystem content are different.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-06-08 13:54:47 -07:00
71eadd4176
Windows: Fix PR13278 compile break
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-08 13:47:09 -07:00
b099eb796a
Merge pull request #13800 from eolamey/13799-fix-docs-url-in-systemd-service-file
...
Fix docs URL in systemd service file.
2015-06-08 09:36:36 -07:00
875eafb00b
Merge pull request #13713 from draghuram/manport
...
Fix examples in "docker port" man page.
2015-06-08 17:08:37 +02:00
bf6492e689
Fix examples in "docker port" man page.
...
Closes #13667 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-06-08 10:40:24 -04:00
c622ca6d4b
Merge pull request #13797 from eolamey/13796-tiny-systemd-docs-improvements
...
Tiny improvements to systemd docs.
2015-06-08 08:57:13 -04:00
68bfd9e3ae
Tiny improvements to systemd docs.
...
Show how to use `systemctl show` and recommend against modifying
system unit files in `/usr` and `/lib`.
Fixes #13796 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
2015-06-08 12:05:34 +00:00
dbf5e36fd6
Fix docs URL in systemd service file.
...
Fixes #13799 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
2015-06-08 10:21:43 +00:00
a63c7c7be6
Merge pull request #13582 from coolljt0725/remove_useless_code
...
Cleanup: remove some useless code
2015-06-07 23:01:39 -07:00
c68e7f96f9
libnetwork: Add garbage collection trigger
...
When the daemon is going down trigger immediate
garbage collection of libnetwork resources deleted
like namespace path since there will be no way to
remove them when the daemon restarts.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-06-07 21:33:51 -07:00
67552fb22d
Cleanup: remove some useless code and change verifyHostConfig to verifyContainerSetting
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-06-08 09:06:58 +08:00
5d22afc54e
Merge pull request #13795 from michael-k/daemonFolder
...
[integration-cli] Made doc consistent with code
2015-06-07 16:57:54 -04:00
54ac3d9c76
Made doc consistent with code
...
The name of the folder was shortened in a1ea562docker@c.michael-kaeufl.de >
2015-06-07 22:32:29 +02:00
07b22fcf50
Merge pull request #13787 from runcom/check-nil-Config
...
Avoid nil pointer dereference while creating a container with an empty Config
2015-06-07 12:28:41 -04:00
3c37a307bc
Merge pull request #13791 from eolamey/minor-docs-fixes
...
Fix a typo and a minor formatting issue in the docs.
2015-06-07 09:25:15 -04:00
173d0918a8
Fix a typo and a minor formatting issue in the docs.
...
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
2015-06-07 12:49:03 +00:00
ae68dfe31b
update authors and mailmap
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-06 21:42:14 -07:00
3d10540bc3
Merge pull request #13757 from eolamey/13755-we-would-like-default-gateway-back-please
...
Restore --default-gateway{,-v6} daemon options.
2015-06-06 16:02:59 -07:00
4ce817796e
Avoid nil pointer dereference while creating a container with an empty Config
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-06-06 20:07:32 +02:00
3c132ff62d
Merge pull request #13764 from bcexelbi/bexelbie_man_typo
...
Fixing typo in Dockerfile manpage
2015-06-06 08:50:27 -04:00
ffd74e74b1
Merge pull request #13776 from duglin/MinorVolDocEdit
...
Minor doc edit to add clarity around the --volume path format
2015-06-05 18:41:37 -07:00
c0b4421819
Update graph to use digest type
...
Update get and set functions to use digests.
Update push code to use the digest type instead of string
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-06-05 18:07:41 -07:00
bb50a4159b
Update graph walkhistory to pass by value
...
Remove unused graph history function
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-06-05 18:06:09 -07:00
2b58b677a5
Separate graph from image
...
Move graph related functions in image to graph package.
Consolidating graph functionality is the first step in refactoring graph into an image store model.
Subsequent refactors will involve breaking up graph into multiple types with a strongly defined interface.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-06-05 18:06:09 -07:00
f20863929b
Merge pull request #13778 from LK4D4/rename_file
...
Rename test file to have _test postfix
2015-06-05 15:43:55 -07:00
3fcf53db92
Minor doc edit to add clarity around the --volume path format
...
Also add a comment to the ValidatePath func so devs/reviewers
know exactly what its looking for.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-06-05 15:11:42 -07:00
ff9877ccc4
Rename test file to have _test postfix
...
Without this go test was unable to find line number of error in that
file.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-05 13:49:58 -07:00
7c64ed5c8c
Merge pull request #12573 from clnperez/doc-article-baseimage
...
Update doc with usage of the scratch image
2015-06-05 13:36:33 -07:00
af29aff53c
Merge pull request #13772 from icecrime/13770_image_labels_to_containers
...
Container don't inherit from image labels
2015-06-05 13:25:34 -07:00
77bd53adfe
Update doc with usage of the scratch image
...
The scratch image used to be a regular image, but as of
commit 8936789919christy@linux.vnet.ibm.com >
2015-06-05 14:47:03 -05:00
79621c7728
Container don't inherit from image labels
...
Labels are metadata that apply to a particular resource: image,
container, maybe volumes and networks in the future. We shouldn't have
containers inherit from its image labels: they are not the same obejcts,
and labels cannot be interpreted in the way.
It remains possible to apply metadata to an image using the LABEL
Dockerfile instruction, to query them using `docker inspect <img>`, or
to filter images on them using `docker images --filter <key>=<value>`.
Fixes #13770 .
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-05 11:11:22 -07:00
5c051e2e26
Merge pull request #13767 from duglin/TweakInNetOpts
...
Remove duplicate call to net.ParseIP
2015-06-05 10:46:31 -07:00
078b8e54e4
Merge pull request #13768 from jfrazelle/fix-lxc-again-bleh
...
fix lxc build
2015-06-05 10:27:58 -07:00
efe5c64768
Merge pull request #13636 from tiborvass/refactor-tls
...
Refactor TLS code with a new `tlsconfig` package
2015-06-05 10:16:24 -07:00
69c2f5649a
Merge pull request #13748 from icecrime/experimental_docs
...
Minor changes to experimental docs
2015-06-05 19:11:51 +02:00
0adfb908a6
fix lxc build
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-05 09:50:30 -07:00
b180de55ca
Remove duplicate call to net.ParseIP
...
and a little cleanup
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-06-05 09:44:10 -07:00
bfed4b7cc3
Refactor TLS code with a new tlsconfig package
...
This patch creates a new `tlsconfig` package to handle creation of
secure-enough TLS configurations for clients and servers.
The package was created by refactoring TLS code in the client and the
daemon. After this patch, it is expected that all code creating TLS
configurations use this `tlsconfig` package for greater security,
consistency and readability.
On the server side, this fixes a bug where --tlsverify was not taken
into account. Now, if specified, it will require the client to
authenticate.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-06-05 12:38:38 -04:00
edb7e84ddb
Merge pull request #13751 from cpuguy83/use_closenotifier_for_logs
...
Fix goroutine leak on logs -f with no output
2015-06-05 11:43:47 -04:00
d32e01be1a
Fixing typo in Dockerfile manpage
...
Signed-off-by: Brian Exelbierd <bex@pobox.com >
2015-06-05 16:33:11 +02:00
159f5e0137
Merge pull request #13760 from SvenDowideit/update-dhe-docs-jun-5
...
Bring over DHE docs updates for publishing
2015-06-05 21:07:57 +10:00
9ed2cb300b
Bring over DHE docs updates for publishing
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-06-05 21:06:59 +10:00
5fa60149e2
Restore --default-gateway{,-v6} daemon options.
...
This was added before the libnetwork merge, and then lost. Fixes #13755 .
Signed-off-by: Eric-Olivier Lamey <eo@lamey.me >
2015-06-05 06:21:22 +00:00
ed39fbeb2a
Adjust disallowed CpuShares in /containers/create
...
Previous versions of libcontainer allowed CpuShares that were greater
than the maximum or less than the minimum supported by the kernel, and
relied on the kernel to do the right thing. Newer libcontainer fails
after creating the container if the requested CpuShares is different
from what was actually created by the kernel, which breaks compatibility
with earlier Docker Remote API versions. This change explicitly adjusts
the requested CpuShares in API versions < 1.20.
Signed-off-by: Samuel Karp <skarp@amazon.com >
2015-06-04 17:19:39 -07:00
cd1a1ee972
Merge pull request #13752 from tianon/fix-release-debs
...
Fix release script to release _both_ .deb files
2015-06-04 16:37:59 -07:00
e33aeac708
Merge pull request #13640 from Microsoft/10662-implementmeminfo
...
Windows: Implement ReadMemInfo()
2015-06-04 16:09:24 -07:00
4572329d4b
Fix release script to release _both_ .deb files
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-04 16:08:12 -07:00
a06e0bb8b4
Merge pull request #13648 from tiborvass/print-debugtransport-to-test-output
...
registry: debugTransport should print with testing.T.Log
2015-06-05 00:42:22 +02:00
a2602c617d
Merge pull request #13684 from lizf-os/cleanup-verify-volumes-info
...
Cleanup Daemon.verifyVolumesInfo() a bit
2015-06-04 15:39:31 -07:00
0c84604f54
Fix goroutine leak on logs -f with no output
...
Also noticed potential hang when only stdout or stderr are used with
follow=1
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-06-04 13:56:40 -07:00
543cf79ffb
Add GOOS in User-Agent
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-04 13:37:41 -07:00
b63ec6e4b1
Merge pull request #13734 from aboch/master
...
Fix for #13720 . Unpublished ports missing in docker ps
2015-06-04 12:05:47 -07:00
fd935ee63d
Windows: Build docker.exe manifested and with icon
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-06-04 11:49:10 -07:00
b26428257f
Merge pull request #13728 from calavera/copy_old_volume_content
...
Migrate data from old vfs paths to new local volumes path.
2015-06-04 11:14:34 -07:00
7c2178b358
Merge pull request #13736 from SvenDowideit/double-the-double-the-lines
...
Tiny spelling issue in the debian control file :)
2015-06-04 11:10:55 -07:00
cbe120db58
Merge pull request #13745 from icecrime/test_import_path
...
Fix kr/pty import path in test-integration-cli
2015-06-04 10:59:37 -07:00
d8680f7beb
Remove reference to experimental release
...
Remove reference to experimental releases as it is really a nightly
channel rather than a scheduled release.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-04 10:33:20 -07:00
8352f2e264
Rename EXPERIMENTAL.md to README.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-04 10:32:50 -07:00
16a5590c5b
Migrate data from old vfs paths to new local volumes path.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-04 10:16:19 -07:00
9069cded57
Merge pull request #13586 from kvasdopil/zfs-88chars
...
Avoid 88-chars mountpoint length limit on freebsd
2015-06-04 10:05:01 -07:00
2c09dbb7dd
Merge pull request #13733 from lizf-os/discovery-test-remove-tmpdir
...
Don't forget to clenaup tmpdir in TestFileSpecPlugin()
2015-06-04 09:21:53 -07:00
4efedb3fba
Merge pull request #13716 from moxiegirl/move-experimental
...
Moving experimental
2015-06-04 09:11:00 -07:00
9ec5e4f7df
Fix kr/pty import path
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-04 09:02:14 -07:00
d31224743b
Don't forget to clenaup tmpdir in TestFileSpecPlugin()
...
Also remove redundant code.
Signed-off-by: Zefan Li <lizefan@huawei.com >
2015-06-04 21:26:15 +08:00
318defe1de
Tiny spelling issue in the debian control file :)
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-06-04 18:16:24 +10:00
ea180a73bc
Fix for #13720
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-06-03 23:39:27 -07:00
ef3e956aa2
Merge pull request #13704 from tianon/build-utc
...
Swap build-* to use UTC instead of local time
2015-06-03 22:05:09 -07:00
57bba29f79
Merge pull request #13732 from mavenugo/netdisabled
...
Using container NetworkDisabled to fix #13725
2015-06-03 21:40:15 -07:00
83208a531d
Using container NetworkDisabled to fix #13725
...
container.config.NetworkDisabled is set for both daemon's
DisableNetwork and --networking=false case. Hence using
this flag instead to fix #13725 .
There is an existing integration-test to catch this issue,
but it is working for the wrong reasons.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-06-03 17:31:22 -07:00
f37e6e180f
Merge pull request #13731 from jfrazelle/fix-version-on-old-versions
...
fix version struct on old versions
2015-06-03 17:24:53 -07:00
fdd6175bca
Merge pull request #13718 from runcom/fix-containers-json
...
SizeRW & SizeRootFs omitted if empty in /container/json call
2015-06-03 17:14:58 -07:00
229b599259
fix version struct on old versions
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-03 16:56:50 -07:00
babf751e1b
Merge pull request #13715 from LK4D4/update_logrus
...
Update github.com/Sirupsen/logrus to 0.8.2
2015-06-03 14:24:37 -07:00
ca66419522
Merge pull request #13709 from jfrazelle/update-url
...
Update urls from .com to .org.
2015-06-03 14:21:38 -07:00
6945ac2d02
SizeRW & SizeRootFs omitted if empty in /container/json call
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-06-03 23:13:56 +02:00
ad56d797d3
Merge pull request #13712 from LK4D4/fix_leak_events
...
Support CloseNotifier for events
2015-06-03 13:43:39 -07:00
95dfc4c4a5
Moving experimental
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-03 13:43:27 -07:00
7943bce894
Update urls from .com to .org.
...
I added 301 redirects from dockerproject.com to dockerproject.org but may as
well make sure everything is updated anyways.
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-06-03 13:28:47 -07:00
fa020341e4
Update github.com/Sirupsen/logrus to 0.8.2
...
Fix #13708
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-03 13:22:56 -07:00
f18ce101fb
Merge pull request #13165 from ahmetalpbalkan/durations
...
Allow duration strings as --since/--until
2015-06-03 22:14:42 +02:00
d0c4c7c83f
Added openSUSE and SUSE Linux Enterprise support to install.sh
...
Handle docker installation on openSUSE and SUSE Linux Enterprise
via https://get.docker.io/
Signed-off-by: Flavio Castelli <fcastelli@suse.com >
2015-06-03 21:56:27 +02:00
a29633f687
Merge pull request #13703 from runcom/13691-container-ps-regression
...
Do not omit empty json field in /containers/json api response
2015-06-03 12:30:12 -07:00
b30121984e
Merge pull request #13702 from BenSeverson/patch-1
...
quick doc fix for windows versions
2015-06-03 21:24:13 +02:00
c962f53a3e
Merge pull request #13645 from calavera/fix_stats_flaky_test
...
Fix stats flaky test.
2015-06-03 12:05:43 -07:00
9e7fc245a7
Support CloseNotifier for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-03 11:42:51 -07:00
a448b7aff2
quick doc fix for windows versions
...
Signed-off-by: Ben Severson <BenSeverson@users.noreply.github.com >
2015-06-03 10:28:11 -07:00
aa54a93f74
Swap build-* to use UTC instead of local time
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-06-03 09:56:46 -07:00
521926f6c4
Merge pull request #13231 from Microsoft/10662-chrootarchive
...
Windows: chrootarchive refactor
2015-06-03 09:54:42 -07:00
725f34151c
Do not omit empty json field in /containers/json api response
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-06-03 18:53:40 +02:00
0636bb7b73
Merge pull request #13672 from LK4D4/syslog_tag
...
Add syslog-tag option
2015-06-03 17:04:59 +02:00
641f3e0932
Merge pull request #13205 from hqhq/hq_fix_ipforward_doc
...
Add docs for ip-forward
2015-06-03 07:50:19 -07:00
f03daf29dc
Merge pull request #13696 from hqhq/hq_add_comment_inspect
...
Add comment about inspect output
2015-06-03 13:36:00 +02:00
01a9a9284f
Add comment about inspect output
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-06-03 17:35:57 +08:00
8bfc8102be
Don't check RESOURCE_COUNTERS in new kernel
...
Closes : #13543
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-06-03 17:26:39 +08:00
85fffe1341
Add docs for ip-forward
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-06-03 16:37:40 +08:00
bd2575cc4f
Make the v2 logic fallback on v1 when v2 requests cannot be authorized.
...
Signed-off-by: Matt Moore <mattmoor@google.com >
2015-06-02 21:22:59 -07:00
63823cd6c1
Merge pull request #13683 from crosbymichael/nat-test-fixes
...
Fix nat integration tests
2015-06-02 18:54:17 -07:00
e0475d331b
add a more accurate error description for invalid tag name
...
Signed-off-by: yuchangchun <yuchangchun1@huawei.com >
2015-06-03 09:38:39 +08:00
4f42097883
Fix nat integration tests
...
This removes complexity of current implementation and makes the test
correct and assert the right things.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-06-02 18:21:16 -07:00
8b4c0decfc
Cleanup Daemon.verifyVolumesInfo() a bit
...
vols.VolumesRW has been initialized so it can't be nil. Furthermore
it's ok to read a nil map.
Signed-off-by: Zefan Li <lizefan@huawei.com >
2015-06-03 09:19:16 +08:00
25376c652d
Merge pull request #13679 from icecrime/update_vendoring
...
Update vendoring
2015-06-02 17:41:48 -07:00
1664d6cd66
Update vendoring
...
Update libnetwork to 005bc475ee49a36ef2ad9c112d1b5ccdaba277d4
Synchronize changes to distribution (was missing _test.go file)
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-02 16:41:02 -07:00
af09b06dfa
Merge pull request #13675 from runcom/13663-config-regression
...
Expose old config field for api < 1.19
2015-06-02 15:23:51 -07:00
6deaa58ba5
Expose old config field for api < 1.19
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-06-02 23:37:59 +02:00
6c42b3947a
Merge pull request #12838 from fntlnz/test-cmd
...
Using dockerCmd when possible
2015-06-02 14:12:22 -07:00
3f26066425
Merge pull request #13591 from kvasdopil/update-go-zfs
...
Update go-zfs to last version
2015-06-02 14:05:29 -07:00
4e3b21f99e
Allow duration strings as --since/--until
...
Fixes #13107 . This change enables Go duration strings
computed relative to the client machine’s time to be used
as input parameters to `docker events --since/--until`
and `docker logs --since` arguments.
Added unit tests for pkg/timeutils.GetTimestamp as well.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-06-02 21:02:47 +00:00
da255ec962
Merge pull request #13661 from vdemeester/pkg-jsonmessage-test-coverage
...
Add test coverage to pkg/jsonmessage
2015-06-02 16:54:50 -04:00
7e8639a9df
Merge pull request #13671 from moxiegirl/carry-13147-fix
...
Tweaking text identified in PR #13147
2015-06-02 21:48:47 +02:00
3df19749d4
Wrap lines for journald docs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-02 12:46:51 -07:00
cb4af853f6
Tweaking text identified in PR #13147
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-02 12:44:47 -07:00
8979fe4d8a
Change address to syslog-address in syslog docs
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-02 12:44:23 -07:00
a81af2e26a
Add syslog-tag option for syslog log-driver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-02 12:43:00 -07:00
e6bd8c1e19
Add test coverage to pkg/jsonmessage
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-06-02 21:19:38 +02:00
63b5d5fadc
Merge pull request #13668 from calavera/bump_libnetwork
...
Bump libnetwork for 1.7 release.
2015-06-02 15:04:38 -04:00
ad244668c3
Update libnetwork to 4ded6fe3641b71863cc5985652930ce40efc3af4
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-02 11:30:36 -07:00
278798236b
Merge pull request #13650 from jvgogh/master
...
Upon HTTP 302 redirect do not include "Authorization" header on 'untr…
2015-06-02 14:23:20 -04:00
274baf70bf
Merge pull request #13576 from stevvooe/verify-digests
...
Properly verify manifests and layer digests on pull
2015-06-02 11:16:23 -07:00
7d33bc0bec
Merge pull request #13656 from lizf-os/13641-skip-test-on-lxc
...
test: Skip TestDevicePermissions on lxc
2015-06-02 11:05:22 -07:00
ad41efd9a2
Bump libnetwork for 1.7 release.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-02 11:00:54 -07:00
814a92c5a1
Merge pull request #13607 from vieux/PrintfIfNotEmpty
...
do not print empty values in docker info
2015-06-02 10:52:45 -07:00
bdb6fad34c
Merge pull request #13654 from porjo/netipv6
...
Networking docs: add reference to ndppd
2015-06-02 19:06:17 +02:00
2de2782fe8
Merge pull request #13666 from runcom/13665-kill-signal-wrong-handled
...
Fix wrong kill signal parsing
2015-06-02 09:40:55 -07:00
9f098cabfc
Merge pull request #13664 from runcom/dead-code
...
Remove old struct
2015-06-02 09:37:55 -07:00
fbadf11d20
Merge pull request #13633 from ZJU-SEL/fix-doc
...
fix typo.
2015-06-02 18:36:52 +02:00
39eec4c25b
Fix wrong kill signal parsing
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
2015-06-02 18:01:19 +02:00
d13af493f8
Merge pull request #13630 from vdemeester/pkg-tarsum-test-coverage
...
Add test coverage for pkg/tarsum
2015-06-02 11:44:42 -04:00
8a11b40fea
Merge pull request #13553 from Microsoft/10662-revert908db
...
Windows: Undo 908db518
2015-06-02 10:22:39 -04:00
da1a77defd
Remove old struct
...
Signed-off-by: Antonio Murdaca <antonio.murdaca@gmail.com >
2015-06-02 16:10:39 +02:00
879f0fb338
Merge pull request #13657 from chriswahl/patch-1
...
Corrected VMWare to VMware
2015-06-02 07:41:25 -04:00
ea5ce27564
update go-zfs to last version
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-06-02 10:37:38 +03:00
25f7d7822d
Add test coverage for pkg/tarsum
...
And removing unused code.
- tarsum.go :
NewTarSumHash could be non exported (for now)
NewTarSumForLabel is never used, except for the tests
- fileinfosums.go:
SortByPos is never used, except for the tests
- versionning.go:
GetVersions is never used, expect for the tests
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-06-02 09:08:01 +02:00
b1a1cff368
Networking docs: add reference to ndppd
...
Signed-off-by: Ian Bishop <ianbishop@pace7.com >
2015-06-02 15:56:24 +10:00
55cea4952b
Corrected VMWare to VMware
...
Corrected spelling of VMware.
Signed-off-by: Chris Wahl <github@wahlnetwork.com >
2015-06-01 22:34:43 -05:00
e55649192e
test: Skip TestDevicePermissions on lxc
...
Closes : #13641
Signed-off-by: Zefan Li <lizefan@huawei.com >
2015-06-02 10:27:54 +08:00
0d72772c37
fix typo.
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-06-02 09:44:52 +08:00
1f903f652c
Merge pull request #13651 from RichardScothern/v1-mirror-fix
...
Fallback to pull from hub if mirrors unavailable.
2015-06-01 21:09:54 -04:00
cd79751cfa
Merge pull request #13644 from mchiang0610/patch-1
...
Fix - Download button does not download
2015-06-01 17:33:38 -07:00
05b1d02423
Merge pull request #13609 from Microsoft/10662-refixserverwindows
...
Windows: Fix windows to match linux after compile break
2015-06-01 17:03:13 -07:00
65c5105fcc
Upon HTTP 302 redirect do not include "Authorization" header on 'untrusted' registries.
...
Refactoring in Docker 1.7 changed the behavior to add this header where as Docker <= 1.6 wouldn't emit this Header on a HTTP 302 redirect.
This closes #13649
Signed-off-by: Jeffrey van Gogh <jvg@google.com >
2015-06-01 16:12:56 -07:00
aa8d8fdc0c
Merge pull request #13611 from duglin/Issue13417a
...
Allow .dockerignore to ignore everything
2015-06-01 15:59:57 -07:00
1f472c3768
Merge pull request #13536 from Mic92/master
...
remove redundant mount/unmount calls on commit
2015-06-01 15:57:14 -07:00
f358b39521
Merge pull request #13597 from sanketsaurav/master
...
Proposing Bose, Raman and Ramanujan
2015-06-01 15:56:16 -07:00
6e4ff1bb13
If no endpoint could be established with the given mirror configuration,
...
fallback to pulling from the hub as per v1 behavior.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-06-01 15:18:56 -07:00
c790aa36ea
no not print empty keys in docker info
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-06-01 15:05:20 -07:00
78bc233a01
registry: debugTransport should print with testing.T.Log
...
It should not print to STDOUT so that it only prints the debugTransport
output if there was an error in one of the registry tests.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-06-01 17:48:30 -04:00
488c355d94
Merge pull request #13643 from LK4D4/fix_registry_race
...
Fix race condition in registry/session
2015-06-01 14:44:12 -07:00
4fde1cb695
Fix stats flaky test.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-06-01 14:05:26 -07:00
b7101d528d
Merge pull request #13638 from icecrime/maintainers_add_calavera
...
Add @calavera to maintainers
2015-06-01 14:05:12 -07:00
cd80a61cc1
Merge pull request #13443 from duglin/CleanupEvents
...
Cleanup container LogEvent calls
2015-06-01 14:04:33 -07:00
5606f32eec
Fix - Download button does not download
...
Fix - Download button does not download
Users got confused when Kitematic is not being downloaded after clicking on the download button, and instead got brought to a screen to teach them how to download Kitematic.
The additional step caused a significant drop in Kitematic downloads. This pull request fixes the issue, to allow users to directly download Kitematic after clicking on the Download button.
Signed-off-by: Michael Chiang <michael.chiang@docker.com >
2015-06-01 13:29:44 -07:00
9d98c28855
Fix race condition in registry/session
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-01 13:25:18 -07:00
64a7431663
Merge pull request #13639 from tonistiigi/fix-git-escape
...
Make sure git remote subdirs don't escape git root
2015-06-01 13:04:39 -07:00
84413be3c9
Break down loadManifest function into constituent parts
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-06-01 13:02:50 -07:00
71d960d455
Merge pull request #13557 from ewindisch/apparmor-unshare-priv
...
Expand unshare test to include privileged test
2015-06-01 15:43:37 -04:00
22b195f241
Windows: Implement ReadMemInfo()
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-01 12:40:33 -07:00
8232312c1e
Cleanup container LogEvent calls
...
Move some calls to container.LogEvent down lower so that there's
less of a chance of them being missed. Also add a few more events
that appear to have been missed.
Added testcases for new events: commit, copy, resize, attach, rename, top
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-06-01 12:39:28 -07:00
7f7ebeffe8
Fix breakouts from git root during build
...
Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com >
2015-06-01 22:10:55 +03:00
62afcbc6d4
Add @calavera to maintainers
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-06-01 12:02:12 -07:00
24fbcffeac
Merge pull request #13560 from Microsoft/10662-statscollector
...
Windows: Factor out stat collector
2015-06-01 11:39:19 -07:00
d156bc9dd4
Merge pull request #13637 from LK4D4/remove_debug
...
Remove useless debug message
2015-06-01 11:38:05 -07:00
f1b59d64d2
Remove useless debug message
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-06-01 11:15:15 -07:00
a7005c44b5
Merge pull request #13320 from coolljt0725/add_stats_no_stream_show_cpu_usage
...
Add docker stats --no-stream show cpu usage
2015-06-01 09:40:04 -07:00
6fb454b9f0
Merge pull request #13464 from davidrjenni/10184-fix-auto-created-devices
...
Fixes issue #10184 .
2015-06-01 09:30:04 -07:00
d37aad170f
Merge pull request #13568 from jfrazelle/fix-release-script-for-experimental
...
fix release script for experimental
2015-06-01 12:29:45 -04:00
7c190b9556
Merge pull request #13523 from moxiegirl/carry-12572-fix
...
Updating after the pr went through
2015-06-01 09:21:12 -07:00
3ce2797541
Updating after the pr went through
...
Updating with comments.
Signed-off-by: Mary Anthony <mary@docker.com >
2015-06-01 09:20:31 -07:00
68c879406b
Windows: Factor out stat collector
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-06-01 09:11:03 -07:00
09bfbfd74e
Merge pull request #13615 from gesellix/docs-container-create-start
...
indicate HostConfig to be used for "create container"
2015-06-01 17:46:32 +02:00
b445004364
Merge pull request #13390 from mrjana/cnm_integ
...
Do not attempt releasing network when not attached to any network
2015-06-01 08:25:20 -07:00
16e649c589
indicate HostConfig to be used for "create container"
...
Closes #13614
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
2015-06-01 07:04:41 +02:00
4caa9392f8
Merge pull request #13622 from jogo/spelling
...
Fix spelling mistakes in documentation
2015-06-01 11:37:48 +10:00
3d87b80b46
Fix spelling mistakes in documentation
...
While reading some of the docs I noticed a few errors, so I ran
misspellings (https://pypi.python.org/pypi/misspellings ) on markdown files
Signed-off-by: Joe Gordon <joe.gordon0@gmail.com >
2015-05-31 11:53:23 -07:00
093f57a261
Merge pull request #13460 from moxiegirl/add-created-state-diagram
...
Updating event diagram with the created state. Cool, thank you.
2015-05-30 19:47:24 -07:00
0ea14e5c6d
Merge pull request #13603 from tianon/consistent-dest
...
Make "DEST" a make.sh construct instead of ad-hoc
2015-05-30 16:42:10 -07:00
73683e807d
Merge pull request #13616 from konstruktoid/docs_openssl
...
Docs: sha256 and 4096 when using openssl
2015-05-30 19:20:21 -04:00
5cd64cb93f
aes256 and 4096 bits
...
squashing down to a single commit and change back to cert.pem
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com >
2015-05-31 01:05:49 +02:00
20927ffbe7
Correct the error message of pause and unpause non-running container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-31 03:32:29 +08:00
a121ac858e
Restore DEBUG as DOCKER_DEBUG (removed in #10665 ), add as make variable
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
2015-05-30 19:37:36 +01:00
ac3388367b
Make "DEST" a make.sh construct instead of ad-hoc
...
Using "DEST" for our build artifacts inside individual bundlescripts was already well-established convention, but this officializes it by having `make.sh` itself set the variable and create the directory, also handling CYGWIN oddities in a single central place (instead of letting them spread outward from `hack/make/binary` like was definitely on their roadmap, whether they knew it or not; sneaky oddities).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-30 11:16:43 -07:00
f2154a5a6b
Merge pull request #13367 from duglin/Issue13353
...
Add a "Created" state for new containers that haven't been run yet
2015-05-30 19:49:38 +02:00
96123a1fd5
Add docker stats --no-stream show cpu usage
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-31 01:25:51 +08:00
dc697b1c9f
Add a "Created" state for new containers that haven't been run yet
...
Closes #13353
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-30 07:48:46 -07:00
279c877451
Merge pull request #13580 from vdemeester/update-api-commit
...
Update api documentation to add labels in commit
2015-05-30 14:44:05 +02:00
18c11dc264
Merge pull request #13612 from duglin/DocsNewLine
...
Premature newline insertions
2015-05-30 08:33:46 -04:00
e51b311129
Premature newline insertions
...
Noticed that there were a few newlines in the middle of a \`...\` blocks that
made the text look funny when displayed in HTML.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-30 04:46:24 -07:00
82ea6ed2bc
Allow .dockerignore to ignore everything
...
Change CLI error msg because it was too specific and didn't make sense
when there were errors not related to inaccessible files.
Removed some log.Error() calls since they're not really errors we should
log. Returning the error will be enough.
Closes : #13417
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-30 04:16:00 -07:00
c61fa8471a
Update api documentation to add labels in commit
...
It is already possible to set labels at commit when using the API. But
it is not present in the API documentation. Added an integration test
too, to validate this work (and will be in the future).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-05-30 11:31:51 +02:00
c913c9921b
Fix issue #10184 .
...
Merge user specified devices correctly with default devices.
Otherwise the user specified devices end up without permissions.
Signed-off-by: David R. Jenni <david.r.jenni@gmail.com >
2015-05-30 11:09:47 +02:00
2b7569ccc3
Windows: Refix server_windows to match linux
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-29 21:25:27 -07:00
04c6f09fbd
Merge pull request #12400 from coolljt0725/kill_all_containers_on_daemon_shutdown
...
Ensure all the running containers are killed on daemon shutdown
2015-05-29 16:45:57 -07:00
74528be903
Add tests for loadManifest digest verification
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-05-29 16:30:21 -07:00
1613897d2d
Merge pull request #13561 from icecrime/warn_overlay_docs
...
Add note about overlay not being production ready
2015-05-30 01:24:02 +02:00
a18c0b3b3c
Proposing Bose, Raman and Ramanujan
...
Signed-off-by: Sanket Saurav <sanketsaurav@gmail.com >
2015-05-30 04:14:11 +05:30
3aa4a3a0c5
Merge pull request #13606 from runcom/revert-doc-in-api-1-19
...
Revert api doc for 1.19 about PortSpecs removal
2015-05-29 15:42:56 -07:00
c42ede311b
Revert api doc for 1.19 about PortSpecs removal
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-30 00:32:03 +02:00
1e653ab645
Attempt to retain tagging behavior
...
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-05-29 15:20:37 -07:00
06612cc0fe
Properly verify manifests and layer digests on pull
...
To ensure manifest integrity when pulling by digest, this changeset ensures
that not only the remote digest provided by the registry is verified but also
that the digest provided on the command line is checked, as well. If this check
fails, the pull is cancelled as with an error. Inspection also should that
while layers were being verified against their digests, the error was being
treated as tech preview image signing verification error. This, in fact, is not
a tech preview and opens up the docker daemon to man in the middle attacks that
can be avoided with the v2 registry protocol.
As a matter of cleanliness, the digest package from the distribution project
has been updated to latest version. There were some recent improvements in the
digest package.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-05-29 15:20:28 -07:00
eaa9c1b97e
Merge pull request #13596 from jfrazelle/11414-fix-once-and-for-all
...
fix bug with rmi multiple tag
2015-05-29 15:10:22 -07:00
4389fc8bf9
Merge pull request #13425 from runcom/13421-stats-default-stream
...
Fix regression in stats API endpoint
2015-05-29 15:05:21 -07:00
d79654d0f6
Merge pull request #13567 from draghuram/apiver
...
Make the version mismatch message more explicit.
2015-05-29 23:39:48 +02:00
d96ca04f24
Merge pull request #13601 from tianon/precise
...
Finally add precise/12.04 as a build-deb target
2015-05-29 14:35:07 -07:00
ec167972bf
Merge pull request #13446 from runcom/remove-PortSpecs
...
Remove PortSpecs from Config
2015-05-29 14:31:48 -07:00
4d9191e15d
Merge pull request #13604 from tianon/vim-embedded-shell
...
Add embedded shell script highlight to vim syntax
2015-05-29 14:17:07 -07:00
e2524d8ace
Merge pull request #13605 from tianon/vim-dockerfile
...
Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile"
2015-05-29 14:16:50 -07:00
a39de41871
Merge pull request #13527 from duglin/FixImagesPrefixNotFound
...
Fix error when trying to delete an image due to a bad container
2015-05-29 14:09:26 -07:00
185f392691
fix bug with rmi multiple tag
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-29 14:04:06 -07:00
1680c78e63
Merge pull request #13577 from WeiZhang555/httpClose
...
bug fix: close http response body no longer in use
2015-05-29 16:59:17 -04:00
8d726709ad
Merge pull request #13578 from WeiZhang555/errRet
...
return error when failed to read http response body
2015-05-29 16:57:27 -04:00
67cb748e26
Add note about overlay not being production ready
...
Add a paragraph in cli.md mentioning that overlay is not a production
ready graphdriver.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-29 13:53:09 -07:00
e02744404d
Adjust vim ftdetect to match "Dockerfile", "dockerfile", and "Dockerfile.*" which are all reasonably safe to assume "this is a Dockerfile"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-29 13:46:51 -07:00
62d3b1bf2e
Add embedded shell script highlight to vim syntax
...
This highlights `RUN`, `CMD`, and `ENTRYPOINT` lines using shell highlighting. It doesn't bother detecting the JSON forms, but that's OK because JSON arrays highlight pretty reasonably with shell highlights. :)
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-29 13:39:37 -07:00
ec97f41465
Fix regression in stats API endpoint where stream query param default is true
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-29 22:38:36 +02:00
3b831a2f3a
Merge pull request #13589 from vdemeester/pkg-stringutils-test-coverage
...
Add test coverage for pkg/stringutils
2015-05-29 13:38:12 -07:00
15134a3320
Remove PortSpecs from Config
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-29 22:38:09 +02:00
c42810fe99
Merge pull request #13564 from burke/fix-memory-leak
...
Use bufio.Reader instead of bufio.Scanner for logger.Copier
2015-05-29 13:37:15 -07:00
04a451998f
Merge pull request #13255 from vdemeester/11588-pkg-pools-test-coverage
...
Add test coverage for pkg/pools (#11588 )
2015-05-29 13:36:20 -07:00
4c9fd72a91
Merge pull request #13598 from calavera/fix_windows_build
...
Do not require cgroups capabilities on windows to run the integration tests.
2015-05-29 12:57:40 -07:00
98180b8954
Finally add precise/12.04 as a build-deb target
...
Ubuntu Precise has a number of warts that made it non-trivial to add initially, but I've managed to work through some of them and come up with a working build. Two important parts to note are that it has neither the `btrfs` nor the `devicemapper` graphdriver backends since `btrfs-tools` and `libdevmapper-dev` in the precise repositories are too ancient for them to even compile.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-29 12:55:58 -07:00
b21ef2d1d3
Merge pull request #13581 from s7v7nislands/fix_lxc_url
...
update lxc url
2015-05-29 11:48:44 -07:00
a914101296
Do not require cgroups capabilities on windows to run the integration tests.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-29 11:42:40 -07:00
6d8e517bce
Merge pull request #13482 from boucher/criu-libcontainer-update
...
Update vendored libcontainer
2015-05-29 10:28:58 -07:00
f1fed87fc0
Merge pull request #13392 from runcom/syslog-connection-url-log-opt
...
Add syslog-address log-opt
2015-05-29 10:21:57 -07:00
b372f9f224
fix experimental version and release script
...
add api version experimental
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-29 10:00:22 -07:00
24d9edd8d1
Merge pull request #13585 from albers/completion-1.7
...
Update bash completion for 1.7.0
2015-05-29 09:43:44 -07:00
f779cfc5d8
Use bufio.Reader instead of bufio.Scanner for logger.Copier
...
When using a scanner, log lines over 64K will crash the Copier with
bufio.ErrTooLong. Subsequently, the ioutils.bufReader will grow without
bound as the logs are no longer being flushed to disk.
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
2015-05-29 12:29:42 -04:00
87d36079a7
Merge pull request #13574 from anchal-agrawal/13345-fix-mac-install-docs
...
Fixing Mac Boot2Docker installation doc Your fix has left the building.
2015-05-29 09:13:04 -07:00
00b8d37084
Merge pull request #13563 from calavera/fix_bind_mount_regression
...
Mount bind volumes coming from the old volumes configuration.
2015-05-29 11:13:33 -04:00
6c36572e8b
Add test coverage for pkg/stringutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-05-29 15:49:29 +02:00
34342e9cef
Merge pull request #13583 from vdemeester/pkg-timeutils-test-coverage
...
Add test coverage to pkg/timeutils
2015-05-29 09:35:34 -04:00
112b7e6546
avoid 88-chars mountpoint length limit on freebsd
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-05-29 16:33:04 +03:00
059dc15ab9
Merge pull request #12773 from HuKeping/update-docs
...
Fix inconsistent of remote API and document
2015-05-29 06:27:15 -07:00
22fda380a9
Fix inconsistent of remote API and document
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-05-29 22:56:35 +08:00
9aa8a590b7
Add test coverage to pkg/timeutils
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-05-29 15:09:35 +02:00
b2832dffe5
Update bash completion for 1.7.0
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-05-29 12:42:59 +02:00
2b69b326bc
update lxc url
...
Signed-off-by: XiaoBing Jiang <s7v7nislands@gmail.com >
2015-05-29 16:10:57 +08:00
de225b5d13
return error when failed to read http response body
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-05-29 12:52:51 +08:00
6c49576a86
bug fix: close http response body no longer in use
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-05-29 12:03:40 +08:00
27ffccf540
Fixing Mac Boot2Docker installation doc
...
Signed-off-by: Anchal Agrawal <aagrawa4@illinois.edu >
2015-05-28 22:53:54 -05:00
7f6a7973cd
Merge pull request #13566 from jfrazelle/fix-lxc-tests
...
skip test on lxc
2015-05-28 16:19:21 -07:00
fcdea09ea5
Merge pull request #13530 from jfrazelle/bump-api-version
...
bump api version to 1.20
2015-05-28 16:14:30 -07:00
7317b84ce0
Merge pull request #13558 from calavera/doc_ulimit
...
Add comment about ulimit format.
2015-05-28 15:51:06 -07:00
e8c88d2533
Add syslog-address log-opt
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-29 00:42:11 +02:00
e76d0f5571
bump api version to 1.20
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-28 15:32:05 -07:00
742a8a6cff
Merge pull request #13562 from moxiegirl/fixes-to-119-api
...
Fixes to the 1.19 version Thank you @thaJeztah and @jfrazelle!
2015-05-28 15:25:08 -07:00
7b6f9da52c
Make the version mismatch message more explicit.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-05-28 17:54:48 -04:00
1392f99a97
skip test on lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-28 14:54:12 -07:00
30901609a8
Fixes to the 1.19 version
...
updating with changes to this instant
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-28 14:25:26 -07:00
1f22676fcb
Merge pull request #13559 from LK4D4/fix_systemd_listen
...
Treat systemd listeners as all other
2015-05-28 14:15:34 -07:00
9292859fce
Add comment about ulimit format.
...
Fixes #12116
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-28 14:14:07 -07:00
53d9609de4
Mount bind volumes coming from the old volumes configuration.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-28 14:06:17 -07:00
e58161fedc
Expand unshare test to include privileged test
...
This ensures that AppArmor, not other mechanisms used
by Docker or the kernel is restricting the mount.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-05-28 16:49:48 -04:00
6f9fa64645
Treat systemd listeners as all other
...
Fix #13549
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-28 12:15:03 -07:00
d66ae67418
Windows: Undo 908db518 for Windows daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-28 12:04:09 -07:00
3bda841e3e
Merge pull request #13430 from runcom/fix-race-modify-request
...
Fix race in httpsRequestModifier.ModifyRequest when writing tlsConfig
2015-05-28 11:31:04 -07:00
37cc42ee0e
Merge pull request #13416 from Microsoft/10662-fixintegrationtests
...
Windows: Pass temp environment through
2015-05-28 11:22:37 -07:00
617a0c2fde
Merge pull request #13428 from duglin/niceHelp2
...
Nice help2
2015-05-28 11:09:02 -07:00
f99a962742
Merge pull request #13539 from tianon/deb-ubuntu-wily
...
Add Ubuntu Wily (15.10) as a build-deb target
2015-05-28 11:01:27 -07:00
24a0800d87
Merge pull request #13551 from albers/pgp-over-http
...
Use http for PGP key download
2015-05-28 10:59:14 -07:00
5bb6262d88
Merge pull request #13529 from hqhq/hq_skip_cgroup_test
...
Skip test if not have Cpu quota or Cpu period
2015-05-28 10:57:32 -07:00
85096cfd4f
Merge pull request #13512 from moysesb/progressreader_close_silently
...
Close progressreader silently when read is complete.
2015-05-28 10:54:08 -07:00
0256bbdebb
Merge pull request #13039 from stevenbrichards/13031-Upstart
...
Fix check for upstart not detecting properly
2015-05-28 10:38:55 -07:00
b90732f801
Merge pull request #13548 from kvasdopil/zfs_magicnum
...
ZFS filesystem magic number check is fixed on FreeBSD
2015-05-28 10:27:12 -07:00
709fa2ad87
Modified progress reader to close silently when read is complete.
...
Closes #13432
Signed-off-by: Moysés Borges <moysesb@gmail.com >
2015-05-28 14:09:30 -03:00
45488f9dc0
Merge pull request #13259 from Microsoft/10662-configbridge
...
Windows: factor out bridgeConfig from server+config
2015-05-28 12:59:57 -04:00
70bedc8ee5
Merge pull request #13538 from tianon/rpm-fedora-22
...
Add fedora:22 to our rpm targets
2015-05-28 09:55:09 -07:00
e5ff643aed
Fixes #13031 - Check for upstart or init is not detecting properly
...
This will now properly check whether /etc/init.d/docker or service docker is
invoking the script and respond to the user accordingly.
Signed-off-by: Steven Richards <steven@axiomzen.co >
2015-05-28 09:52:05 -07:00
27919bab2d
Merge pull request #13269 from Microsoft/10662-statsrefactor
...
Windows: refactor stats
2015-05-28 12:46:34 -04:00
33c7c01a62
Merge pull request #13055 from Microsoft/10662-internalsfixperms
...
Windows: Fixup builder/internals.go
2015-05-28 12:31:45 -04:00
a364dd8fc6
Merge pull request #13535 from coolljt0725/fix_automatically_publish_without_publish
...
Fix automatically publish ports without --publish-all or --publish
2015-05-28 11:49:53 -04:00
36bf6e4440
zfs magicnumber check on freebsd is fixed
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-05-28 18:38:08 +03:00
c1c5d760a6
Use http for PGP key download
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-05-28 16:43:36 +02:00
ac7a33b45c
Merge pull request #13541 from coolljt0725/remove_reduntant_enter_create
...
Clean up: remove redundant '\n' in Create
2015-05-28 10:30:07 -04:00
bcd076b5fe
Clean up: remove redundant '\n' in Create
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-28 17:08:55 +08:00
38c77ba876
Add Ubuntu Wily (15.10) as a build-deb target
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-28 01:06:11 -07:00
96903c837f
Add fedora:22 to our rpm targets
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-28 01:01:45 -07:00
7011d9ee8a
Merge pull request #13515 from lloydde/doc-cli-lint
...
doc cli lint.
2015-05-28 09:13:25 +02:00
34e5b6af19
Skip test if not have Cpu quota or Cpu period
...
Closes : #13522
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-28 14:59:58 +08:00
6473b0f127
remove redundant mount/unmount calls on commit
...
daemon.Diff already implements mounting for naivegraphdriver and
aufs which does diffing on its owns does not need the container to be mounted.
So new filesystem driver should mount filesystems on their own if it is needed
to implement Diff(). This issue was reported by @kvasdopil while working on a
freebsd port, because freebsd does not allow mount an already mounted
filesystem. Also it saves some cycles for other operating systems as well.
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-28 08:43:31 +02:00
15b45113eb
Merge pull request #13532 from jfrazelle/fix-fix-release-script
...
fix release script
2015-05-27 23:17:45 -06:00
9f619282db
fix release script
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-27 20:57:46 -07:00
71a4990229
Fix error when trying to delete an image due to a bad container
...
I ran into a situation where I was trying:
`docker rmi busybox`
and it kept failing saying:
`could not find image: Prefix can't be empty`
While I have no idea how I got into this situation, it turns out this is
error message is from `daemon.canDeleteImage()`. In that func we loop over
all containers checking to see if they're using the image we're trying to
delete. In my case though, I had a container with no ImageID. So the code
would die tryig to find that image (hence the "Prefix can't be empty" err).
This would stop all processing despite the fact that the container we're
checking had nothing to do with 'busybox'.
My change logs the bad situation in the logs and then skips that container.
There's no reason to fail all `docker rmi ...` calls just because of one
bad container.
Will continue to try to figure out how I got a container w/o an ImageID
but as of now I have no idea, I didn't do anything but normal docker cli
commands.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-27 19:19:43 -07:00
2daede5a9c
Merge pull request #13374 from RichardScothern/v2-mirror
...
V2 mirror support
2015-05-27 21:15:26 -04:00
c2e8f07a05
Merge pull request #13518 from mrjana/clone
...
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
2015-05-27 17:42:10 -07:00
e817e08481
Review feedback:
...
- Match verbiage with other output
- Remove dead code and clearer flow
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-05-27 17:29:24 -07:00
d429465b37
Vendoring in libnetwork 2da2dc055de5a474c8540871ad88a48213b0994f
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-05-28 00:04:01 +00:00
c9d3681a5d
Merge pull request #13477 from kvasdopil/freebsd-build
...
Make hack/make.sh work on FreeBSD
2015-05-27 17:42:49 -06:00
49e734c6e4
Merge pull request #13496 from Microsoft/10662-windefaults
...
Windows: Set default exec driver to windows
2015-05-27 16:02:24 -07:00
f6f7d35248
Restore the stripped registry version number
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-05-27 15:15:47 -07:00
b4a52fc4e9
doc cli lint.
...
- 79 char line length (non-command).
- Consistent single space between sentences.
- Replace start of line tabs with spaces.
- Remove trailing white space.
- Consistent "**Note:**" style.
https://docs.docker.com/project/doc-style/#notes
- Replace the ``` sections with indented code.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com >
2015-05-27 15:07:57 -07:00
ec471a7c9b
Merge pull request #12572 from jfrazelle/selinux-labels-carry
...
Modify volume mounts SELinux labels on the fly based on :Z or :z
2015-05-27 14:46:16 -07:00
b2a43baf2e
Use SELinux labels for volumes
...
Fixes a regression from the volumes refactor where the vfs graphdriver
was setting labels for volumes to `s0` so that they can both be written
to by the container and shared with other containers.
When moving away from vfs this was never re-introduced.
Since this needs to happen regardless of volume driver, this is
implemented outside of the driver.
Fixes issue where `z` and `Z` labels are not set for bind-mounts.
Don't lock while creating volumes
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-27 13:43:38 -07:00
35a7f0c59e
Merge branch 'master' of github.com:docker/docker into kill
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-05-27 16:37:32 -04:00
f5d3311839
Merge pull request #13449 from duglin/FixRaceInStop
...
Fix race condition on container stop
2015-05-27 13:05:53 -07:00
af7d17a6c9
apply selinux labels volume patch on volumes refactor
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-27 12:50:16 -07:00
160dc79db0
Modify volume mounts SELinux labels on the fly based on :Z or :z
...
This patch is extending the qualifiers on the -v command to allow
an admin to tell the system to relabel, content. There might be a
need for something similar for changing the DAC Permissions.
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-27 12:50:16 -07:00
7b57fae046
Merge pull request #13507 from hqhq/hq_remove_redundant_set_header
...
Remove redundant set header
2015-05-27 10:44:57 -07:00
26650e2ccc
Merge pull request #13483 from jfrazelle/lxc-we-meet-again
...
fix lxc tests unshare, they dont use our apparmor profile
2015-05-27 10:22:31 -07:00
b29f3bb1c3
Merge pull request #13506 from hqhq/hq_fix_wrong_return_nil
...
Return err if we got err on parseForm
2015-05-27 12:38:53 -04:00
2029257e3c
Merge pull request #13493 from jlhawn/volume_unmount_fix
...
Fix container unmount networkMounts
2015-05-27 08:44:11 -07:00
f3e56420a3
Merge pull request #13499 from cpuguy83/fix_stats_unsubscribe
...
Fix unregister stats on when rm running container
2015-05-27 11:10:36 -04:00
66121d1b45
Merge branch 'master' of github.com:docker/docker into kill
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-05-27 11:00:12 -04:00
3f66f6f2f0
Merge pull request #13500 from HuKeping/cleanup
...
Remove unused code
2015-05-27 13:59:40 +02:00
a34cb32186
Remove unused code
...
As far as I see, it's a dead code.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-05-27 22:39:02 +08:00
94d604357f
Remove redundant set header
...
Which is already done in writeJSON.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-27 18:25:57 +08:00
7c7aebfcfe
Return err if we got err on parseForm
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-27 18:16:28 +08:00
13f2aa7068
Add --net=container with --publish --publish-all --expose error out
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-27 15:31:06 +08:00
f228fb09ac
script cleaned up
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-05-27 10:21:09 +03:00
b3e8ab3021
Fix unregister stats on when rm running container
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-26 22:22:03 -04:00
e580734149
Merge pull request #13406 from moxiegirl/experimental-work
...
Placeholder Part II: For commenting about install
2015-05-26 18:19:26 -07:00
bdb77078b5
Ensure all the running containers are killed on daemon shutdown
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-27 09:09:25 +08:00
04f99a6ca8
Fix container unmount networkMounts
...
UnmountVolumes used to also unmount 'specialMounts' but it no longer does after
a recent refactor of volumes. This patch corrects this behavior to include
unmounting of `networkMounts` which replaces `specialMounts` (now dead code).
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-05-26 17:38:26 -07:00
b50e780925
Merge pull request #13491 from jfrazelle/revert-exec-privileged
...
Revert "Add docker exec run a command in privileged mode"
2015-05-26 16:41:50 -07:00
838e1a8947
Merge pull request #13487 from calavera/volume_load_regression_test
...
Add regression test to make sure we can load old containers with volumes.
2015-05-26 19:40:08 -04:00
54b514735c
Merge pull request #12881 from nakedible/patch-1
...
Prevent fallback to v1 registry for digest pulls
2015-05-26 19:24:37 -04:00
041ba90dbb
Windows: Set default exec driver to windows
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-26 16:17:33 -07:00
1ba1a0550f
Fixes title, line wrap, and Adds install area
...
Tibor's comment
Updating with the new plugins
Entering comments from Seb
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-26 15:37:38 -07:00
0d445685b8
Merge pull request #13444 from runcom/fix-race-stats
...
Fix race in stats cli and native driver
2015-05-26 15:34:50 -07:00
ea0e15ba62
Add regression test to make sure we can load old containers with volumes.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-26 15:28:58 -07:00
bd18d86250
Merge pull request #13492 from calavera/donot_force_syscall_unmount_on_cleanup
...
Do not force `syscall.Unmount` on container cleanup.
2015-05-26 15:23:16 -07:00
f78dce152c
Do not force syscall.Unmount on container cleanup.
...
This is not necessary and it's a regression from the old behavior.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-26 14:28:26 -07:00
de318d8c1d
Merge pull request #13489 from cpuguy83/cleanup_rm_funcs
...
Cleanup container rm funcs
2015-05-26 14:24:02 -07:00
40b71adee3
Revert "Add docker exec run a command in privileged mode"
...
This reverts commit 72a500e9e5princess@docker.com >
Conflicts:
daemon/execdriver/native/exec.go
integration-cli/docker_cli_exec_test.go
runconfig/exec.go
2015-05-26 14:12:16 -07:00
47e727d1fc
Merge pull request #13440 from LK4D4/fix_bridge_none
...
Fix network with -b none
2015-05-26 14:08:21 -07:00
3b795e035b
Merge pull request #13409 from LK4D4/add_opts_to_checkconfig
...
Add some opts to checkconfig
2015-05-26 13:54:23 -06:00
4509f91b26
Update vendored libcontainer to v2.1
...
Docker-DCO-1.1-Signed-off-by: Ross Boucher <rboucher@gmail.com > (github: boucher)
2015-05-26 12:47:57 -07:00
f8628ba891
Cleanup container rm funcs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-26 15:38:52 -04:00
c19962ade1
Allow mirroring only for the official index
...
Strip authconfig from session to keep credentials from being sent to the mirror.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-05-26 11:08:19 -07:00
13deed3801
Registry v2 mirror support.
...
The v2 registry will act as a pull-through cache, and needs to be
handled differently by the client to the v1 registry mirror.
See docker/distribution#459 for details
Configuration
Only one v2 registry can be configured as a mirror. Acceptable configurations
in this chanage are: 0...n v1 mirrors or 1 v2 mirror. A mixture of v1 and v2
mirrors is considered an error.
Pull
If a v2 mirror is configured, all pulls are redirected to that mirror. The
mirror will serve the content locally or attempt a pull from the upstream mirror,
cache it locally, and then serve to the client.
Push
If an image is tagged to a mirror, it will be pushed to the mirror and be
stored locally there. Otherwise, images are pushed to the hub. This is
unchanged behavior.
Signed-off-by: Richard Scothern <richard.scothern@gmail.com >
2015-05-26 11:08:19 -07:00
fc679bebb9
Merge pull request #13479 from Microsoft/10662-fixcontaineragain
...
Windows: Fix up container again
2015-05-26 10:49:48 -07:00
7853bd29ec
Merge pull request #13480 from Microsoft/10662-fixvolumecompile
...
Windows: Fix volume_windows compile
2015-05-26 10:32:44 -07:00
a08fb73f93
fix lxc tests unshare, they dont use our apparmor profile
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-26 10:31:21 -07:00
1dc0499b64
Windows: Fix volume_windows compile
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-26 09:43:21 -07:00
5d207de509
Windows: Fix up container again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-26 09:33:55 -07:00
0fccc40307
Merge pull request #13471 from ibuildthecloud/no-nil
...
Preinitialize MountPoints to avoid assigning to a nil map
2015-05-26 12:26:49 -04:00
aee9ac302d
Merge pull request #13335 from jfrazelle/add-apparmor-unshare-test
...
add unshare apparmor profile test
2015-05-26 17:32:45 +02:00
9e00e34092
Make hack/make.sh work on FreeBSD
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-05-26 15:59:36 +03:00
9e425d56d0
Add lock before accessing native driver active containers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-26 13:55:02 +02:00
77280a87b7
Fix race in stats cli and native driver
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-26 13:55:02 +02:00
59214a0737
Preinitialize MountPoints to avoid assigning to a nil map
...
Fixes #13435
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-05-25 19:37:57 -07:00
628c396555
Merge pull request #13467 from epc/epc-2015145
...
Documentation Copy edits for typos
2015-05-25 14:32:17 -04:00
7d75c5be95
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
2015-05-25 13:39:56 -04:00
8efd87f5a2
Merge pull request #13447 from justone/mention-dockviz-alternative
...
mention dockviz alternative
2015-05-25 19:26:19 +02:00
187362414d
Merge pull request #13418 from donkirkby/patch-1
...
small formatting and grammar fixes
2015-05-25 19:15:47 +02:00
453c0abf1c
mention dockviz alternative
...
closes #13431
Signed-off-by: Nate Jones <nate@endot.org >
2015-05-25 09:43:25 -07:00
c12081987a
Merge pull request #13461 from moxiegirl/add-glossary-back
...
Adding back in Glossary
2015-05-25 18:32:15 +02:00
5f57143b31
Merge pull request #13458 from janjaapdriessen/patch-1
...
Fix markdown syntax for "docker run" instruction example
2015-05-25 18:07:19 +02:00
5051aee555
small formatting and grammar fixes
...
Having the line break in the middle of a code span caused the line break to appear on the web site version, even though it doesn't appear in the preview.
The other two changes are just small grammar improvements.
Signed-off-by: don <donkirkby@gmail.com >
2015-05-25 09:05:42 -07:00
e2ed11df13
Merge pull request #13445 from lloydde/doc-cli-no-head
...
doc: cli images examples rm "| head".
2015-05-25 17:32:13 +02:00
02405a96b2
Markdown changes (thanks to runcom for the rebase+squash handholding)
...
Signed-off-by: Jan-Jaap Driessen <janjaapdriessen@gmail.com >
2015-05-25 17:24:41 +02:00
08da08f3f9
Adding back in Glossary
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-25 07:39:27 -07:00
9c65862cd6
Updating with the created state
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-25 07:33:01 -07:00
29bdcaf3cf
Fix race condition on container stop
...
I'm fairly consistently seeing an error in
DockerSuite.TestContainerApiRestartNotimeoutParam:
docker_api_containers_test.go:969:
c.Assert(status, check.Equals, http.StatusNoContent)
... obtained int = 500
... expected int = 204
And in the daemon logs I see:
INFO[0003] Container 8cf77c20275586b36c5095613159cf73babf92ba42ed4a2954bd55dca6b08971 failed to exit within 0 seconds of SIGTERM - using the force
ERRO[0003] Handler for POST /containers/{name:.*}/restart returned error: Cannot restart container 8cf77c20275586b36c5095613159cf73babf92ba42ed4a2954bd55dca6b08971: [2] Container does not exist: container destroyed
ERRO[0003] HTTP Error err=Cannot restart container 8cf77c20275586b36c5095613159cf73babf92ba42ed4a2954bd55dca6b08971: [2] Container does not exist: container destroyed
statusCode=500
Note the "container destroyed" error message. This is being generatd by
the libcontainer code and bubbled up in container.Kill() as a result of the
call to `container.killPossiblyDeadProcess(9)` on line 439.
See the comment in the code, but what I think is going on is that because we
don't have any timeout on the Stop() call we immediate try to force things to
stop. And by the time we get into libcontainer code the process just finished
stopping due to the initial signal, so this secondary sig-9 fails due to the
container no longer running (ie. its 'destroyed').
Since we can't look for "container destroyed" to just ignore the error, because
some other driver might have different text, I opted to just ignore the error
and keep going - with the assumption that if it couldnt send a sig-9 to the
process then it MUST be because its already dead and not something else.
To reproduce this I just run:
curl -v -X POST http://127.0.0.1:2375/v1.19/containers/8cf77c20275586b36c5095613159cf73babf92ba42ed4a2954bd55dca6b08971/restart
a few times and then it fails with the HTTP 500.
Would like to hear some other ideas on to handle this since I'm not
thrilled with the proposed solution.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-25 04:28:23 -07:00
fd28f15288
Merge pull request #13452 from WeiZhang555/cleanup
...
Cleanup: change test func name
2015-05-25 13:11:31 +02:00
ab121345ee
Cleanup: change test func name
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-05-25 14:51:10 +08:00
ca23ac37ef
doc: cli images examples rm "| head".
...
It's a given that lines of example output might be truncated or come
from a contrived environment.
Signed-off-by: Lloyd Dewolf <foolswisdom@gmail.com >
2015-05-24 14:04:13 -07:00
3cb14df68c
Fix network with -b none
...
* Don't AllocateNetwork when network is disabled
* Don't createNetwork in execdriver when network is disabled
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-24 08:26:59 -07:00
f83073d3eb
Merge pull request #13424 from mavenugo/vendorin
...
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
2015-05-23 21:08:58 -07:00
ead2f80073
Windows: factor out bridge server+config
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-23 19:22:06 -07:00
bce3e761c0
Merge pull request #13161 from calavera/plugin_discovery
...
Proposal: Volume refactor and external volume plugins
2015-05-23 18:44:18 -07:00
a3d22c764c
Vendoring in libnetwork 67438080724b17b641b411322822c00d0d3c3201
...
This version brings in upto-date important bug-fixes from libnetwork
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-05-23 18:42:34 -07:00
2e2e36e476
Merge pull request #13427 from moxiegirl/event-state-12164
...
Finally, finally, close #12164
2015-05-23 15:37:57 -07:00
a27395e6df
Fix race in httpsRequestModifier.ModifyRequest when writing tlsConfig
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-23 23:50:08 +02:00
6de4138465
Finally, finally, close #12164
...
Updating with typo Seb found
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-23 14:27:50 -07:00
8324d7918b
Carry #11858
...
Continues 11858 by:
- Making sure the exit code is always zero when we ask for help
- Making sure the exit code isn't zero when we print help on error cases
- Making sure both short and long usage go to the same stream (stdout vs stderr)
- Making sure all docker commands support --help
- Test that all cmds send --help to stdout, exit code 0, show full usage, no blank lines at end
- Test that all cmds (that support it) show short usage on bad arg to stderr, no blank line at end
- Test that all cmds complain about a bad option, no blank line at end
- Test that docker (w/o subcmd) does the same stuff mentioned above properly
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-23 09:14:18 -07:00
89582f9781
Merge pull request #13403 from hqhq/hq_fix_ipcmode_check
...
Don't check running container at create time
2015-05-23 08:32:51 -07:00
8d0486832d
Document in the experimental section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
(cherry picked from commit a31633c2707c78c2ffd684a5a3e576f310af0fb5)
2015-05-22 17:00:04 -07:00
ab8a5bcf04
Move Documentation changes out or this PR.
...
The will come in a follow up PR inside the experimental section.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-22 16:58:48 -07:00
d592778f4a
Propagate unmount events to the external volume drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-22 16:43:34 -07:00
84aae5a226
Don't check running container at create time
...
We should let user create container even if the container he wants
join is not running, that check should be done at start time.
In this case, the running check is done by getIpcContainer() when
we start container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-23 07:15:14 +08:00
fba44a7ccf
Windows: Pass temp environment through
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-22 15:14:22 -07:00
4bcfa47362
Merge pull request #13414 from tiborvass/no-distrib-in-dockerfile
...
Remove distribution source code from /go/src
2015-05-22 15:11:36 -07:00
2b0b0c4b97
Remove distribution source code from /go/src
...
We already vendor distribution under ./vendor, but
because the GOPATH is /go:/go/src/github.com/.../vendor
Go will always compile the source code at /go not in ./vendor.
Apart from the fact that it is very inconvenient during
development, it was also a time-bomb: someone vendors a fix
from upstream distribution, but forgets to update
REGISTRY_COMMIT in the Dockerfile, and the binary doesn't get
the fix.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-05-22 16:50:56 -04:00
6cc4cf7c0c
Add BRIDGE_NETFILTER to check-config.sh
...
It is needed to use network with --userland-proxy=false and for
--icc=false
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-22 10:46:55 -07:00
f2c0b54315
Merge pull request #13408 from jfrazelle/13407-fix-experimental-build
...
lol 108 chars ETOOMANY
2015-05-22 10:42:57 -07:00
ceca037d05
Add optional CONFIG_BLK_CGROUP and CONFIG_IOSCHED_CFQ to check-config.sh
...
It is needed for blkio.weight support
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-22 10:41:29 -07:00
ed9ad0be6d
Merge pull request #13391 from jfrazelle/add-security-maintainers
...
Add diogo and nathan as security maintainers.
2015-05-22 10:12:04 -07:00
a1ea562b20
lol 108 chars ETOOMANY
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-22 10:10:17 -07:00
d71ba0cc83
Merge pull request #13372 from calavera/move_socket_creation_to_package
...
Extract sockets initialization to a package.
2015-05-22 08:46:31 -07:00
8e76c0d1d8
Merge pull request #13303 from moxiegirl/experimental-work
...
Experimental features placeholder
2015-05-22 08:42:57 -07:00
0775456b46
Merge pull request #13401 from WeiZhang555/cleanup
...
Delete "defer deleteAllContainers()" from integration-cli
2015-05-22 09:17:23 -04:00
6809fa6861
Delete "defer deleteAllContainers()" from integration-cli
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-05-22 17:01:52 +08:00
a867c1b70a
Mark volume drivers and plugins as experimental in the documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-21 20:34:17 -07:00
3bf0ca31cf
Allow named volumes for external drivers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-21 20:34:17 -07:00
2653c7c16c
Make API volume-driver dependent on 'experimental'
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-21 20:34:17 -07:00
4fc37a1ede
Mark --volume-driver as experimental
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-21 20:34:17 -07:00
7da5a7eb66
Disable -v overloading
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
(cherry picked from commit ec5a362fb93358244305067419589f602fd33807)
2015-05-21 20:34:17 -07:00
81fa9feb0c
Volumes refactor and external plugin implementation.
...
Signed by all authors:
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
Signed-off-by: Jeff Lindsay <progrium@gmail.com >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Signed-off-by: Luke Marsden <luke@clusterhq.com >
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-21 20:34:17 -07:00
23e8dff9e7
Merge pull request #13399 from hqhq/hq_fix_run_test
...
Fix test failure when --net none build
2015-05-21 21:50:44 -04:00
88275e94d6
Merge pull request #12766 from Microsoft/10662-graphdriverrefactor
...
Windows: graphdriver refactor
2015-05-21 21:28:24 -04:00
7c6cab6345
Add diogo and nathan as security maintainers.
...
Updated my email.
Also retabbed the whole file... I am OCD.
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-21 17:59:38 -07:00
2b8271399e
Merge pull request #13386 from icecrime/experimental_suffix_version
...
Suffix experimental version / fix warning output
2015-05-21 17:42:23 -07:00
c0dd8538db
Fix test failure when --net none build
...
Closes : #13369
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-22 08:21:09 +08:00
78578125ce
Add suffix to experimental builds version
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-21 16:27:42 -07:00
ddf783ed2f
Merge pull request #13395 from SvenDowideit/cs-docker-1.6.2cs5-release-notes
...
Publish release notes for latest cs Docker engine
2015-05-22 09:16:12 +10:00
740b1b5a2d
Publish release notes for latest cs Docker engine
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-22 09:14:06 +10:00
b639f00280
Merge pull request #13336 from calavera/document_missing_build_flags
...
Document missing build flags.
2015-05-22 01:03:37 +02:00
6c5a140f8a
Merge pull request #13393 from tiborvass/fix-token-bug
...
registry: Fix auth bug
2015-05-21 15:58:17 -07:00
2be757f869
Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver
...
Windows: Empty Windows Exec Driver
2015-05-21 15:30:21 -07:00
a85b09d8a4
Document missing build flags.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-21 15:02:00 -07:00
fc29f7f70b
registry: fix auth bug
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-05-21 16:53:22 -04:00
7fffcfff32
Merge pull request #13387 from cpuguy83/fix_ngroutine_test
...
Better checking for LogsFollowGoroutinesWithStdout
2015-05-21 12:31:57 -07:00
6cdf8623d5
Do not attempt releasing network when not attached to any network
...
Sometimes container.cleanup() can be called from multiple paths
for the same container during error conditions from monitor and
regular startup path. So if the container network has been already
released do not try to release it again.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-05-21 18:57:17 +00:00
2805ff1ece
Better checking for LogsFollowGoroutinesWithStdout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-21 14:13:01 -04:00
523d2f6a04
Merge pull request #13371 from theadactyl/patch-2
...
Add theadactyl as community manager
2015-05-21 11:06:38 -07:00
00e78a18ba
Merge pull request #13380 from coolljt0725/add_missing_check_return_err_function
...
Add missing return error check for container.WriteHostConfig() in container_linux.go
2015-05-21 09:32:52 -07:00
0ac5e8a170
Merge pull request #13383 from duglin/CreateRMTest
...
Add a 'docker create' + 'docker rm' testcase
2015-05-21 09:32:32 -07:00
012e588a74
Add a 'docker create' + 'docker rm' testcase
...
Per @thaJeztah's comment here: https://github.com/docker/docker/pull/13367#issuecomment-104286651
I couldn't find an existing test that covered this.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-21 07:30:51 -07:00
a9bc05a2f8
Add missing return error check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-21 17:03:43 +08:00
ef0a145593
Merge pull request #13310 from coolljt0725/make_ps_size_show_virtual_size_work
...
Make docker ps --size show virtual size really work
2015-05-20 18:32:11 -07:00
7231692a02
Experimental features placeholder
...
Signed-off-by: Mary Anthony <mary@docker.com >
Adding experimental features into the mix
Signed-off-by: Mary Anthony <mary@docker.com >
renaming file
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-20 18:10:07 -07:00
d0de2b1e2f
Make docker ps --size show virtual size really work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-21 08:57:11 +08:00
366fe46c6a
Merge pull request #13326 from tianon/squeeze-lts
...
Fix "squeeze" detection in contrib/mkimage/debootstrap
2015-05-20 17:41:27 -07:00
f74d9b8672
Merge pull request #13195 from albers/completion-custom-host
...
respect -H in bash completion
2015-05-20 17:31:16 -07:00
c68915ff70
Merge pull request #13270 from samsabed/gpg-dockerfile
...
Trivial use port 80 for dev Dockerfile gpg
2015-05-20 17:30:01 -07:00
28465588d0
Merge pull request #13241 from hqhq/hq_enhance_checkconfig
...
Enhance check-config.sh
2015-05-20 17:25:30 -07:00
0bfbc6e788
Extract sockets initialization to a package.
...
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-20 16:48:39 -07:00
f86d39c6b6
Add theadactyl as community manager
...
Added Community Manager role to Org.Operators and added theadactyl as community manager
Signed-off-by: Thea Lamkin <thea@docker.com >
2015-05-20 16:21:36 -07:00
2bf409d4ef
Merge pull request #13366 from moxiegirl/162-release-notes
...
Updating with 1.6.2-cs5 notes
2015-05-20 15:03:27 -07:00
7554949da6
Updating with 1.6.2-cs5 notes
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-20 14:39:00 -07:00
0fddb6ad7e
Merge pull request #13263 from rajdeepd/dry-run-test-2
...
TestCase for CpuShares and Cpuset
2015-05-20 23:33:42 +02:00
6f75dd85c5
add unshare apparmor profile test
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-20 14:06:00 -07:00
19790c46dc
Merge pull request #13338 from icecrime/13023_experimental_env_var
...
Add DOCKER_EXPERIMENTAL environment variable
2015-05-20 13:04:28 -07:00
79532e6d58
Merge pull request #13078 from Microsoft/10662-pkgarchive
...
Windows: Archive package changes for Windows daemon
2015-05-20 12:39:26 -07:00
ca6722f1c5
Add DOCKER_EXPERIMENTAL environment variable
...
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-20 12:21:17 -07:00
dec13cef2a
Merge pull request #13346 from mrjana/cnm_integ
...
Fix network connectivity problem for non-root users
2015-05-20 12:02:07 -07:00
76a5fb3e1e
Merge pull request #13359 from davidxia/increase-docker-kill-timeout
...
Increase upstart kill timeout to 20 seconds
2015-05-20 11:54:07 -07:00
ebe344d34b
TestCase for CpuShares and Cpuset
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
2015-05-20 11:32:48 -07:00
2f9e7a067a
Increase upstart kill timeout to 20 seconds
...
Give Docker more time to kill containers before upstart kills Docker.
The default kill timeout is 5 seconds.
This will help decrease the chance of but not eliminate the chance of
orphaned container processes.
Signed-off-by: David Xia <dxia@spotify.com >
2015-05-20 14:20:46 -04:00
53a795378d
Merge pull request #13324 from duglin/BadRCOnVersion
...
Make version check return 400 instead of 404
2015-05-20 11:13:56 -07:00
afd901e408
Fix network connectivity problem for non-root users
...
If a container was started with a non-root user the container
may not be able to resolve DNS names because of too restrictive
permission in the /etc/resolv.conf container file. This problem
is in how this file gets created in libnetwork and ths PR
attempts to fix the issue by vendoring in the libnetwork code
with the fix.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-05-20 17:51:20 +00:00
c6d9c904af
Merge pull request #13356 from LK4D4/test_double_nethost
...
Test for two containers in --net=host
2015-05-20 13:17:16 -04:00
b0315e4472
Merge pull request #13354 from jacobat/comment-fix
...
Fix wording in comment
2015-05-20 09:44:23 -07:00
7e5902c92d
Test for two containers in --net=host
...
This is test for regression which was encountered during libnetwork
merging.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-20 09:35:28 -07:00
48f1cb4ebe
Windows: refactor stats
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-20 09:08:45 -07:00
007269ba24
Fix wording in comment
...
Signed-off-by: Jacob Atzen <jatzen@gmail.com >
2015-05-20 18:03:46 +02:00
62f648b061
Windows: chrootarchive refactor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-20 08:56:42 -07:00
8228ee4b0f
Windows: Archive package changes for Windows daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-20 08:55:54 -07:00
010e3e046b
Windows: Fixup builder\internals.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-20 08:55:13 -07:00
8db09ff629
Windows: Empty Windows Exec Driver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-20 08:54:04 -07:00
4e8b2509fd
Windows: graphdriver refactor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-20 08:51:27 -07:00
c696993452
Merge pull request #13347 from fntlnz/13184-remove-delete-container
...
Removed deleteContainer calls
2015-05-20 07:18:41 -07:00
37e4d40228
Merge pull request #13328 from icecrime/10662-registryfix-carry
...
Windows: fix registry filepath and location
2015-05-20 10:09:46 -04:00
086b514f6a
Removed deleteContainer calls
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
2015-05-20 08:38:23 +02:00
a09dfbcaad
Merge pull request #13214 from zoechi/master
...
add bwu_docker
2015-05-20 13:43:16 +10:00
c646e514db
Fix unit-test build error on ARM64
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-20 10:45:04 +08:00
a057accb59
Merge pull request #13315 from SvenDowideit/add-kitematic-docs
...
Add Kitematic documentation to docs.master.docker.com
2015-05-20 12:27:33 +10:00
82bd3886d5
Add Kitematic documentation to docs.master.docker.com
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-20 01:57:45 +00:00
d29dc0b608
Merge pull request #13325 from LK4D4/cleanup_mounts
...
Fix Put without Get in overlay
2015-05-20 03:11:58 +02:00
496bc46c88
Merge pull request #13060 from mrjana/cnm_integ
...
Replace existing docker networking code and integrate with libnetwork
2015-05-19 17:24:18 -07:00
f12f51b8b9
Removed dead code from docker after libnetwork integration
...
As part of this some generic packages like iptables, etchosts and resolvconf
have also been moved to libnetwork. Even though they can still be
consumed in a generic fashion they will reside and be maintained
from within the libnetwork project.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-05-19 22:40:55 +00:00
d18919e304
Docker integration with libnetwork
...
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
- Reworked daemon to allocate network resources using libnetwork.
- Reworked remove link code to also update network resources in libnetwork.
- Adjusted the exec driver command population to reflect libnetwork design.
- Adjusted the exec driver create command steps.
- Updated a few test cases to reflect the change in design.
- Removed the dns setup code from docker as resolv.conf is entirely managed
in libnetwork.
- Integrated with lxc exec driver.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-05-19 22:40:19 +00:00
272f8cd4bc
Vendoring in libnetwork, netns, netlink
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-05-19 22:40:18 +00:00
322f675123
Merge pull request #13332 from LK4D4/fix_race_in_rand
...
Use goroutine-safe version of rand.Source
2015-05-19 14:20:33 -07:00
92c869cd12
Merge pull request #12437 from fmzhen/remove-regex-replace
...
Removal of the regex to replace ips
2015-05-19 22:59:17 +02:00
4a743c39dd
Merge pull request #13119 from psankar/master
...
Followup commit to https://github.com/docker/docker/pull/12986
2015-05-19 13:14:20 -07:00
d8661250e7
Use goroutine-safe version of rand.Source
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-19 12:32:40 -07:00
a2787469ac
Using dockerCmd when possible
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
2015-05-19 20:33:59 +02:00
7fcf849749
Make version check return 400 instead of 404
...
Closes : #13321
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-19 11:21:05 -07:00
81e7d3571b
Windows: fix registry filepath and location
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-19 10:58:45 -07:00
0cc5da0635
Merge pull request #12884 from Microsoft/10662-startcontainerrefactor
...
Windows: Refactor container
2015-05-19 10:44:23 -07:00
a16b2ab274
Merge pull request #13265 from tiborvass/refactor-v1-auth
...
registry: Refactor requestfactory to use http.RoundTrippers
2015-05-19 09:57:34 -07:00
c64466fb68
Fix "squeeze" detection in contrib/mkimage/debootstrap
...
This stops us from erroneously adding "squeeze-lts" to "oldstable" which is now "wheezy", not "squeeze" (but "oldoldstable" _is_ squeeze, hence the new check on `/etc/debian_version` being `6.*` instead, and done as a `case` for the eventual addition of `wheezy-lts`, etc).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-19 09:38:27 -07:00
ea4f43c2fa
Merge pull request #13258 from unclejack/fix_build_network
...
builder/internals: set up network as bridge
2015-05-19 09:36:03 -07:00
3916561619
Fix Put without Get in overlay
...
It is called for example on daemon start after crash
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-19 09:32:23 -07:00
6f4b808f41
Merge pull request #13238 from hqhq/hq_fix_usingdocker_md
...
Remove wrong usage in usingdocker.md
2015-05-19 09:24:31 -07:00
29595fd944
Merge pull request #13311 from WeiZhang555/cleanup
...
clean some redundant else clauses
2015-05-19 07:57:52 -07:00
f46cf73295
Remove wrong usage in usingdocker.md
...
Fixes: https://github.com/docker/docker/issues/13235
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-19 13:07:41 +08:00
73823e5e56
Add transport package to support CancelRequest
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-05-18 23:31:42 -04:00
d91ae65280
clean some redundant else clauses
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-05-19 10:54:04 +08:00
3ab7ceb5d7
Removal of the regex to replace ips
...
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn >
2015-05-19 10:15:18 +08:00
48231d623f
adding nicer help when missing arguments ( #11858 )
...
Signed-off-by: Jason Shepherd <jason@jasonshepherd.net >
2015-05-19 12:02:13 +10:00
cf8c0d0f56
requestdecorator: repurpose the package and rename to useragent
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-05-18 21:51:54 -04:00
a01cc3ca77
registry: Refactor requestfactory to use http.RoundTrippers
...
This patch removes the need for requestFactories and decorators
by implementing http.RoundTripper transports instead.
It refactors some challenging-to-read code.
NewSession now takes an *http.Client that can already have a
custom Transport, it will add its own auth transport by wrapping
it.
The idea is that callers of http.Client should not bother
setting custom headers for every handler but instead it should
be transparent to the callers of a same context.
This patch is needed for future refactorings of registry,
namely refactoring of the v1 client code.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-05-18 21:51:53 -04:00
472538bee0
Merge pull request #13219 from brahmaroutu/gccgo_compile_issue
...
fix to gccgo compilation error
2015-05-18 20:43:47 -04:00
6a18412d5b
Merge pull request #13189 from alvinr/mongodb-fixup
...
Fixup MongoDB changes to line up with MongoDB 3.0 release
2015-05-18 15:22:41 -07:00
dfc329d76a
Merge pull request #13308 from lightsofapollo/issue-13307
...
Increase default connection timeout to 30s
2015-05-18 18:01:00 -04:00
f5e6f50a1e
Increase default connection timeout to 30s
...
Closes #13307
Signed-off-by: James Lal <jlal@mozilla.com >
2015-05-18 13:26:33 -07:00
3f37afe0b9
Bring MongoDB examples up to date with 3.0 release
...
Signed-off-by: Alvin Richards <alvin.richards@docker.com >
2015-05-18 13:08:31 -07:00
aac645ae04
Merge pull request #13282 from duglin/RemoveBash
...
Remove use of 'bash' from our tests
2015-05-18 13:06:21 -07:00
ccf02a9f77
Merge pull request #13279 from hqhq/hq_use_inspectfield
...
Use inspectField to simplify code
2015-05-18 14:53:37 -04:00
785ba790fb
Merge pull request #13204 from chenhanxiao/gitignore
...
gitignore: add *.rej
2015-05-18 11:51:06 -07:00
0c375a779a
Merge pull request #13244 from hqhq/hq_update_vendor_pty
...
kr/pty: vendor upstream 5cf931ef8f
2015-05-18 11:46:43 -07:00
3b69ca5b97
Merge pull request #13277 from runcom/restartpolicy-methods
...
RestartPolicy methods instead of strings checking
2015-05-18 14:36:54 -04:00
70e9e4bf9f
Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt
...
Fix incorrect document storage-opt
2015-05-18 11:35:01 -07:00
3b1f73fbcd
Remove use of 'bash' from our tests
...
Not 100% sure why our Windows test don't complain about some of these,
I'm guessing it because we have bash as part of some git package, but
either way we really shouldn't require bash to run our tests unless we
really need to - which in these cases we don't
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-18 11:29:08 -07:00
fc4f3e5650
Merge pull request #13295 from aimxhaisse/13294-mflag-panic
...
Fix panic when using default-initialized FlagSet
2015-05-18 11:27:12 -07:00
93825056d8
Merge pull request #13206 from draghuram/info_api_doc
...
Bring /info API doc in line with the actual response.
2015-05-18 20:20:57 +02:00
8f8ee7d5c3
Merge pull request #12804 from ankushagarwal/configuring-docker
...
Add CentOS/RHEL configuration to the config article
2015-05-18 14:18:32 -04:00
aca4ae8c90
Merge pull request #13280 from runcom/test-clean-from-inspect
...
Clean tests from not needed inspect call
2015-05-18 11:06:18 -07:00
cbc122e8a7
Merge pull request #13306 from ahmetalpbalkan/logopts-context
...
Pass --log-opts map to logdrivers
2015-05-18 10:58:17 -07:00
9c0608565c
Bring /info API doc in line with the actual response.
...
The fix handles versions 1.18 and 1.19.
Closes #13139 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-05-18 13:55:42 -04:00
8b11592d69
Pass -log-opts map to logdrivers
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-18 16:50:14 +00:00
19ae59f910
Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver
...
Windows: NewDriver() re-baseline parms
2015-05-18 10:56:06 -04:00
e94bab8278
Fix panic when using default-initialized FlagSet
...
Closes #13294
Signed-off-by: Sebastien Rannou <mxs@sbrk.org >
2015-05-18 11:55:38 +02:00
642e6a3773
Prevent fallback to v1 registry for digest pulls
...
The intention of the user is to download a verified image if explicitly
pulling with a digest and falling back to v1 registry circumvents that
protection.
Signed-off-by: Nuutti Kotivuori <naked@iki.fi >
2015-05-18 08:26:26 +03:00
74f8a4eca4
Use inspectField to simplify code
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-18 10:06:13 +08:00
9a09664b51
Fix automatically publish ports without --publish-all
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-18 02:57:17 +08:00
9c5635a2a0
Merge pull request #13284 from Microsoft/10662-compileconfigwindows
...
Windows: Simple import error on config_windows.go
2015-05-17 08:59:00 -07:00
79f704490c
Use port 80 for Dockerfile gpg
...
Signed-off-by: Sam Abed <sam.abed@gmail.com >
2015-05-17 13:22:21 +10:00
692b7b911e
Merge pull request #13271 from Microsoft/10662-nounixsocket
...
Windows: No unix_socket.go
2015-05-16 21:34:15 -04:00
48b4229cb4
Merge pull request #13239 from Microsoft/10662-hack
...
Make which cross binary fails clearer
2015-05-17 01:09:36 +03:00
b9e4b95788
Windows: Refactor container
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-16 12:38:20 -07:00
dfddfa6bb8
Windows: Simple import error on config_windows.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-16 12:18:55 -07:00
50b4079b5f
Windows: NewDriver() re-baseline parms
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-16 11:38:19 -07:00
a9172f572e
Merge pull request #13281 from mavenugo/plugin_typo
...
Fixing a Typo in plugins mime-type
2015-05-16 19:52:57 +02:00
a268e36719
Clean tests from not needed inspect call
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-16 18:12:54 +02:00
b5e932a3bf
Merge pull request #13237 from ahmetalpbalkan/tag/event
...
Introduce daemon event 'tag' upon image tagging
2015-05-16 09:05:03 -07:00
215a5ebdb6
Fixing a Typo in plugins mime-type
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-05-16 08:49:23 -07:00
624bf81fdb
Add RestartPolicy methods instead of using strings checking
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-16 14:15:28 +02:00
42cfc95549
Merge pull request #13273 from HuKeping/remove-deadcode
...
Cleanup dead code of integration-cli/utils.go
2015-05-16 14:03:42 +02:00
35b4ed4d17
Remove dead code of integration-cli/utils.go
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-05-16 16:49:55 +08:00
07a75c48fd
Add tests for pkg/pools
...
Fixes #11588
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-05-16 10:39:24 +02:00
115b11ae69
Merge pull request #13222 from calavera/plugins_infra
...
Remote plugins plumbing.
2015-05-15 16:37:55 -07:00
6c187b8b4b
Windows: No unix_socket.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-15 15:49:02 -07:00
ba3bcf0537
Allow to call back when a plugin is loaded.
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-05-15 13:50:44 -07:00
1630ed97ac
Introduce daemon event 'tag' upon image tagging
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-15 20:21:59 +00:00
d6a545a989
builder/internals: set up network as bridge
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-05-15 22:58:21 +03:00
27b77464d8
Merge pull request #13232 from Microsoft/10662-zfs
...
Windows: No ZFS graphdriver
2015-05-15 11:51:48 -07:00
0db7365c66
Merge pull request #13221 from duglin/ReenableDebug
...
add link between -D and --log-level=debug back in
2015-05-15 11:45:44 -07:00
b785e5091f
Merge pull request #13086 from shishir-a412ed/docker_root_execdriver
...
root dir for execdriver (/var/run/docker) should be configurable
2015-05-15 11:16:12 -07:00
88127ce475
Merge pull request #13246 from unclejack/refactor_statscollector
...
daemon/stats_collector: refactor getSystemCpuUsage
2015-05-15 11:06:47 -07:00
839d64ffb1
Remote plugins plumbing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-15 11:04:58 -07:00
520955b1cf
Merge pull request #13236 from vieux/revert_time_change
...
Revert "Fix inconsistent date formats in API"
2015-05-15 10:32:03 -07:00
0bdeef94c7
Make which cross binary fails clearer
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-15 09:25:13 -07:00
5d2ef30a38
Merge pull request #13251 from cpuguy83/13233_fix_log_follow_goroutine_check
...
Extend sleep/timeout for ngoroutine check
2015-05-15 08:57:25 -07:00
248e5a4c83
Merge pull request #13220 from Microsoft/10662-sysinfo
...
Windows: Refactor sysinfo for compilation
2015-05-15 10:53:55 -04:00
2c8eba14df
Merge pull request #13243 from coolljt0725/remove_redundant_log
...
Cleanup:Remove redundant log in pkg/pidfile/pidfile.go
2015-05-15 10:13:19 -04:00
f207322c0a
Extend sleep/timeout for ngoroutine check
...
In cases where this is failing it's ok to have the test take extra time,
but we don't want it to fail because of some race/performance
differences between systems.
So make the timeout go to 30s and double the sleep time in between
checks so it's not pounding the daemon quite so fast.
Originally I couldn't make this test fail (pre-change), but changed
graphdrivers and saw a failure pretty quickly.
This change seems to smooth that out.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-15 09:54:43 -04:00
8b2c6cb072
root dir for execdriver (/var/run/docker) should be configurable
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-05-15 09:30:36 -04:00
0204ecdf70
Fix incorrect document storage-opt
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-15 19:13:07 +08:00
25f776451e
daemon/stats_collector: refactor getSystemCpuUsage
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-05-15 12:22:50 +03:00
60e5c273cf
Remove redundant log in pkg/pidfile/pidfile.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-15 15:26:00 +08:00
478d86a5f5
kr/pty: vendor upstream 5cf931ef8f
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-15 15:22:16 +08:00
6e19912df9
Enhance check-config.sh
...
Currently check-config.sh just said enable or missing, when I used
a fresh kernel, made check-config.sh happy, still can't start
container. It take me days debuging kernel and Docker and finally
found it's because I enabled some CONFIGs as modules and never
loaded these modules.
So I think it's necessary to let check-config.sh told users which
configs are enabled as modules.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-15 10:20:31 +08:00
b261ce5fb0
Revert "Fix inconsistent date formats in API"
...
This reverts commit 945fc9d882victorvieux@gmail.com >
2015-05-14 17:31:45 -07:00
e4855eebf2
Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339
...
Parse input timestamps with standard RFC3339
2015-05-14 16:49:01 -07:00
35cdcbb323
Windows: No ZFS graphdriver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-14 15:57:45 -07:00
c5240d79e3
Merge pull request #12770 from Microsoft/10662-daemonconfigrefactor
...
Windows: Start of daemon config refactor
2015-05-14 14:55:22 -07:00
a4592467e7
Merge pull request #13223 from Microsoft/10662-loggers
...
Windows: Factor out syslog and journald
2015-05-14 16:26:43 -04:00
b2ad9314a2
Merge pull request #13196 from crosbymichael/update-libocntainer-may13
...
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
2015-05-14 10:49:25 -07:00
655a58e27b
Windows: Factor out syslog and journald
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-14 10:34:09 -07:00
a85ca8b7c4
add link between -D and --log-level=debug back in
...
Due to popular demand :-)
See #11965
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-14 10:29:49 -07:00
b7ee717a10
Windows: Refactor sysinfo for compilation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-14 09:44:51 -07:00
d2a2c974d9
fix to gccgo compilation error
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-05-14 16:28:23 +00:00
fe6f77df2c
Merge pull request #13087 from duglin/FixNatTest
...
Fix random errors in DockerSuite.TestNetworkNat
2015-05-14 08:35:27 -07:00
ac81cd1fc3
Merge pull request #13202 from duglin/ImportFix
...
Fix a regression in `docker import` on error from URL
2015-05-14 10:36:50 -04:00
1c5a4728e1
Merge pull request #13208 from ahmetalpbalkan/nit
...
Remove out of date comment
2015-05-14 06:59:21 -07:00
3f4926e49b
Fix a regression in docker import on error from URL
...
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake. This removes the ":" from "... err := " which fixes it.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-14 06:56:52 -07:00
ef956253d8
Add bwu_docker to the list.
...
Signed-off-by: Guenter Zoechbauer <guenter@gzoechbauer.com >
2015-05-14 15:27:51 +02:00
999f464feb
Parse input timestamps with standard RFC3339
...
Fix for #13175 .
This change allows user-input timestamps (e.g. to `docker events
--since/--until` or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).
User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.
Added test case for `events --since/--until` with all possible
timestamp input formats.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-14 07:44:42 +00:00
9448d3627b
Remove out of date comment
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-14 07:37:31 +00:00
9bfe6f0d24
Update Configuring and running Docker article
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-05-14 07:45:20 +02:00
cb4d47ddb3
Copied info about google groups, IRC, etc. to README.md from CONTRIBUTORS.md
...
Signed-off-by: Sankar சங்கர் <sankar.curiosity@gmail.com >
2015-05-14 11:12:20 +05:30
1d57642906
Merge pull request #11706 from HuKeping/time
...
Fix inconsistent date formats in API
2015-05-13 20:23:19 -07:00
945fc9d882
Fix inconsistent date formats in API
...
Prior to this patch, the response of
- GET /images/json
- GET /containers/json
- GET /images/(name)/history
display the Created Time as UNIX format which doesn't make sense.
These should be more readable as CLI command `docker inspect` shows.
Due to the case that an older client with a newer version daemon, we
need the version check for now.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-05-14 18:58:55 +08:00
3957cc8022
gitignore: add *.rej
...
Ignore noise from unsuccessful patch operation.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-05-13 22:10:26 -04:00
ed25742002
Merge pull request #12667 from ibuildthecloud/host-uts
...
Add --uts=host to allow sharing the UTS namespace
2015-05-13 18:30:32 -07:00
f2e5207fc9
Add --uts=host to allow sharing the UTS namespace
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-05-13 17:56:32 -07:00
f2bc54f796
Merge pull request #13201 from Microsoft/10662-fixdebugtrap
...
Fix package on debugtrap_unsupported.go
2015-05-13 20:44:13 -04:00
feb0fa8dbf
Merge pull request #13112 from hqhq/hq_fix_oonkilldisable
...
Fix oom kill disable issue
2015-05-13 20:03:33 -04:00
1e78eec826
Fix package on debugtrap_unsupported.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-13 16:38:59 -07:00
b37abf2528
Merge pull request #13146 from rajdeepd/dry-run-test-1
...
Modified Test Case to include check for Memory and MemorySwap
2015-05-14 01:10:35 +02:00
64ea54c0ed
Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot
...
Minor typo: remove redundant dot in error message in runconfig/parse.go
2015-05-13 15:24:01 -07:00
677d76cd4a
Update test for /sys mounting
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-05-13 15:02:53 -07:00
32f8a40398
Merge pull request #13193 from moxiegirl/dhe-commercial-release
...
adding release note for 1.6.2
2015-05-13 14:51:50 -07:00
31c8112285
Merge pull request #13194 from crosbymichael/merge_release_v1.6.2
...
Merge release 1.6.2
2015-05-13 14:01:40 -07:00
87c35d0e0a
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-05-13 13:55:26 -07:00
6c17b4818d
adding release note for 1.6.2
...
Signed-off-by: Mary Anthony <mary@docker.com >
ugh, cut n paste
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-13 13:54:30 -07:00
cec64ebef8
Bump to version 1.6.2
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
VERSION
2015-05-13 13:51:39 -07:00
db5b4a2a69
respect -H in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-05-13 13:39:25 -07:00
1eea2c589d
Modified Test Case to include check for Memory and MemorySwap
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
2015-05-13 13:39:07 -07:00
877461bc20
Merge pull request #13190 from unclejack/precompile_regexp
...
Precompile regexp
2015-05-13 13:00:14 -07:00
3da0013ac4
Merge pull request #13155 from coolljt0725/fix_validate_tag_name
...
Fix validate tag name. Fix #13149
2015-05-13 12:03:22 -07:00
c46c8f4e40
Merge pull request #13192 from tianon/fix-bad-vendor.sh-rebase
...
Fix mangled hack/vendor.sh rebase
2015-05-13 12:02:07 -07:00
c2d6187811
Fix mangled hack/vendor.sh rebase
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-13 12:52:59 -06:00
cb08c1173f
pkg/stringid: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-05-13 21:48:48 +03:00
8f57e7d2ef
image: precompile regexp
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-05-13 21:47:43 +03:00
1b678f86b3
Merge pull request #13174 from ahmetalpbalkan/TestLogsSince
...
integ-cli: Fix race in TestLogsSince
2015-05-13 11:35:17 -07:00
ebe9a85486
Merge pull request #13183 from runcom/fix-typo-tests-grouping
...
Fix typo to run tests grouped by RunUnprivileged
2015-05-13 11:33:14 -07:00
951c2ef2c9
Merge pull request #12226 from ahmetalpbalkan/logdrivers/refactoring
...
daemon: Logging drivers architectural refactoring
2015-05-13 11:00:50 -07:00
8eac7d0779
Merge pull request #13180 from unclejack/fix_test_name
...
integcli: change Dettach to Detach
2015-05-13 09:07:18 -04:00
a36f6a140b
Fix typo to run tests grouped by RunUnprivileged
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-13 14:24:54 +02:00
fdec5197f1
integcli: change Dettach to Detach
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-05-13 12:49:19 +03:00
e00cfbb6f2
Fix invalid tag name
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-13 14:28:52 +08:00
3401ee13f8
Merge pull request #13169 from jfrazelle/cleanup-integration
...
cleanup test-integration
2015-05-13 06:34:30 +02:00
56847ec4d4
Merge pull request #13106 from duglin/HumanizeCliErrors
...
Use stderr instead of logrus for CLI error messages
2015-05-13 05:23:56 +02:00
c6dad07b1b
Minor typo: remove redundant dot in error message in runconfig/parse.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-13 11:04:07 +08:00
2fe2f7a186
integ-cli: Fix race in TestLogsSince
...
TestLogsSince used to rely on time synchronization and precision of
the timestamps. This change provides a less flaky alternative.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-13 02:59:11 +00:00
36d995a291
Merge pull request #11965 from duglin/DEBUG
...
Remove use of "DEBUG" env var from CLI and de-couple -D from --log-level
2015-05-12 18:24:04 -07:00
3985f17812
Merge pull request #13131 from Microsoft/10662-loadonwindows
...
Windows: Build load.go
2015-05-12 18:04:33 -07:00
ec4baad954
Merge pull request #13166 from runcom/small-streamformatter-refactor
...
Refactor pkg/stremformatter - custom constructors
2015-05-12 20:28:18 -04:00
0024935f64
Use stderr instead of logrus for CLI error messages
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-12 17:22:41 -07:00
df89008f0c
Merge pull request #13099 from Microsoft/10662-pkgparsers
...
Windows: Implement parsers:kernel+os
2015-05-12 16:07:43 -07:00
e096d56713
cleanup test-integration
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-12 15:39:57 -07:00
6b700bdaca
Refactor pkg/stremformatter with custom constructors instead of passing a boolean
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-13 00:09:41 +02:00
f7ae2a372d
Windows: Impl pkg\parsers kernel+os
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-12 14:41:02 -07:00
aed8f9f76e
Windows: Build load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-12 14:26:57 -07:00
37cb2a15bf
Merge pull request #13040 from cpuguy83/13014_fix_goroutine_leak_on_logs_follow
...
Make sure log pipes are closed
2015-05-12 13:52:49 -07:00
cb53a628b0
Merge pull request #13136 from Microsoft/10662-factoroutresolveconf
...
Windows: Don't pull in all of resolvconf
2015-05-12 13:49:47 -07:00
e0777e69cb
Merge pull request #13162 from jfrazelle/add-modprobe-br_netfilter
...
modprobe br_netfilter
2015-05-12 13:46:34 -07:00
f35038dfba
Merge pull request #13160 from runcom/remove-api-codepath-less-than-1-12
...
Remove API codepaths < 1.12
2015-05-12 13:08:36 -07:00
3a8728b431
daemon: Logging drivers refactoring
...
- noplog driver pkg for '--log-driver=none' (null object pattern)
- centralized factory for log drivers (instead of case/switch)
- logging drivers registers themselves to factory upon import
(easy plug/unplug of drivers in daemon/logdrivers.go)
- daemon now doesn't start with an invalid log driver
- Name() method of loggers is actually now their cli names (made it useful)
- generalized Read() logic, made it unsupported except json-file (preserves
existing behavior)
Spotted some duplication code around processing of legacy json-file
format, didn't touch that and refactored in both places.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-12 19:11:52 +00:00
b0518fe038
Merge pull request #12847 from cpuguy83/fix_firewald_errors
...
Fix error message on firewalld init
2015-05-12 12:01:59 -07:00
4800d4df8c
this fixes hairpin nat tryinng to ping a the host and port from inside a container
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-12 11:57:36 -07:00
73387bf15a
Merge pull request #13105 from duglin/FixRunOutput
...
Fix RUN err msg (again)
2015-05-12 11:36:55 -07:00
5bf2ebf0a5
Merge pull request #13127 from shishir-a412ed/exec_opt_doc
...
Missing exec-opt[] option in CommandLine docs
2015-05-12 11:34:51 -07:00
7284b08204
Remove API codepaths < 1.12
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-12 20:09:49 +02:00
d4eba30065
Merge pull request #13141 from vieux/fallback_inspect
...
fallback to interface with docker inspect
2015-05-12 11:02:06 -07:00
445afe0977
Merge pull request #13151 from Mic92/master
...
zfs: update filesystem cache on filesystem creation/deletion
2015-05-12 10:53:01 -07:00
e3ba3dd5b8
Make sure log pipes are closed
...
Pipes are still not closed (and goroutines leaked) if neither pipe is
used.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-12 13:50:51 -04:00
c9821d8dd6
Merge pull request #13150 from hqhq/hq_remove_warn
...
Remove redundant warning
2015-05-12 10:32:01 -07:00
3b13e56fd7
Merge pull request #13000 from runcom/refactor-server-to-use-daemon-service-followup
...
Refactor server to use the daemon as a service
2015-05-12 10:27:43 -07:00
b3bca3afc9
Windows: Start of daemon config refactor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-12 09:50:32 -07:00
d0459abe6e
Merge pull request #12362 from ahmetalpbalkan/logs/since
...
Add --since argument to docker logs cmd
2015-05-12 09:40:16 -04:00
2cb23527e4
zfs: update filesystem cache on filesystem creation/deletion
...
Previously the cache was only updated once on startup, because the graph
code only check for filesystems on startup. However this breaks the API as it
was supposed and so unit tests.
Fixes #13142
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-12 13:06:41 +02:00
a8250a0b20
Remove redundant warning
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-12 18:02:30 +08:00
a5007e5737
Merge pull request #10786 from estesp/add-goroutine-debug
...
Add capability for goroutine dumping on SIGQUIT/USR1
2015-05-11 21:20:44 -04:00
52c3bb6a0e
fallback to interface with docker inspect
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
2015-05-11 17:39:21 -07:00
95fcf76cc6
Add SIGUSR1 handler for dumping stack/goroutine traces
...
Add handler for SIGUSR1 based on feedback regarding when to dump
goroutine stacks. This will also dump goroutine stack traces on SIGQUIT
followed by a hard-exit from the daemon.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-05-12 10:09:23 +10:00
e7568ed227
Merge pull request #9411 from Mic92/features/zfs-rebased
...
zfs-utils based zfs graph driver
2015-05-11 16:53:17 -07:00
c49695f976
Merge pull request #13137 from SvenDowideit/need-more-sudo
...
Need more sudo
2015-05-12 09:07:55 +10:00
c5e93d0950
Need more sudo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-11 23:07:22 +00:00
78604a9f3f
Windows: Don't pull in all of resolvconf
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-11 15:28:08 -07:00
34b9769538
Merge pull request #13134 from SvenDowideit/dhe-1.0.1-release
...
DHE 1.0.1 release
2015-05-12 07:34:30 +10:00
38af208da1
DHE 1.0.1 release
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-11 21:23:56 +00:00
a47fb5edca
Merge pull request #13132 from LK4D4/fix_race_kill
...
Fix race between execdriver.Kill and execdriver.Run
2015-05-11 14:01:07 -07:00
ca7219f5da
Fix race between execdriver.Kill and execdriver.Run
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-11 13:23:50 -07:00
8cc93856e3
Merge pull request #13074 from runcom/11824-short-link-if-equals-alias
...
Allow links to be specified with only the name if it matches the alias
2015-05-11 13:18:29 -07:00
c6e6223ed7
Allow links to be specified with only the name if this matches the alias
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-11 21:50:47 +02:00
98277f3cad
Missing exec-opt[] option in CommandLine docs
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-05-11 15:41:50 -04:00
e66ad40c4e
Merge pull request #12994 from Microsoft/10662-fixinvocation
...
Windows: Fix builder\dispatchers.go
2015-05-11 11:24:43 -07:00
e2acca67c8
Move container.WaitStop, AttachWithLogs and WsAttachWithLogs to daemon service in api server
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-11 19:56:41 +02:00
5e063326a3
Merge pull request #13101 from bharaththiruveedula/13092-remove-unwanted-locks
...
Removing extra locks for Pause and Unpause functions
2015-05-11 10:54:39 -07:00
92344602ea
Merge pull request #13091 from LK4D4/generate_caps
...
Generate caps
2015-05-11 10:42:59 -07:00
cb9a6b9aed
Add --since argument to docker logs cmd
...
Added --since argument to `docker logs` command. Accept unix
timestamps and shows logs only created after the specified date.
Default value is 0 and passing default value or not specifying
the value in the request causes parameter to be ignored (behavior
prior to this change).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-05-10 20:42:14 +00:00
4d6720bfbb
Merge pull request #13111 from gianlucaborello/fix-mac-documentation
...
Correctly document MAC address generation
2015-05-10 13:43:27 -04:00
13064646a6
Merge pull request #13102 from duglin/MissingOK
...
Add missing "ok" on "comma ok" idiom in test util
2015-05-10 09:22:44 -07:00
e324f51e5b
Default MAC address generation is not random and should be stated in the documentation.
...
Signed-off-by: Gianluca Borello <g.borello@gmail.com >
2015-05-10 08:11:26 -07:00
a2f39e7754
Fix oom kill disable issue
...
It should not be hard limit, we should only check oom kill disable
when user using it.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-10 14:55:00 +08:00
8c1ef5ceaf
Removing extra locks for Pause and Unpause functions
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com >
2015-05-10 00:16:54 +05:30
340fd140e6
Merge pull request #12988 from Mashimiao/remove-unused-container-functions
...
cleanup: remove unneeded locks
2015-05-09 09:42:27 -07:00
c5710c7318
Merge pull request #13093 from tianon/writeflusher
...
Move WriteFlusher out of utils into ioutils
2015-05-09 09:39:17 -07:00
61cb6012e6
Merge pull request #13095 from Microsoft/10662-pkgrexec
...
Windows: reexec pkg supported
2015-05-09 09:38:42 -07:00
006c066b6c
Fix RUN err msg (again)
...
Previous fix used %q which incorrectly go-escaped things. For example:
```
RUN echoo A \& B C
```
would result in the user seeing:
```
INFO[0000] The command '/bin/sh -c echoo A \\& B\tC' returned a non-zero code: 127
```
Note the double-\ and the \t instead of a tab character
The testcase had to double escape things due to logrus getting in the way
but I'm going to fix that in another PR because its a change to the UX.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-09 09:22:30 -07:00
dd4693f67c
Add missing "ok" on "common ok" idiom in test util
...
w/o this the "ok" we're checking is from the previous type assertion.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-09 05:56:10 -07:00
7699cee247
Merge pull request #12180 from Mashimiao/add-cpuperiod-and-cpuquota-support
...
add cpu.cfs_period_us support
2015-05-08 22:32:09 -04:00
bcc24ec8ad
cleanup remove unneeded locks
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-05-09 10:06:53 +08:00
dccb8b5c33
add cpu.cfs_period_us support
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-05-09 10:02:46 +08:00
64715c4f33
Windows: reexec pkg supported
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-08 14:15:53 -07:00
38b5c7266a
Fix error message on firewalld init
...
If firewalld is not installed (or I suppose not running), firewalld was
producing an error in the daemon init logs, even though firewalld is not
required for iptables stuff to function.
The firewalld library code was also logging directly to logrus instead
of returning errors.
Moved logging code higher up in the stack and changed firewalld code to
return errors where appropriate.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-08 15:51:44 -04:00
4d2f6fbde0
Windows: Fix builder\dispatchers.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-08 11:45:08 -07:00
3697dddc0d
Merge pull request #12978 from Microsoft/10662-containerexeccreate
...
Windows: Split ContainerExecCreate
2015-05-08 11:38:03 -07:00
223d6de728
Move WriteFlusher out of utils into ioutils
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-08 12:33:33 -06:00
769df832a3
Fix random errors in DockerSuite.TestNetworkNat
...
I believe this was failing because 'nc' wouldn't show the data
it received sometimes. So intead of looking for that data we now
look for the output of the echo that comes after the nc command
successfully runs
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-08 10:59:26 -07:00
a559c1145a
Generate capabilityList automatically
...
Generation based on CAP_LAST_CAP, I hardcoded
capability.CAP_BLOCK_SUSPEND as last for systems which has no
/proc/sys/kernel/cap_last_cap
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-08 09:40:05 -07:00
5a2d592c27
Update github.com/syndtr/gocapability to 66ef2aa7a23ba682594e2b6f74cf40c0692b49fb
...
It adds List function for listing all supported caps
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-08 09:22:37 -07:00
bad25ccf97
zfs: retrieve all filesystems on startup at once
...
The docker graph call driver.Exists() on initialisation for each filesystem in
the graph. This results will results in a lot `zfs get all` commands. To reduce
this, retrieve all descend filesystem at startup and cache it for later checks
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-08 17:49:39 +02:00
11e9167a6b
zfs: improve performance by using legacy mounts
...
instead of let zfs automaticly mount datasets, mount them on demand using mount(2).
This speed up this graph driver in 2 ways:
- less zfs processes needed to start a container
- /proc/mounts get smaller, so zfs userspace tools has less to read (which can
a significant amount of data as the number of layer grows)
This ways it can be also ensured that the correct mountpoint is always used.
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-08 17:49:39 +02:00
ee00f07ea6
zfs: replace c for /proc/mounts parsing with go
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-08 17:49:39 +02:00
30f3bd643d
integration: add variable to set storage options for testing
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-08 17:49:39 +02:00
dd614b5e34
zfs: refactor error handling
...
thanks to @calavera
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-08 17:48:20 +02:00
a25195d86c
zfs: add myself to MAINTAINERS
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-08 17:48:20 +02:00
bdf784ae4a
docs: move zfs.fsname option to storage option section
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-08 17:48:20 +02:00
bacecabf3b
zfs: revert to NaiveGraphDriver for the moment
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-08 17:48:20 +02:00
d5151ca8ab
Implement Docker on ZFS
...
Signed-off-by: Arthur Gautier <baloo@gandi.net >
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-05-08 17:48:20 +02:00
23abd51ef1
Merge pull request #13071 from tianon/explicit-vendor
...
Update "hack/vendor.sh" to be more explicit
2015-05-08 08:22:17 -07:00
af9dac9627
Merge pull request #13069 from runcom/dry-run-test
...
API tests - Container create with Hostname, Domainname and Network
2015-05-07 22:07:41 -04:00
fe3becee34
Merge pull request #12422 from wlan0/logopts
...
add log opts flag to pass in logging options
2015-05-07 18:10:04 -07:00
b94107c4d8
Merge pull request #13080 from jfrazelle/fix-tests-where-requires-libcontainerr-security
...
fix lxc because it doesnt have the hardened libcontainer stuff
2015-05-07 18:07:27 -07:00
128a07b512
Merge pull request #13027 from runcom/fix-typo-reference-remote-api
...
Fix typo in the api remote reference for links
2015-05-07 17:53:21 -07:00
52118df432
fix lxc because it doesnt have the hardened libcontainer stuff
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-07 17:40:37 -07:00
47fbe76a7e
Merge pull request #13077 from duglin/MoveCommands
...
Make list of commands for help less static
2015-05-07 17:35:54 -07:00
6b6a26c769
Merge pull request #11516 from coolljt0725/add_show_error_set_some_flag_in_container_netmode
...
add support --net=container with --mac-address, --add-host error out
2015-05-07 17:13:32 -07:00
de32f5c431
Merge pull request #11802 from hqhq/hq_add_blkio_weight
...
add blkio.weight support
2015-05-07 17:10:39 -07:00
982402f4e0
Merge pull request #11831 from cellpjs/patch-1
...
Remove mkimage-unittest.sh
2015-05-07 17:07:56 -07:00
e03ac8d5b9
Merge pull request #12175 from dqminh/fix-allocate-port
...
#12148 : sort ports mapping before allocating
2015-05-07 17:04:20 -07:00
f6fa579d52
Merge pull request #12270 from burnison/11294-shortidfallback
...
Only use fallback to short IDs when obvious.
2015-05-07 17:02:58 -07:00
d0bc0153c6
Merge pull request #12278 from duglin/12267-Wildcards
...
Fix for Daemon crashing when wildcards are used for COPY/ADD
2015-05-07 17:01:16 -07:00
d0cbaeb0d2
Merge pull request #12318 from aarondav/best-effort-iptables-lock
...
Do our best not to invoke iptables concurrently if --wait is unsupported
2015-05-07 17:00:26 -07:00
67c10e762e
Merge pull request #12830 from Microsoft/10662-refactorforwindowsexecdriver
...
Windows: Fork execdrivers.go for Windows execdriver
2015-05-07 16:57:59 -07:00
0ed2013590
Merge pull request #12952 from sunyuan3/trunc
...
Verify the no-trunc option for the search operation
2015-05-07 16:52:46 -07:00
372977148d
Merge pull request #12961 from hqhq/hq_remove_err_out
...
a few cleanups for client output
2015-05-07 16:51:56 -07:00
6a4c219615
Merge pull request #12970 from tianon/frozen-user-images
...
Allow download-frozen-image.sh to work on user images too
2015-05-07 16:50:49 -07:00
d34abea15b
Merge pull request #12976 from Microsoft/10662-graphfirstchange
...
Windows: First fix for graph\graph.go
2015-05-07 16:50:20 -07:00
b1572fd0a4
Merge pull request #12986 from psankar/master
...
Added information about mailing lists
2015-05-07 16:49:14 -07:00
b919dee834
Update "hack/vendor.sh" to be more explicit
...
Previously, we've taken advantage of the fact that libcontainer's `update-vendor.sh` is the same syntax as Docker's `vendor.sh` with some shell magic. This changes that to copy libcontainer's dependencies into this file explicitly so that we can scale to more projects with varying methods of vendoring (assuming they don't use import re-writing, which screws up everyone).
We'll need to stay diligent in making sure this list matches what's in libcontainer's `update-vendor.sh` (minus the not-required codegangsta/cli dep), but that's a fair trade-off for being able to scale our dependency model better (and track new discrete dependencies more directly).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-07 17:43:11 -06:00
6a1f862e40
Merge pull request #13032 from jfrazelle/nano-nano-nano
...
add nanorc to packaged builds
2015-05-07 17:35:03 -06:00
b4dc101d74
Merge pull request #13062 from Microsoft/10662-nativedriver
...
Fix os.MkdirAll in native driver
2015-05-07 16:34:31 -07:00
404412282d
Merge pull request #12777 from ZJU-SEL/fix_pull_import_errpromt
...
Fix error prompt for pull & import handler postImagesCreate.
2015-05-07 16:27:15 -07:00
b6448f25f2
Merge pull request #13065 from tianon/fix-build-deb-tilde-expansion
...
Fix '~' expansion in build-deb... (properly this time)
2015-05-07 16:24:33 -07:00
b4e8942367
Merge pull request #13076 from LK4D4/fix_api_daemon_order
...
Fix api servers creation and daemon start order
2015-05-07 16:23:44 -07:00
4f00b1020e
Make list of commands for help less static
...
Before this PR the list of commands that were printed for the help
text was statically put into the flags.Usage() function via main.init(). This
made it impossible to modify later on when we add new commands
via plugins.
This PR moves the list of commands (name & description) into a structure
that is sorted and printed dynamically by the Usage func. This will allow
the code to add to the list of commands after the init() func is done
but before the help text is printed for the user.
This just moves code around - it should have no UX impact at all.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-07 16:22:06 -07:00
23193efd93
Merge pull request #13073 from jfrazelle/add_1.6.1_commits
...
Add 1.6.1 commits
2015-05-07 16:17:53 -07:00
237bd23af8
Merge pull request #13059 from burke/no-fsync-on-temp-archive
...
Remove fsync in archive.NewTempArchive
2015-05-07 16:16:52 -07:00
1efecc4c41
Merge pull request #13041 from hqhq/hq_fix_checkkernel
...
update recommended kernel in checkKernel
2015-05-07 16:15:12 -07:00
f66d225427
add nanorc to packaged builds
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-07 16:10:07 -07:00
2c2f6fd272
bump version back to 1.7.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-07 15:42:36 -07:00
08230703fd
Fix api servers creation and daemon start order
...
* daemon creation wasn't parallel to request buffering
* it was possible that empty volume will be created in
/var/run/docker.sock by some container
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-07 15:38:02 -07:00
5b1edfed9d
Bump version to 1.6.1
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
(cherry picked from commit 97cd073598
2015-05-07 15:01:32 -07:00
f25bbedc85
Allow libcontainer to eval symlink destination
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Add tests for mounting into /proc and /sys
These two locations should be prohibited from mounting volumes into
those destinations.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-05-07 14:43:39 -07:00
2f54c1a352
Update libcontainer to 1b471834b45063b61e0aedefbb1
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-05-07 14:43:39 -07:00
a7a51306b1
Mask reads from timer_stats and latency_stats
...
These files in /proc should not be able to be read as well
as written to.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-05-07 14:42:23 -07:00
27ae108b4e
Mount RO for timer_stats and latency_stats in proc
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-05-07 14:42:23 -07:00
42c8c1b0b8
Mount /proc/fs as readonly
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-05-07 14:42:23 -07:00
d87da59c79
Prevent write access to /proc/asound
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Conflicts:
integration-cli/docker_cli_run_test.go
2015-05-07 14:42:23 -07:00
74bfa36753
Merge pull request #12165 from icecrime/optional_userland_proxy
...
Optional userland proxy
2015-05-07 14:01:16 -07:00
93536cfa76
Merge pull request #13067 from burke/faster-commit-for-overlay
...
overlay: skip superfluous metadata sets on commit
2015-05-07 13:58:46 -07:00
e712b60e80
Merge pull request #13068 from tianon/swap-builder-verbosity
...
Switch verbosity in builder/*/generate.sh so that we get download progress for Go instead of the name of every single file extracted
2015-05-07 13:52:51 -07:00
2aa09b4f86
Merge pull request #13061 from tianon/install-update-message
...
Update "install.sh" warning to be more verbose
2015-05-07 13:38:27 -07:00
fc9ff248c1
Update "install.sh" warning to be more verbose
...
See https://github.com/docker/docker/issues/12395#issuecomment-99941300 for some of the context on this one.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-07 14:20:40 -06:00
bc5503f46b
overlay: skip superfluous metadata sets on commit
...
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
2015-05-07 16:15:54 -04:00
24d98c14a0
Switch verbosity in builder/*/generate.sh so that we get download progress for Go instead of the name of every single file extracted
...
Also, `curl` is smart enough to see when the consumer of the pipe is going slow that it should slow down the transfer, so this gives a reasonable indication of extraction progress too.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-07 14:15:35 -06:00
297cd347a6
Fix '~' expansion in build-deb... (properly this time)
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-07 14:02:21 -06:00
390f3c99d3
Fix os.MkdirAll in native driver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-07 12:09:30 -07:00
80d73c838a
Test Cases for API - Container create with Hostname, DomainName and NetworkMode
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-07 21:03:39 +02:00
ec66daebc2
Don't fsync on V2 registry push tempfile creation
...
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
2015-05-07 14:49:38 -04:00
1e6565188d
Merge pull request #13050 from SvenDowideit/dhe-docs-update
...
DHE documentation update sync.
2015-05-07 11:43:04 -07:00
1ab875b38b
Merge pull request #13058 from bharaththiruveedula/13057-remove-SetDaemon-method
...
Removing the SetDaemon method
2015-05-07 10:41:41 -07:00
4f25f21a97
Merge pull request #13044 from jpopelka/link-add
...
Fix firewalld callback.
2015-05-07 10:34:34 -07:00
3d2cd92b2d
Merge pull request #12966 from cpuguy83/cleanup_the_lxc_cleanup
...
Cleanup container reg for lxc special case
2015-05-07 10:19:46 -07:00
db26564864
Merge pull request #12965 from tianon/libcontainer-logrus
...
Update libcontainer and make it the source of truth on logrus version
2015-05-07 10:10:28 -07:00
236dbc2e59
Remove Sync() call in NewTempArchive:
...
This makes the "Buffering to disk" part of `docker push` 70% faster in
my use-case (having already applied #12833 ).
fsync'ing here serves no valuable purpose: if the drive's operation is
interrupted, so it the program's, and this archive has no value other
than the immediate and transient one.
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
2015-05-07 12:58:12 -04:00
94def48878
Removing the SetDaemon method
...
Signed-off-by: Bharath Thiruveedula <bharath_ves@hotmail.com >
2015-05-07 22:25:13 +05:30
d78755d159
Merge pull request #12822 from brahmaroutu/container_stop_api
...
restapi stop fails if ?t=int not present
2015-05-07 09:38:59 -07:00
a38d6b5755
Merge pull request #13037 from runcom/12607-no-strconv-atoi-err-check
...
Do not check and return strconv.Atoi error in api container restart
2015-05-07 09:29:10 -07:00
68e9c07850
Restapi for stop fails if ?t=int not present
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-05-07 15:43:50 +00:00
59bfee2fa4
DHE documentation update
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-07 20:38:46 +10:00
6e8cfd63fc
Fix firewalld callback.
...
It needs to be called with same args as the one 4 lines above.
Signed-off-by: Jiri Popelka <jpopelka@redhat.com >
2015-05-07 10:08:49 +02:00
443437f5ea
Merge pull request #13038 from tianon/fix-build-deb
...
Fix build-deb
2015-05-06 22:12:15 -07:00
f133f11a7d
add blkio.weight support
...
We can use this to control block IO weight of a container.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-07 11:55:58 +08:00
44cd599e29
Cleanup container reg for lxc special case
...
The lxc code here is doing the exact same thing on calling
execdriver.Terminate, so let's just use that.
Also removes some dead comments originally introduced
50144aeb42cpuguy83@gmail.com >
2015-05-06 23:01:46 -04:00
ceae5f54b3
update recommended kernel in checkKernel
...
We already changed docs: https://github.com/docker/docker/pull/10652
Should change code as well.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-07 10:11:02 +08:00
a1aff84480
Merge pull request #13036 from SvenDowideit/update-docker-hub-repo-documentation
...
Add a userguide to cover the uses of Hub before creating new reposito…
2015-05-06 18:02:23 -07:00
9da3a848ab
Add a userguide to cover the uses of Hub before creating new repositories
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-07 00:31:04 +00:00
a592dce97b
Merge pull request #13034 from icecrime/remove_insert_instruction
...
Remove unused Dockerfile instruction INSERT
2015-05-06 20:12:50 -04:00
867eed8f35
Fix build-deb
...
This fixes the part of #12996 that I forgot. 👼
This also fixes a minor path issue (there's no `libexec` in Debian), and fixes a minor bug with the `debVersion` parsing.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-06 18:10:15 -06:00
74121a4211
Do not check and return strconv.Atoi error in api container restart, regression
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-07 01:49:16 +02:00
596e91638c
Remove unused Dockerfile instruction INSERT
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-06 16:26:43 -07:00
e35b025aa6
Windows: Split ContainerExecCreate
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-06 16:19:27 -07:00
4b4adae41c
Merge pull request #13033 from icecrime/12715_carry
...
Logs with follow=1 immediately send HTTP response
2015-05-06 15:42:48 -07:00
f65e65b0c9
Merge pull request #12980 from Microsoft/10662-filepathimageimage
...
Windows: Fix filepath vs path in image.go
2015-05-06 15:02:10 -07:00
7d38d33f01
Merge pull request #12977 from Microsoft/10662-graphloadfilepath
...
Windows: Filepath in graph\load.go
2015-05-06 15:01:49 -07:00
589de35651
Logs with follow=1 immediately send HTTP response
...
Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr >
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-06 14:39:45 -07:00
54a1bb07fa
Merge pull request #13018 from mbentley/nanorc-syntax
...
Added nanorc for Dockerfiles
2015-05-06 14:23:20 -07:00
10f4bf514d
Merge pull request #12878 from cpuguy83/move_chunked_encoding_test_to_from_integration
...
Move ChunkedEncoding from integration
2015-05-06 13:59:13 -07:00
72a0272a62
Fix typo in the api remote reference for links
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-06 22:08:10 +02:00
f9b20ad9e4
Merge pull request #12999 from duglin/BadRUNerrMsg
...
Fix RUN's error msg when it fails
2015-05-06 15:49:24 -04:00
71c1a7ea7f
Merge pull request #13017 from cpuguy83/12859_fix_lxc_wait_exitcodes
...
Fix LXC stop signals
2015-05-06 11:21:44 -07:00
ca8fa6e46d
Allow download-frozen-image.sh to work on user images too
...
To account for "/" not working in filenames, we replace it with "_" for our temporary files (that exist only to emulate Bash 4's associative arrays in Bash 3).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-06 12:05:17 -06:00
7c574b9e9d
Move ChunkedEncoding from integration
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-06 13:00:17 -04:00
76bc44fb91
Added nanorc for Dockerfiles
...
Signed-off-by: Matt Bentley <matt@docker.com >
2015-05-06 12:41:11 -04:00
d2c4ee37c6
Fix LXC stop signals
...
`lxc-stop` does not support sending arbitrary signals.
By default, `lxc-stop -n <id>` would send `SIGPWR`.
The lxc driver was always sending `lxc-stop -n <id> -k`, which always
sends `SIGKILL`. In this case `lxc-start` returns an exit code of `0`,
regardless of what the container actually exited with.
Because of this we must send signals directly to the process when we
can.
Also need to set quiet mode on `lxc-start` otherwise it reports an error
on `stderr` when the container exits cleanly (ie, we didn't SIGKILL it),
this error is picked up in the container logs... and isn't really an
error.
Also cleaned up some potential races for waitblocked test.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-06 11:56:48 -04:00
a242ceaa09
Merge pull request #12975 from Microsoft/10662-graphexportfilepath
...
Windows: graph\export.go filepath fixes
2015-05-05 21:44:57 -04:00
2281d6c266
Merge pull request #12917 from jfrazelle/add-rpm
...
Add RPM for centos-7, fedora-20, fedora-21
2015-05-05 17:31:21 -07:00
54662eae10
Fix RUN's error msg when it fails
...
When RUN returns with a non-zero return code it prints the command
that was executed as a Go []string:
```
INFO[0000] The command &{[/bin/sh -c noop a1 a2]} returned a non-zero code: 127
```
instead it should look like this:
```
INFO[0000] The command "/bin/sh -c noop a1 a2" returned a non-zero code: 127
```
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-05 16:08:41 -07:00
b5d68944f4
Merge pull request #13004 from duglin/FixBuilderStepMsg
...
Fix issue where build steps are duplicated in the output
2015-05-05 16:06:50 -07:00
18beb55611
Add rpm for centos-6, centos-7, fedora-20, fedora-21
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-05 16:05:30 -07:00
08b7f30fcd
Fix issue where build steps are duplicated in the output
...
This fixes an issue where the build output for the "Steps" would look like:
```
Step 1: RUN echo hi echo hi
```
instead of
```
Step 1: RUN echo hi
```
Also, I noticed that there were no checks to make sure invalid Dockerfile
cmd flags were caught on cmds that didn't use cmd flags at all. They would
have been caught on the cmds that had flags, but cmds that didn't bother
to add a new code for flags would have just ignored them. So, I added
checks to each cmd to flag it.
Added testcases for issues.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-05-05 15:28:42 -07:00
78c70cc364
Merge pull request #13003 from moxiegirl/machine-branch-change
...
Updating branch for machine docs
2015-05-05 14:49:44 -07:00
e960e4bb12
Merge pull request #11844 from jbarbier/cgroup-parent-42
...
Adding cgroup-parent option for docker build
2015-05-05 14:46:47 -07:00
8c9d67921a
Updating branch for machine docs
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-05 14:33:31 -07:00
f0a8dfd29e
Merge pull request #12993 from psftw/support-tweak
...
Remove blanket "supported" language.
2015-05-05 16:03:02 -04:00
6bb596219f
Merge pull request #12996 from tianon/abri-à-vélo
...
Replace "docker-core" with "docker-engine" in "build-deb"
2015-05-05 10:43:15 -07:00
878dcb89f3
Make a docker-in-docker dynamic binary and add RPM target
...
This change adds a new docker-in-docker dynamic binary make target which
builds a centos container for creating the dynamically linked binary.
To use it, you first must create the static binary and then call the
dind-dynbinary target. You can call it like:
$ hack/make.sh binary dind-dynbinary rpm
This would then package the dynamic binary into the rpm after having
created it in the centos build container. Unfortunately with this approach
you can't create the rpms and the debs with the same command. They have to
be created separately otherwise the wrong version (static vs. dynamic) gets
packaged.
Various RPM fixes including:
- Adding missing RPM dependencies.
- Add sysconfig configuration files to the RPM.
- Add an epoch to silence the fpm warning.
- Remove unnecessary empty package.
Signed-off-by: Patrick Devine <patrick.devine@docker.com >
Signed-off-by: Chad Metcalf <chad@docker.com >
2015-05-05 10:01:39 -07:00
77266a67e0
Merge pull request #12947 from runcom/11577-readonly-special-file-if-readonlyfs
...
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only enabled
2015-05-05 09:45:24 -07:00
e894a901db
Merge pull request #12679 from adcaes/12607-remove-error-check
...
Add intValue and use it to get timeout form param in postContainersRestart
2015-05-05 09:38:45 -07:00
5e563d1708
Replace "docker-core" with "docker-engine" in "build-deb"
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-05 10:11:59 -06:00
03956610e5
ino and dev must both match for a file to be identical.
...
This case is triggered frequently on ZFS.
Signed-off-by: Burke Libbey <burke.libbey@shopify.com >
2015-05-05 11:06:54 -04:00
3efc083d4a
Remove blanket "supported" language.
...
Signed-off-by: Peter Salvatore <peter@psftw.com >
2015-05-05 11:03:53 -04:00
0e08e9aca1
Add support --net=container with --mac-address,--add-host error out
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-05 19:28:40 +08:00
101f982059
Refactor the code of checking conflict option with netmode.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-05 19:23:18 +08:00
5a6db4fd44
a few cleanups for client output
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-05 15:59:17 +08:00
c7ca73c830
Added information about mailing lists
...
Signed-off-by: Sankar சங்கர் <sankar.curiosity@gmail.com >
2015-05-05 13:21:24 +05:30
a2c76912e0
Rename int64Value to int64ValueOrZero.
...
Signed-off-by: Adria Casas <adriacasas88@gmail.com >
2015-05-05 08:54:28 +02:00
91fb4d672a
Merge pull request #10766 from cpuguy83/stats_pull_once
...
Allow pulling stats once and disconnecting.
2015-05-04 22:28:01 -07:00
f838d44283
Merge pull request #12979 from Microsoft/10662-filepathgraphpush
...
Windows: Fix filepath vs path in push.go
2015-05-04 22:25:13 -07:00
677b962642
Merge pull request #12981 from SvenDowideit/marc-merlin-spelling-fix
...
spelling fix from Marc MERLIN
2015-05-04 17:53:37 -07:00
6e8aa4e588
Verify the no-trunc option for the search operation.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-05-05 08:51:13 +08:00
bba5fd8caa
spelling fix from Marc MERLIN
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-05 00:38:41 +00:00
1c3b697d60
Windows: Fix filepath vs path in image.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 16:23:17 -07:00
77183ed760
Merge pull request #12890 from SvenDowideit/update-docker-hub-accounts-documentation
...
Update the Docker Hub account, org and group documentation and images
2015-05-04 16:23:08 -07:00
3b2c8f69fd
Windows: Fix filepath vs path in push.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 16:18:23 -07:00
44de5fecce
Add DOCKER_USERLANDPROXY test variable
...
Add an convenient way to switch --userland-proxy on and off in
integration tests.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-04 16:07:51 -07:00
f42348e18f
Add --userland-proxy daemon flag
...
The `--userland-proxy` daemon flag makes it possible to rely on hairpin
NAT and additional iptables routes instead of userland proxy for port
publishing and inter-container communication.
Usage of the userland proxy remains the default as hairpin NAT is
unsupported by older kernels.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-04 16:07:45 -07:00
bb1ecde164
Windows: Filepath in graph\load.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 15:14:39 -07:00
b30f14f06d
Windows: First fix for graph\graph.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 15:06:51 -07:00
377ed712d3
Windows: graph\export.go filepath fixes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-04 14:56:23 -07:00
dca9e02b15
Add log opts flag to pass in logging options
...
Signed-off-by: wlan0 <sidharthamn@gmail.com >
2015-05-04 14:39:48 -07:00
56c9917815
Merge pull request #12190 from rhvgoyal/deferred-removal
...
Devicemapper: Provide deferred device removal capability
2015-05-04 14:22:52 -07:00
980c0e8c3b
Merge pull request #12948 from runcom/api-tests-container-delete
...
Add tests for API container delete
2015-05-04 17:08:52 -04:00
8771cafab6
Add tests for API container delete
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-04 22:41:57 +02:00
3fcf387d52
Merge pull request #12718 from Microsoft/10662-mkdirall
...
Windows: Volume path aware mkdirall
2015-05-04 15:51:56 -04:00
0a2ccb1cb5
Merge pull request #12769 from calavera/git_build_fragment
...
Use git url fragment to specify build reference and dir context.
2015-05-04 12:48:24 -07:00
7d371c0b47
Make /etc/hosts, /etc/resolv.conf, /etc/hostname read only if --read-only is enable
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-04 21:30:52 +02:00
f93cbd2448
Merge pull request #12967 from runcom/add-self-to-maintainers
...
Add runcom to maintainers.people
2015-05-04 12:00:42 -07:00
87a0ca5283
Merge pull request #12954 from vdemeester/11595-pkg-ioutils-coverage
...
More test on pkg/ioutils (coverage)
2015-05-04 14:57:58 -04:00
9c32cd1cef
Merge pull request #10775 from duglin/BuilderFlags
...
Add support for Dockerfile CMD options
2015-05-04 11:39:09 -07:00
ea6649e701
Add runcom to maintainers.people
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-04 20:26:11 +02:00
815b472a02
Add more ioutils tests.
...
Closes #11595
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-05-04 19:56:10 +02:00
0c1c272687
Merge pull request #12865 from larsks/bug/12864
...
journald log driver: use CONTAINER_ID field for container id
2015-05-04 10:53:58 -07:00
4895a887e2
Merge pull request #12937 from runcom/daemon-as-a-service
...
Refactor server to use daemon as the service layer in controllers
2015-05-04 13:03:28 -04:00
80a895142e
Update libcontainer and make it the source of truth on logrus version
...
To help avoid version mismatches between libcontainer and Docker, this updates libcontainer to be the source of truth for which version of logrus the project is using. This should help avoid potential incompatibilities in the future, too. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-04 11:02:44 -06:00
24bd3db0b5
Merge pull request #12939 from draghuram/history_test
...
Adding test for "GET /images/(name)/history" API.
2015-05-04 12:58:43 -04:00
8ac8c2af60
Merge pull request #12936 from tianon/docker-dev
...
Rename development builds to be in the "docker-dev" repo instead of "docker"
2015-05-04 12:55:46 -04:00
4f5272320c
Merge pull request #12958 from Mashimiao/cleanup-container-functions
...
Cleanup: move container's functions to its own file
2015-05-04 09:36:55 -07:00
49fd83a25e
Use git url fragment to specify reference and dir context.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-04 09:28:06 -07:00
ac324e5e52
Merge pull request #11034 from HuKeping/oom_kill_disable
...
enable cgroups memory.oom_control
2015-05-04 11:53:05 -04:00
2e49281bd0
Merge pull request #12903 from rhvgoyal/disable-discards
...
devmapper: Disable mount option "discard" by default
2015-05-04 18:35:25 +03:00
a8d73339f2
Merge pull request #12953 from sunyuan3/404
...
Verifiy status Codes 404 when no such image.
2015-05-04 11:10:07 -04:00
f3023a93d1
Allow pulling stats once and disconnecting.
...
Adds a `stream` query param to the stats API which allows API users to
only collect one stats entry and disconnect instead of keeping the
connection alive to stream more stats.
Also adds a `--no-stream` flag to `docker stats` which does the same
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-04 10:49:13 -04:00
56f7da34fc
Merge pull request #12944 from tianon/fsnotify-1.2.0
...
Update fsnotify to 1.2.0
2015-05-04 16:57:45 +03:00
1be7a10b89
cleanup: move container's functions to its file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-05-04 21:37:44 +08:00
175339ffb6
Merge pull request #12943 from tianon/go-patricia-v2
...
Update go-patricia to 2.1.0
2015-05-04 16:28:03 +03:00
a4a924e1b6
Feature: option for disable OOM killer
...
Add cgroup support for disable OOM killer.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-05-04 21:11:29 +08:00
9eefd2c17d
Verifiy status Codes 404 when no such image
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-05-04 15:39:40 +08:00
5cec69a7b3
Update the Docker Hub account, org and group documentation and images
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-04 00:37:54 +00:00
fe221852b7
Merge pull request #12950 from thieman/tnt-riak-ssh-reference
...
Remove stale reference to previous SSH instructions
2015-05-03 15:42:38 -04:00
b40a5eeec8
Remove stale reference to previous SSH instructions
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com >
2015-05-03 14:15:17 -04:00
15313dfdf3
Merge pull request #12735 from jmzwcn/patch-1
...
Remove empty line after client.CmdInspect docstring
2015-05-03 11:10:14 -04:00
e8bbd87ba8
Merge pull request #12888 from jmzwcn/patch-3
...
`docker images` friendly duration gets unfriendly after a while
2015-05-03 11:09:25 -04:00
28ea4a63d0
docker images friendly duration gets unfriendly after a while
...
fix #12852
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
2015-05-03 21:19:18 +08:00
28547a1a3a
Remove empty line after client.CmdInspect docstring #12706
...
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Remove empty line after client.CmdInspect docstring
fix #12706
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
2015-05-03 17:23:18 +08:00
e1ccfabdc5
Update fsnotify to 1.2.0
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-02 23:28:15 -06:00
b447fef7ec
Update go-patricia to 2.1.0
...
This includes a fix for the minor v2 API change introduced by https://github.com/tchap/go-patricia/commit/341a37095fea62f400f449e4ec0192702d6e019e . 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-02 23:25:57 -06:00
aaaa8bab0c
Adding test for "GET /images/(name)/history" API.
...
Closes #12284 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-05-02 23:09:32 -04:00
0ad6f90127
Merge pull request #12893 from vdemeester/12892-fix-labels-documentation
...
Fixing examples given for labels
2015-05-02 22:29:08 -04:00
b58f48ae42
Merge pull request #12922 from tianon/complete-repos-on-pull-all
...
Only complete repos with "docker pull -a"
2015-05-02 22:19:37 -04:00
ec534042aa
Merge pull request #12941 from runcom/unused-return-error
...
Remove unused error return
2015-05-02 09:12:59 -07:00
4aff563282
Remove unused error return
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-02 15:57:57 +02:00
c7cfdb65aa
Refactor server to use daemon as the service layer in controllers
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-02 03:12:58 +02:00
a4af8ad869
Rename development builds to be in the "docker-dev" repo instead of "docker"
...
See https://github.com/docker-library/docker/issues/2 for some of the context around this; essentially, we're looking to create an official `docker` image that includes the Docker CLI (and the dependencies necessary for easy Docker-in-Docker), but it makes sense to use the `docker` namespace for that image. The `docker-dev` official image is already builds of Docker's own `Dockerfile` (but specifically of releases), so this seemed like a good fit. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-01 18:28:08 -06:00
3ea59f8991
Merge pull request #12932 from tianon/finally-remove-archive-tar-copy
...
Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
2015-05-01 15:43:13 -07:00
393678474f
Merge pull request #12924 from runcom/provide-struct-to-cli-stream
...
Provide a struct to configure cli streaming
2015-05-01 15:10:58 -07:00
576985a1dc
Finally remove our copy of "archive/tar" now that Go 1.4 is the minimum!
...
IT'S ABOUT TIME. 🎉
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-01 16:01:10 -06:00
1f2f3db1e3
Merge pull request #12720 from DarianAnjuhal/fix-ensure-dockerinit
...
TestDiffEnsureDockerinitFilesAreIgnored is too long
2015-05-01 14:52:34 -07:00
4d88bf3ecb
Merge pull request #12930 from tianon/build-deb-stretch
...
Add "debian:stretch" as another build-deb target
2015-05-01 14:42:19 -07:00
e6d3ebd939
Merge pull request #12929 from tianon/dockerignore-fffff
...
Remove hacky "cp .../Dockerfile.build ." in "build-deb"
2015-05-01 14:32:26 -07:00
ab74b327c6
Merge pull request #12928 from LK4D4/firewalld_race
...
Fix race in FirewalldInit
2015-05-01 14:23:47 -07:00
d317b7c891
Add "debian:stretch" as another build-deb target
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-01 15:03:08 -06:00
9f5730e131
Remove hacky "cp .../Dockerfile.build ." in "build-deb"
...
Turns out that `-f` on a file that's in `.dockerignore` actually does work. No idea why it wasn't when I was doing this before, but oh well! 🤘
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-01 14:45:00 -06:00
a05bcd12c4
Fix race in FirewalldInit
...
It was possible that signalHandler won't start because connections is
not assigned.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-05-01 13:35:54 -07:00
d9639409fd
Provide a struct to configure cli streaming
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-05-01 20:23:44 +02:00
e1df16b3a3
Merge pull request #12921 from hqhq/hq_fix_rmlink
...
fix docker rm name issue
2015-05-01 11:15:25 -07:00
380b873752
Only complete repos with "docker pull -a"
...
With this, `docker pull deb<tab>` will show all `debian:*` tags, as before, but `docker pull -a deb<tab>` will complete directly to just `debian`. 👍
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-05-01 10:04:24 -06:00
949b929a32
Merge pull request #12882 from kostickm/12824-uninstall-docs
...
Docs adding uninstall instructions
2015-05-01 08:54:59 -07:00
5eee4058fe
Docs adding uninstall instructions
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-05-01 08:10:56 -07:00
79f13d1497
fix docker rm name issue
...
Addresses https://github.com/docker/docker/issues/12308
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-01 22:26:40 +08:00
7e864a57bc
Merge pull request #12915 from moxiegirl/implement-github-ignores
...
Adding support for GITHUB IGNORES to the engine Dockerfile
2015-05-01 06:29:27 -07:00
04adaaf1ee
devmapper: Disable mount option "discard" by default
...
Right now devicemapper mounts thin device using online discards by default
and passes mount option "discard". Generally people discourage usage of
online discards as they can be a drain on performance. Instead it is
recommended to use fstrim once in a while to reclaim the space.
In case of containers, we recommend to keep data volumes separate. So
there might not be lot of rm, unlink operations going on and there might
not be lot of space being freed by containers. So it might not matter
much if we don't reclaim that free space in pool.
User can still pass mount option explicitly using dm.mountopt=discard to
enable discards if they would like to.
So this is more like setting the containers by default for better performance
instead of better space efficiency in pool. And user can change the behavior
if they don't like default behavior.
Reported-by: Mike Snitzer <snitzer@redhat.com >
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-05-01 09:16:31 -04:00
79d086c47d
Merge pull request #12772 from Microsoft/10662-moveworkdirchecktoserver
...
Windows: Move workdir check daemon-side
2015-05-01 00:24:40 -04:00
abf1a14bfe
Merge pull request #12716 from Microsoft/10662-defaultlistener
...
Windows: Change default listener to HTTP
2015-05-01 00:11:54 -04:00
cbf9a64cb5
Windows: Change default listener to HTTP
...
Signed-off-by: jhowardmsft <jhoward@microsoft.com >
2015-04-30 19:49:45 -07:00
66077a9d69
Merge pull request #12767 from Microsoft/10662-commitdefertarclose
...
Windows: Commit() rwTar defer close
2015-04-30 18:06:09 -07:00
e9c9682333
Merge pull request #12829 from Microsoft/10662-execdriver-driver-refactor
...
Windows: Start refactor execdriver/driver.go
2015-04-30 20:36:10 -04:00
6b42d72d86
Merge pull request #12831 from Microsoft/10662-nolxconwindows
...
Windows: Factor out LXC
2015-04-30 17:25:15 -07:00
d2e380b687
Merge pull request #12841 from Mashimiao/use-CustomSize-to-replace-intToString
...
use CustomSize replace intToString
2015-04-30 17:24:41 -07:00
7e7b6a20bd
Merge pull request #12901 from hqhq/hq_fix_test_comment
...
fix comments for test certain tests
2015-04-30 17:08:23 -07:00
5221fd2ba5
Merge pull request #12900 from gaurav-gosec/master
...
Make use of iptablesPath variable which has the path of iptables, instea...
2015-04-30 16:12:03 -07:00
6bb1986e7f
Merge pull request #12914 from duglin/FixCPtext
...
Don't wrap 'cp' help too soon.
2015-04-30 16:05:20 -07:00
648bf6a446
Merge pull request #12909 from runcom/12907-fix-TestApiImagesDelete-net-none-build
...
Fix TestApiImagesDelete for --net none build
2015-04-30 18:22:04 -04:00
51977a2307
Adding support for GITHUB IGNORES to the engine Dockerfile
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-30 15:21:05 -07:00
68ee5bdf96
Don't wrap 'cp' help too soon.
...
Minor thing but docker cp --help was:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data
as a tar file to STDOUT.
This changes it to:
Copy files/folders from a PATH on the container to a HOSTDIR on the host
running the command. Use '-' to write the data as a tar file to STDOUT.
The \n made the output look funky.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-30 14:43:14 -07:00
10e2dbf375
Windows: Factor out LXC
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-04-30 14:28:35 -07:00
71bfb93678
Windows: Fork execdrivers.go for Windows execdriver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-04-30 14:22:30 -07:00
b255c565ca
Windows: Start refactor execdriver/driver.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-04-30 14:21:04 -07:00
03eb0d065d
Windows: Move workdir check daemon-side
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-04-30 14:16:45 -07:00
f9c7772b83
Windows: Commit() rwTar defer close
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-04-30 12:17:33 -07:00
86d1223a29
Windows: mkdirall volume path aware
...
Signed-off-by: jhowardmsft <jhoward@microsoft.com >
2015-04-30 11:59:42 -07:00
5c86f311c8
Fix TestApiImagesDelete for --net none build
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-30 20:49:28 +02:00
72e9e12fa0
Merge pull request #12592 from Mic92/dockerfile
...
Dockerfile: download go libraries before copy vendor
2015-04-30 10:29:01 -07:00
cacf90c963
Merge pull request #12857 from nikolas/patch-1
...
Remove incorrect option in docker install command
2015-04-30 09:35:20 -07:00
0d0b42547e
Merge pull request #12771 from runcom/say-bye-to-engine
...
Remove engine
2015-04-30 12:18:16 -04:00
fc9033a9c8
Merge pull request #12664 from Mashimiao/sysinfo-support-ipv4_forward-check
...
sysinfo: add IPv4Forwarding check
2015-04-30 11:44:44 -04:00
1eb4e96f21
Merge pull request #12837 from mavenugo/integ
...
A few more Integration tests to test Networking related daemon flags
2015-04-30 11:12:43 -04:00
869ecba652
journald log driver: use CONTAINER_ID field for container id
...
This patch modifies the journald log driver to store the container ID in
a field named CONTAINER_ID, rather than (ab)using the MESSAGE_ID field.
Additionally, this adds the CONTAINER_ID_FULL field containing the
complete container ID and CONTAINER_NAME, containing the container name.
When using the journald log driver, this permits you to see log messages
from a particular container like this:
# journalctl CONTAINER_ID=a9238443e193
Example output from "journalctl -o verbose" includes the following:
CONTAINER_ID=27aae7361e67
CONTAINER_ID_FULL=27aae7361e67e2b4d3864280acd2b80e78daf8ec73786d8b68f3afeeaabbd4c4
CONTAINER_NAME=web
Closes : #12864
Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com >
2015-04-30 10:42:27 -04:00
1d5f1bb0f5
Make use of iptablesPath variable which has the path of iptables, instead of using string iptables directly
...
Signed-off-by: Gaurav <gaurav.gosec@gmail.com >
2015-04-30 18:22:12 +05:30
424a544bb5
Fixing examples given for labels
...
Fixes #12892
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-04-30 09:48:54 +02:00
987e221607
fix comments for test certain tests
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-30 15:40:48 +08:00
cd2b019214
sort ports mapping before allocating
...
prioritize the ports with static mapping before dynamic mapping. This removes
the port conflicts when we allocate static port in the reserved range
together with dynamic ones.
When static port is allocated first, Docker will skip those when determining
free ports for dynamic ones.
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
2015-04-30 02:18:04 +00:00
f7e417ea5e
Remove integration tests and port them to integration-cli
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-30 01:35:16 +02:00
531f4122bd
Remove engine mechanism
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-30 01:35:16 +02:00
029cbc1004
Merge pull request #12574 from ahmetalpbalkan/docs/systemd-dir
...
docs: Add more places docker.service can be at
2015-04-29 19:07:58 -04:00
c0a1b2d6e9
docs: Add more places docker.service can be at
...
More systemd goodness. Documenting where `docker.service` lives under Ubuntu 15.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-29 22:39:48 +00:00
2c4fe2aba3
Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term
...
Add error check before getting term
2015-04-29 17:57:01 -04:00
c271c61fee
Do our best not to invoke iptables concurrently if --wait is unsupported
...
We encountered a situation where concurrent invocations of the docker daemon on a machine with an older version of iptables led to nondeterministic errors related to simultaenous invocations of iptables.
While this is best resolved by upgrading iptables itself, the particular situation would have been avoided if the docker daemon simply took care not to concurrently invoke iptables. Of course, external processes could also cause iptables to fail in this way, but invoking docker in parallel seems like a pretty common case.
Signed-off-by: Aaron Davidson <aaron@databricks.com >
2015-04-29 14:40:25 -07:00
d0a4f310ef
Merge branch 'master' of github.com:docker/docker into kill
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-04-29 15:06:47 -04:00
1c073ec176
Moved explicit cleanups into defered action
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-04-29 11:41:13 -07:00
d716f22aad
Merge pull request #12875 from runcom/remove-cfatal-in-goroutine-integration-cli
...
c.Fatal won't fail and exit test inside a goroutine
2015-04-29 10:47:17 -07:00
6c46c9c839
Merge pull request #11526 from mizzy/append-drop-rule-not-insert
...
Append DROP rule with --icc=false, not insert
2015-04-29 10:28:11 -07:00
dd0666e64f
Integration Tests for --icc=false & container Linking using --expose
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-04-29 10:16:31 -07:00
53bef64804
Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups
...
Option to configure cgroup manager (adds --exec-opt)
2015-04-29 10:00:41 -07:00
ba11929ebd
Integration tests for --ip daemon option
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-04-29 09:55:49 -07:00
0e254411b1
Integration tests for --fixed-cidr daemon config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-04-29 09:55:42 -07:00
9c325c3f54
Integration tests for --bip daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-04-29 09:55:34 -07:00
f3f5ff9d83
Integration tests for --bridge daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-04-29 09:55:25 -07:00
44f8c44e5f
Merge pull request #12840 from vdemeester/11598-pkg-fileutils-tests
...
Add coverage on pkg/fileutils
2015-04-29 11:15:57 -04:00
4203230cbb
c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-29 17:02:22 +02:00
8454e1a3b2
Add coverage on pkg/fileutils
...
Should fix #11598
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-04-29 16:27:12 +02:00
534ed8c2d4
Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-29 06:20:33 -07:00
f2f8e4c5c9
Merge pull request #12870 from coolljt0725/fix_rename_help
...
Fix docker rename help not consistent with other commands
2015-04-29 09:14:03 -04:00
0e752adf55
Fix docker rename help not consistent with other commands
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-29 19:37:20 +08:00
8a2f899286
use CustomSize replace intToString
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-04-29 08:30:25 +08:00
d2f0b9ed97
Merge pull request #11190 from cyphar/expose-path-sanitisation-wrappers
...
Expose the getResourcePath and getRootResourcePath wrappers.
2015-04-28 18:45:36 -04:00
f80300e9cf
Merge pull request #12789 from LK4D4/daemon_suite
...
Implement daemon suite for integration-cli
2015-04-28 15:30:36 -07:00
cfa3a080c6
Merge pull request #12820 from runcom/yet-another-sockRequest-refactor
...
Expose whole Response struct in sockRequestRaw
2015-04-28 13:26:30 -07:00
4676ff3fd7
Merge pull request #12245 from buddhamagnet/dockerignore-ignores
...
Add support for exclusion rules in dockerignore
2015-04-28 11:28:46 -07:00
6fd8e485c8
add support for exclusion rules in dockerignore
...
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com >
2015-04-28 18:56:45 +01:00
f04837cf80
Remove incorrect option in docker install command
...
The `-N` option is not compatible with the `-O` option of wget (see the man page).
The example command now matches the example in the script on http://get.docker.com/ .
Signed-off-by: Nik Nyby <nikolas@gnu.org >
2015-04-28 13:27:04 -04:00
dde5ff2872
Merge pull request #12644 from psftw/official-repos-rewrite
...
Rewrite Official Repos page.
2015-04-28 08:57:29 -07:00
6113eab174
Merge pull request #12814 from vbatts/vbatts-rhel_updates
...
RHEL updates
2015-04-28 08:51:35 -07:00
868d5dca74
Merge pull request #12844 from hqhq/hq_fix_inspect_format
...
fix a minor inspect format issue
2015-04-28 08:50:52 -07:00
9b365e0845
rhel.md: adding link to most recent issue
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-04-28 11:28:33 -04:00
179b6ddc35
rhel.md: bump the kernel version for RHEL6
...
Closes #9856
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-04-28 11:28:33 -04:00
ed40c0a9a4
rhel.md: update RHEL6 from 6.5 to 6.6
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-04-28 11:28:23 -04:00
a8e871b0bb
Add support for Dockerfile CMD options
...
This adds support for Dockerfile commands to have options - e.g:
COPY --user=john foo /tmp/
COPY --ignore-mtime foo /tmp/
Supports both booleans and strings.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-28 05:28:46 -07:00
67da055ceb
Merge pull request #12826 from cpuguy83/12825_fix_leftover_container_json
...
Fix undead containers
2015-04-28 08:11:40 -04:00
6ac481296d
Merge pull request #12723 from moxiegirl/carry-11296
...
Integrating Windows Testing Material
2015-04-28 04:56:17 -07:00
c7812f01c7
fix a minor inspect format issue
...
Before, inspect cont1 cont2 shows:
[{
xxx
}
,{
xxx
}
]
After, it shows:
[
{
xxx
}
,{
xxx
}
]
Because `func (*Encoder) Encode` always followed by a newline character,
so it's difficult to put '}' and ']' one the same line.
To get symmetry, above is our choice.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-28 18:51:04 +08:00
8f52eb7b82
Rewrite Official Repositories page.
...
The existing page is focused on listing a set of requirements for
proposing a new repository. This information has become outdated and is
duplicated in the `docker-library/official-images` and
`docker-library/docs` GitHub repositories. This PR rewrites the
Official Repositories page to describe what they actually are, and
defers to GitHub/IRC for the subset of users that are interested in
contributing. I also removed the requirement to contact
partners@docker.com and made it optional to reduce the barrier to entry.
Signed-off-by: Peter Salvatore <peter@psftw.com >
2015-04-28 00:37:17 -04:00
af8efab756
add initial docs for windows client testing
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
docs: crop and optimize images
Cropped and optimized images.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Testing and updating the Windows material
Signed-off-by: Mary Anthony <mary@docker.com >
checkpoint
Signed-off-by: Mary Anthony <mary@docker.com >
Fitting the Windows specific material into the contributor guide
Signed-off-by: Mary Anthony <mary@docker.com >
Entering James comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-27 21:21:53 -07:00
779939e334
Merge pull request #12817 from WeiZhang555/man
...
improve docker man page
2015-04-27 22:59:11 -04:00
82daa43844
Fix for Daemon crashing when wildcards are used for COPY/ADD
...
in the filename and the command itself
Closes #12267
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-27 19:09:57 -07:00
45c45a2c9a
archive: Optimize ChangesDirs on Linux
...
If we tear through a few layers of abstraction, we can get at the inodes
contained in a directory without having to stat all the files. This
allows us to eliminate identical files much earlier in the changelist
generation process.
Signed-off-by: Burke Libbey <burke@libbey.me >
2015-04-27 21:26:13 -04:00
2afcd10202
option to configure cgroups
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
2015-04-27 17:50:39 -07:00
aebeefa886
Merge pull request #12798 from dnephin/add_missing_docs_about_labels
...
Add missing API docs about filtering by label
2015-04-27 17:37:10 -07:00
d4bbbe58dd
Add docs for --exec-opt and setting native.cgroupdriver.
...
update man pages.
update bash completion.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
2015-04-27 17:04:28 -07:00
9018f873c8
Merge pull request #12796 from moxiegirl/add-to-docs-maintainers
...
Adding James and theJeztah to the list
2015-04-27 16:32:15 -07:00
57464c32b9
Implement daemon suite for integration-cli
...
For creating and stopping test daemons automatically.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-27 15:48:29 -07:00
a07e963526
Merge pull request #11882 from hqhq/hq_warn_device_cg
...
add devices cgroup check as hard requirement
2015-04-27 18:42:57 -04:00
13895173eb
Merge pull request #12801 from thewtex/doc-test-ubuntu
...
Do Debian installation verification with hello-world image.
2015-04-27 15:09:25 -07:00
0153edcda1
Merge pull request #12828 from tdmackey/trivial-spelling
...
trivial: typo cleanup
2015-04-27 17:05:46 -04:00
62a85fe202
Merge pull request #12794 from runcom/small-cleaning
...
Small if err cleaning
2015-04-27 17:02:27 -04:00
c3c08f76be
Fix undead containers
...
When a container has errors on removal, it gets flagged as dead.
If you `docker rm -f` a dead container the container is dereffed from
the daemon and doesn't show up on `docker ps` anymore... except that the
container JSON file may still be lingering around and becomes undead
when you restart the daemon.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-27 16:45:51 -04:00
3941623fbc
trivial: typo cleanup
...
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com >
2015-04-27 13:35:08 -07:00
50868b2c57
fixed TestDiffEnsureDockerinitFilesAreIgnored is too long #12672
...
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at >
2015-04-27 13:24:15 -07:00
2f513db31d
Merge pull request #12719 from fntlnz/12675-test-events-emit
...
Parallelize TestEventsLimit
2015-04-27 16:02:33 -04:00
844538142d
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-27 21:50:33 +02:00
40779b28bb
Parallelize TestEventsLimit
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
2015-04-27 21:14:00 +02:00
531ec3cac9
Merge pull request #12532 from ankushagarwal/eliminate-json-marshal
...
Eliminate json.Marshal from graph/export.go and volumes/volume.go
2015-04-27 13:54:20 -05:00
572ba9cb40
Merge pull request #12333 from Mashimiao/clean-up-viz
...
Clean up viz code
2015-04-27 14:13:03 -04:00
b6cfe7ca07
Do Debian installation verification with hello-world image.
...
The hello-world image is recommended as a verification image and it is smaller
than Ubuntu.
Signed-off-by: Matt McCormick <matt.mccormick@kitware.com >
2015-04-27 13:53:30 -04:00
f9c27bda1e
Merge pull request #12819 from Microsoft/10662-volumesrefactor
...
Windows: Refactor volumes
2015-04-27 10:25:41 -07:00
4ddd448490
Merge pull request #12793 from runcom/bye-unmarshal
...
Replace json.Unmarshal() with json.Decoder().Decode()
2015-04-27 13:19:43 -04:00
97b35bab81
Merge pull request #12818 from Microsoft/10662-nocontainercheckonwindows
...
Windows: Info no containerized check
2015-04-27 12:56:28 -04:00
bb1c576eb3
Expose whole Response struct in sockRequestRaw
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-27 18:49:00 +02:00
ba1725a94e
Windows: Refactor volumes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-04-27 09:27:15 -07:00
6856c69c41
Merge pull request #12807 from jmzwcn/patch-2
...
Remove dead code from daemon/daemon.go
2015-04-27 12:10:30 -04:00
5305e675b5
Merge pull request #12809 from runcom/remove-cfatal-goroutine-attachws
...
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
2015-04-27 08:59:47 -07:00
9f684c8592
Merge pull request #12714 from noxiouz/fix_race_stats_collector
...
statsCollector: fix data race in run()
2015-04-27 10:57:56 -05:00
02d73d910f
Merge pull request #12799 from aidanhs/aphs-fix-net-container-deadlock
...
Prevent deadlock on --net=container:<self>
2015-04-27 08:46:22 -07:00
ab97303cae
Windows: Info no containerized check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-04-27 08:38:01 -07:00
8ec22ae87d
Merge pull request #12803 from ZJU-SEL/remove_useless_export_httpcall
...
remove useless http call from export
2015-04-27 11:33:13 -04:00
29f379ea6e
improve docker man page
...
fix issue #12708 :
"docker man page is misleading about format of commands"
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-04-27 23:27:35 +08:00
8dc07af52f
Merge pull request #12783 from duglin/Issue12763-LinkedEnvs
...
A fix for = in env values in linked containers
2015-04-27 10:50:14 -04:00
325c0404c8
Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps
...
remove some uneeded sleeps in tests
2015-04-27 10:42:40 -04:00
9e0ffae864
remove some uneeded sleeps in tests
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-27 10:14:29 -04:00
f30d1c1835
Prevent deadlock on attempt to use own net
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
2015-04-27 14:57:37 +01:00
c7b2632dc8
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-27 13:56:55 +02:00
accbbfeae4
Remove dead code from daemon/daemon.go
...
fix #12492
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
2015-04-27 15:50:47 +08:00
6d9439c627
remove useless http call from export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-04-27 12:41:03 +08:00
f930c86cb1
add library files for socat in mkimage-unittest.sh
...
in https://docs.docker.com/articles/ambassador_pattern_linking/
svendowideit/ambassador images is from docker-ut built using this script
and uses socat but socat complains as follows
socat: error while loading shared libraries: libreadline.so.5: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libssl.so.1.0.0: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libcrypto.so.1.0.0: cannot open shared object file: No such file or directory
socat: error while loading shared libraries: libtinfo.so.5: cannot open shared object file: No such file or directory
/usr/lib/x86_64-linux-gnu/lib{crypto,ssl}.so* lib are symlinks so removing -P option from cp
adding libreadline.so and libtinfo.so
Signed-off-by: Jinsoo Park <cellpjs@gmail.com >
update libssl.so path
Signed-off-by: Jinsoo Park <cellpjs@gmail.com >
Remove mkimage-unittest.sh
Signed-off-by: Jinsoo Park <cellpjs@gmail.com >
2015-04-26 23:35:19 -04:00
cfd0f53b03
Add missing API docs about filtering by label.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
2015-04-26 15:36:01 -04:00
6cba3109c2
Merge pull request #12787 from epc/copyedits
...
Copy edits for typos
2015-04-26 10:40:18 -07:00
ba79f0ca1f
Adding James and theJeztah to the list
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-26 10:32:43 -07:00
26543e0309
Replace json.Unmarshal with json.Decoder().Decode()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-26 15:02:01 +02:00
92f4bd59ce
Merge pull request #12734 from sergey-alekseev/sergey-alekseev-patch-1
...
Fix documentation typo in articles/basics.md
2015-04-25 20:33:55 -07:00
fefb836766
Merge pull request #12728 from HuKeping/addtest
...
Add test for REST API container rename
2015-04-25 17:01:10 -07:00
9dbe12b792
Migrate integration test to new method
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-04-25 17:12:01 -04:00
a8dfafc986
Make the docs for --cgroup-parent better
...
Signed-off-by: Marianna <mtesselh@gmail.com >
2015-04-25 16:35:28 -04:00
65aba0c9d6
Add dep to test
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-04-25 15:25:52 -04:00
f039c699a4
Fix gofmt
...
Mischevious comma is mischevious
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-04-25 15:25:52 -04:00
f40dd69c97
Add test for cgroup parent flag for build
...
Signed-off-by: Marianna <mtesselh@gmail.com >
2015-04-25 15:25:52 -04:00
81897adcee
Adding doc
...
Signed-off-by: Julien Barbier <write0@gmail.com >
2015-04-25 15:25:51 -04:00
bb41193998
Happy birthday Docker! cgroup-parent option for docker build. Thanks to Michael, Nathan and Jessie for their support! #42
...
Signed-off-by: Julien Barbier <write0@gmail.com >
2015-04-25 15:25:51 -04:00
fa9299f4c0
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
2015-04-25 15:01:05 -04:00
b5ccfca565
Merge pull request #12784 from duglin/RaceCommit
...
Fix race condition in API commit test
2015-04-25 10:03:03 -07:00
cd4f507b42
Fix race condition in API commit test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-25 05:46:47 -07:00
bc149be69c
A fix for = in env values in linked containers
...
Closes : #12763
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-25 04:42:43 -07:00
8f752ffeaf
Add test for REST API container rename
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-25 17:19:57 +08:00
2188c8d2f4
Fix documentation typo in articles/basics.md
...
Signed-off-by: Sergey Alekseev <sergey.alekseev.minsk@gmail.com >
2015-04-25 11:32:17 +03:00
272e612b65
Merge pull request #12744 from vdemeester/11603-pkg-archive-test-coverage-2
...
Add coverage on pkg/archive (related to #11603 )
2015-04-24 22:12:01 -07:00
6e9a6f5396
Merge pull request #12765 from LK4D4/registry_suite
...
Implement DockerRegistrySuite in integration-cli
2015-04-24 23:05:29 -04:00
daad696e09
Fix error prompt for pull & import handler postImagesCreate.
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-04-25 09:10:32 +08:00
c3ef6df9c3
Merge pull request #12699 from vbatts/vbatts-init_mnt_ns
...
contrib/init: unshare mount namespace for inits
2015-04-24 17:52:11 -07:00
9ad7145dae
Merge pull request #12775 from Microsoft/12774-fixtypo
...
Fixed typo 'configuring'
2015-04-24 17:21:40 -07:00
ae9905ef9c
Fixed typo 'configuring'
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-04-24 16:52:32 -07:00
29a3bbf2b3
Eliminate json.Marshal from graph/export.go and volumes/volume.go
...
Fixes #12531
Fixes #12530
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-04-24 15:40:21 -07:00
602fd4e14b
Merge pull request #12764 from LK4D4/not_protect_dangling
...
Not protect dangling images for integration-cli
2015-04-24 14:19:55 -07:00
f696b1071a
Implement DockerRegistrySuite in integration-cli
...
To avoid manually creating and destroying registrys in tests.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-24 14:17:00 -07:00
aa064621dd
Merge pull request #12762 from ibuildthecloud/export-restart-parse
...
Expose ParseRestartPolicy
2015-04-24 16:30:18 -04:00
9bea123bdd
Not protect dangling images for integration-cli
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-24 13:16:51 -07:00
b76bbae413
Merge pull request #12755 from LK4D4/use_f_for_remove
...
Use -f for rm instead of kill before
2015-04-24 15:34:38 -04:00
366ee6bdfa
Expose ParseRestartPolicy
...
ParseRestartPolicy is useful function for third party go programs to use
so that they can parse the restart policy in the same way that Docker
does
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-04-24 12:23:54 -07:00
887ad57cfa
Use -f for rm instead of kill before
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-24 11:55:54 -07:00
03719be830
Merge pull request #12754 from LK4D4/carry_12707
...
fix runtime issue for TestEventsFilterContainer
2015-04-24 14:36:58 -04:00
700056cd4c
Merge pull request #12753 from LK4D4/remove_all_images
...
Implement teardown removeAllImages
2015-04-24 14:16:04 -04:00
11a5f1af01
statsCollector: fix data race in run()
...
statsCollector.publishers must be protected to prevent
modifications during the iteration in run().
Being locked for a long time is bad, so pairs of containers &
publishers (pointers) are copied to release the lock fast.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2015-04-24 21:07:48 +03:00
07795c3f5d
fix runtime issue for TestEventsFilterContainer
...
Signed-off-by: Daniel Antlinger <d.antlinger@gmx.at >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-24 10:48:40 -07:00
a9688cdca5
Implement teardown removeAllImages
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-24 10:37:21 -07:00
790c63a5ef
Merge pull request #12502 from calavera/shallow_git_history
...
Shallow clone using git to build images.
2015-04-24 10:16:01 -07:00
1cfb307d70
Remove duplicated git clone logic.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-24 09:39:45 -07:00
8bd5a95e1e
Document the extra depth argument in git contexts.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-24 09:39:39 -07:00
3117bf3ef5
Test that we set the right arguments for git cloning depending on the transport.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-24 09:39:38 -07:00
9fb7204a41
Do not try to shallow git history when the protocol doesn't allow it.
...
This only happens with the old git http dumb protocol, but that's what we use in our integration tests.
We check the Content-Type header advertised in http requests to make sure the http transport is the git smart transport:
See this commit as a reference:
https://github.com/git/git/commit/4656bf47fca857df51b5d6f4b7b052192b3b2317
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-24 09:39:38 -07:00
36fbf4b864
Shallow clone using git to build images.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-24 09:39:38 -07:00
310fc37fe7
Merge pull request #12678 from vdemeester/fix-advanced-contributing-doc
...
Documentation: fix the design proposal link in advanced contribution page
2015-04-24 11:12:36 -04:00
c21d408ad2
Add coverage on pkg/archive
...
Add tests on:
- changes.go
- archive.go
- wrap.go
Should fix #11603 as the coverage is now 81.2% on the ``pkg/archive``
package. There is still room for improvement though :).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-04-24 17:03:33 +02:00
b7c3c0cb69
*: switch to Get(Root)?ResourcePath where appropriate
...
Several parts of the codebase didn't use the correct path sanitisation
wrappers. Now that the wrappers have been exposed, use those.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2015-04-25 00:10:29 +10:00
4377ebd6a7
*: expose getResourcePath and getRootResourcePath wrappers
...
Due to the importance of path safety, the internal sanitisation wrappers
for volumes and containers should be exposed so other parts of Docker
can benefit from proper path sanitisation.
Signed-off-by: Aleksa Sarai <cyphar@cyphar.com > (github: cyphar)
2015-04-24 23:53:47 +10:00
c92377e300
docker kill should return error if container is not running.
...
Assuming that docker kill is trying to actually kill the container
is a mistake. If the container is not running we should report it
back to the caller as a error.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Regan McCooey <rmccooey27@aol.com > (github: rmccooey27)
Docker-DCO-1.1-Signed-off-by: Regan McCooey <rmccooey27@aol.com > (github: rhatdan)
2015-04-24 08:33:21 -04:00
300a12f9aa
Merge pull request #12729 from SvenDowideit/dhe-documentation-master-pr
...
Dhe documentation master pr
2015-04-23 21:22:56 -07:00
b0ad95daa8
Copy over the DHE documentation for release to docs.docker.com
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-04-24 12:39:58 +10:00
493437616d
make space for DHE menu item again
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-04-24 12:39:49 +10:00
016a2d6d9d
Merge pull request #12587 from coolljt0725/add_cpu_cfs_quota_to_build
...
Add cpu cfs quota to build
2015-04-23 21:28:46 -04:00
5f4fb8be00
Add cpu cfs quota to build
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-24 08:54:08 +08:00
667b1e220c
simplify memory limit check
...
If memory cgroup is mounted, memory limit is always supported,
no need to check if these files are exist.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-24 08:43:44 +08:00
66acef865d
clean up viz code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-04-24 08:38:14 +08:00
47e5acfbae
add devices cgroup check and errors
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-24 08:37:59 +08:00
09052a5572
Merge pull request #12712 from moxiegirl/carry-docs-update-9397
...
Removing firewalld info
2015-04-23 17:24:27 -07:00
9d94d91ea7
Merge pull request #12569 from kostickm/12449-check-statusCode
...
Fixing statusCode checks for sockRequest
2015-04-23 17:13:06 -07:00
c26695cf8a
Merge pull request #12659 from dqminh/exec-interactive-hang
...
reuse same code for setting pipes in run/exec
2015-04-23 16:37:49 -07:00
2ebfc7c874
Merge pull request #12710 from runcom/bye-engine-from-graph
...
Remove engine/job from graph
2015-04-23 15:42:50 -07:00
c7845e27ee
Fixing statusCode checks for sockRequest
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-23 15:35:56 -07:00
b830b823cd
Merge pull request #12711 from Shopify/fix_doc
...
[docs] small markup fix
2015-04-23 15:07:46 -07:00
ade8146aa8
reuse same code for setting pipes in run/exec
...
This also moves `exec -i` test to _unix_test.go because it seems to need a
pty to reliably reproduce the behavior.
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
2015-04-23 21:54:21 +00:00
fa2c68a89e
Remove engine/job from graph
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-23 23:36:29 +02:00
96ef1bd29c
Merge pull request #12709 from vdemeester/12705-remove-defer-deleteContainer
...
delete "defer deleteContainer" on tests
2015-04-23 14:34:23 -07:00
55d1ac645c
[docs] fix formatting issue
...
Signed-off-by: Florian Weingarten <flo@hackvalue.de >
2015-04-23 21:17:12 +00:00
b6d8b65e55
Removing firewalld info
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-23 14:04:36 -07:00
259effc6df
Merge pull request #9397 from jpopelka/9395-firewalld
...
Firewalld support
2015-04-23 16:58:08 -04:00
6b8d8a5847
Merge pull request #12417 from hashneo/patch-1
...
What if authConfig or factory is Nill?
2015-04-23 13:54:47 -07:00
b31d154294
Merge pull request #12509 from runcom/12499-racy-TestEventsImageImport
...
Fix TestEventsImageImport racy
2015-04-23 13:28:43 -07:00
c5ef2901d8
delete "defer deleteContainer" on tests
...
Since docker test suite is now using gocheck, ``defer
deleteContainer(…)`` is not needed anymore.
Fixes #12705
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-04-23 22:27:46 +02:00
59ae92d55c
Merge pull request #12575 from brahmaroutu/integration_test7_12255
...
Move https tests as unit tests under client
2015-04-23 13:17:54 -07:00
68fc79f592
Merge pull request #12655 from jlhawn/fix_12281
...
Validate repo name before image pull
2015-04-23 13:12:12 -07:00
799cf056e7
Merge pull request #11839 from brahmaroutu/template_11641
...
Allow go template to work properly with inspect …
2015-04-23 13:07:40 -07:00
052cba7278
Merge pull request #12674 from TomasTomecek/fix-v1-spec-typos
...
v1 spec: fix typos and formatting
2015-04-23 13:07:21 -07:00
036ade6c05
Merge pull request #12693 from runcom/fix-TestRenameStoppedContainer-race
...
Fix TestRenameStoppedContainer race
2015-04-23 13:04:36 -07:00
1492a7d7fd
Merge pull request #12702 from LK4D4/good_ol_flushed
...
Return weird behaviour of returning json errors
2015-04-23 13:03:29 -07:00
c4914f071f
Merge pull request #12577 from jfrazelle/actually-depreciate-rm
...
actually depreciate -rm insteam of --rm.. and a few others
2015-04-23 11:55:20 -07:00
9ed5bfb083
Merge pull request #12636 from duglin/MoveConfig
...
Move CLI config processing out from under registry dir
2015-04-23 11:50:31 -07:00
18f4688385
Validate repo name before image pull
...
Checks for reserved 'scratch' image name.
fixes #12281
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-04-23 11:44:46 -07:00
03e77e5c8f
Merge pull request #12690 from rajdeepd/dry-run-test
...
Container API Test with HostName
2015-04-23 11:32:47 -07:00
59acccb6f2
Merge pull request #12692 from cpuguy83/fix_commit_test
...
Fix race with TestContainerApiCommit
2015-04-23 11:31:27 -07:00
2c70288ca6
Merge pull request #12703 from LK4D4/carry_12596
...
remove job from image_export
2015-04-23 14:27:59 -04:00
231d362db7
Allow go template to work properly with inspect
...
Closes #11641
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-04-23 18:25:18 +00:00
d17f2baa81
Merge pull request #12646 from duglin/validateTests
...
Validate we're not using the old testing stuff
2015-04-23 11:23:20 -07:00
2345389975
Merge pull request #12687 from WeiZhang555/NotFound
...
refactor httpError() and add 404 "not found" mapping
2015-04-23 11:21:09 -07:00
dcbf89d023
Merge pull request #12500 from tianon/fix-daemon-logic
...
Fix daemon start/stop logic in hack/make/* scripts
2015-04-23 11:20:33 -07:00
b6569b6b82
contrib/init: unshare mount namespace for inits
...
* openrc
* sysvinit-debian
* upstart
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-04-23 14:08:37 -04:00
2a14b7dd35
remove job from image_export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-23 10:54:25 -07:00
929af4c38d
Fix daemon start/stop logic in hack/make/* scripts
...
From the Bash manual's `set -e` description:
(https://www.gnu.org/software/bash/manual/bashref.html#index-set )
> Exit immediately if a pipeline (see Pipelines), which may consist of a
> single simple command (see Simple Commands), a list (see Lists), or a
> compound command (see Compound Commands) returns a non-zero status.
> The shell does not exit if the command that fails is part of the
> command list immediately following a while or until keyword, part of
> the test in an if statement, part of any command executed in a && or
> || list except the command following the final && or ||, any command
> in a pipeline but the last, or if the command’s return status is being
> inverted with !. If a compound command other than a subshell returns a
> non-zero status because a command failed while -e was being ignored,
> the shell does not exit.
Additionally, further down:
> If a compound command or shell function executes in a context where -e
> is being ignored, none of the commands executed within the compound
> command or function body will be affected by the -e setting, even if
> -e is set and a command returns a failure status. If a compound
> command or shell function sets -e while executing in a context where
> -e is ignored, that setting will not have any effect until the
> compound command or the command containing the function call
> completes.
Thus, the only way to have our `.integration-daemon-stop` script
actually run appropriately to clean up our daemon on test/script failure
is to use `trap ... EXIT`, which we traditionally avoid because it does
not have any stacking capabilities, but in this case is a reasonable
compromise because it's going to be the only script using it (for now,
at least; we can evaluate more complex solutions in the future if they
actually become necessary).
The alternatives were much less reasonable. One is to have the entire
complex chains in any script wanting to use `.integration-daemon-start`
/ `.integration-daemon-stop` be chained together with `&&` in an `if`
block, which is untenable. The other I could think of was taking the
body of these scripts out into separate scripts, essentially meaning
we'd need two files for each of these, which further complicates the
maintenance.
Add to that the fact that our `trap ... EXIT` is scoped to the enclosing
subshell (`( ... )`) and we're in even more reasonable territory with
this pattern.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-04-23 11:31:16 -06:00
ecccfa82aa
Validate we're not using the old testing stuff
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-23 10:29:47 -07:00
ec51ba01db
Return weird behaviour of returning json errors
...
We need this, so client can get error from stream and not from status
code, which is already 200, because write to ResponseWriter was occured.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-23 10:27:37 -07:00
bb9da6ba92
Move CLI config processing out from under registry dir
...
No logic changes should be in here, just moving things around.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-23 10:18:38 -07:00
fa3e2dd45e
Merge pull request #12691 from runcom/remove-deleteAllContainers-call
...
Remove deleteAllContainers call in test
2015-04-23 10:01:08 -07:00
2351b87551
Merge pull request #12505 from ZJU-SEL/remove_job_from_push
...
remove job from push
2015-04-23 09:57:17 -07:00
71ac5b7903
Merge pull request #12681 from hqhq/hq_fix_test_in_apiserver
...
fix test case name
2015-04-23 09:21:00 -07:00
05013f1250
Move https integration tests as unit tests under client
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-04-23 15:40:46 +00:00
455d83939a
Merge pull request #12683 from tristan0x/patch-1
...
Fix typo in builder reference
2015-04-23 11:12:49 -04:00
ee7a7b07e7
Remove deleteAllContainers call in test
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-23 16:32:50 +02:00
cd6cc45d52
Fix TestRenameStoppedContainer race
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-23 16:11:46 +02:00
fca4aea077
TestCase added for Container Create with HostName
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
2015-04-23 06:53:34 -07:00
563708d78d
Fix race with TestContainerApiCommit
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-23 09:45:06 -04:00
d456401fe1
remove job from push
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-04-23 21:21:56 +08:00
1b4de6f2e8
Merge pull request #12579 from ZJU-SEL/remove_job_from_load
...
remove job from load
2015-04-23 08:20:37 -04:00
d59ce5cd48
Merge pull request #12663 from Mashimiao/Move-setHostConfig-to-daemon-file
...
Move setHostConfig to daemon file
2015-04-23 07:43:42 -04:00
f4cfaac519
Merge pull request #12680 from Mashimiao/fix-typo-push-test
...
push test: fix typo
2015-04-23 07:37:50 -04:00
ab42a3a23a
refactor httpError() and add 404 "not found" mapping
...
When docker pull a non-existent repo, daemon will report "image xxx not found"
with an error code 500, which should be 404.
This commit add 404 "not found" mapping and refactor httpError function.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-04-23 19:37:47 +08:00
70bb0d8ed7
remove job from load
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-04-23 19:13:12 +08:00
a8d2fbe7b4
fix test case name
...
Name like this will never run by go test. And this test case won't
get PAAS.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-23 18:41:30 +08:00
47263c6514
Fix typo in builder reference
...
Signed-off-by: Tristan Carel <tristan.carel@gmail.com >
2015-04-23 12:10:47 +02:00
62f91b1d34
push test: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-04-23 16:50:41 +08:00
1f7ba6f809
Fix the design proposal link in advanced contribution page
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-04-23 09:48:11 +02:00
d6c839cf0f
v1 spec: fix typos and formatting
...
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com >
2015-04-23 08:19:52 +02:00
fdc5aa2043
Merge pull request #12599 from RickWieman/10673-make-headings-consistent
...
Makes headings in documentation consistent
2015-04-23 16:15:10 +10:00
6359326761
Makes headings in documentation consistent
...
Fixes #10673 .
Signed-off-by: Rick Wieman <git@rickw.nl >
2015-04-23 07:41:30 +02:00
05418df539
sysinfo: add IPv4Forwarding check
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-04-23 12:19:46 +08:00
eae272f90e
Merge pull request #12390 from hqhq/hq_fix_inspect
...
fix inspect format result
2015-04-22 23:06:13 -04:00
dde0cc78bd
Move setHostConfig to daemon file
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-04-23 10:23:02 +08:00
6bacb4528e
Merge pull request #12582 from ankushagarwal/add-docker-history-integration-test
...
Add integration test for history option
2015-04-22 22:09:01 -04:00
60ad23a7b3
Merge pull request #12543 from vdemeester/11584-pkg-stdcopy-test-coverage
...
Add some stdcopy_test (coverage)
2015-04-22 22:03:15 -04:00
b0ef3194aa
fix inspect format result
...
Currently `docker inspect -f` use json.Unmarshal() unmarshal
to interface, it will store all JSON numbers in float64, so
we use `docker inspect 4f0d73b75a0d | grep Memory` and
`docker inspect -f {{.HostConfig.Memory}} 4f0d73b75a0d` will
get different values.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-23 09:28:07 +08:00
480d979c27
Merge pull request #12654 from jfrazelle/12135-docker-delete-multiple-tagged
...
add regression test for rmi multiple tags without f
2015-04-22 21:08:07 -04:00
3872272170
Merge pull request #12406 from runcom/remove-job-container-inspect
...
Remove job from container_inspect
2015-04-22 21:05:15 -04:00
cc43263f8c
Merge pull request #12652 from jfrazelle/update-contrib-docs-for-go-check
...
update contrib docs for gocheck
2015-04-22 17:47:22 -07:00
5ea8dc376c
Merge pull request #12649 from jlhawn/fix_pull_err_explosion
...
Correctly format API error on image pull
2015-04-22 20:28:24 -04:00
3dc07162bd
Merge pull request #12557 from rhatdan/journald
...
Add journald as a supported logger for containers
2015-04-22 17:20:10 -07:00
505788deb2
Merge pull request #10422 from cpuguy83/cleanup_daemon_volumes
...
Cleanup daemon/volumes
2015-04-22 17:13:47 -07:00
b6702116be
Merge pull request #12615 from moxiegirl/update-repository-links
...
Fixing a few links in registry
2015-04-23 10:02:02 +10:00
84a9962a63
Merge pull request #12614 from ankushagarwal/ubuntu-docs
...
Add Configuring Docker article
2015-04-23 09:41:11 +10:00
f3680e7494
Cleanup daemon/volumes
...
- Mount struct now called volumeMount
- Merged volume creation for each volume type (volumes-from, binds, normal
volumes) so this only happens in once place
- Simplified container copy of volumes (for when `docker cp` is a
volume)
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-22 19:32:10 -04:00
ce7e1a4d7e
Merge pull request #12586 from ankushagarwal/image-digests
...
Add Image Digest doc in userguide/dockerimages
2015-04-23 09:23:23 +10:00
1d48cccc99
Merge pull request #10992 from cpuguy83/add_volume_mounting_for_cp
...
Make `docker cp` bind-mount volumes
2015-04-22 15:59:28 -07:00
b2aca01d95
Merge pull request #12513 from allingeek/patch-1
...
builder.md - Changes to bring LABEL docs in line with 1.6 release.
2015-04-23 08:58:59 +10:00
4b9fe9c298
Remove job from container_inspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-23 00:58:13 +02:00
20b1aa08f8
Merge pull request #12460 from moxiegirl/fix-carry-12383
...
Putting into our new format for cloud
2015-04-23 08:52:56 +10:00
3c9ae03a86
Merge pull request #12650 from LK4D4/carry_12472
...
remove execCreate & execStart from job
2015-04-22 15:32:14 -07:00
7708ab5ce2
Merge pull request #12657 from dqminh/remove-unused-utils
...
remove unused utils
2015-04-22 15:23:57 -07:00
71b5a754ce
remove unused utils
...
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
2015-04-22 21:53:45 +00:00
b88b2fa72e
Merge branch 'master' of github.com:docker/docker into journald
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-04-22 17:37:26 -04:00
28f5541b72
add regression test for rmi multiple tags without f
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-04-22 14:23:05 -07:00
7a525c6cb7
add integration test for error pull nonexistent
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-04-22 14:11:25 -07:00
fd4f7c4e5c
Correctly format API error on image pull
...
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-04-22 14:11:25 -07:00
29265448ec
Merge pull request #12621 from LK4D4/test_push_interrupt_daemon
...
Run TestPushInterrupt on separate daemon
2015-04-22 14:05:37 -07:00
24425021d2
remove execCreate & execStart from job
...
Also removed the function ExecConfigFromJob
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-22 13:51:57 -07:00
c09765ac43
Wait until all pushes are done in TestPushInterrupt
...
Background pushes affects other tests
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-22 13:36:43 -07:00
a09ab40f0d
update contrib docs for gocheck
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-04-22 13:19:14 -07:00
975e668722
Merge pull request #12588 from hqhq/hq_fix_cpuquota_warn
...
remove redundant warning
2015-04-22 13:07:21 -07:00
08150150bb
Add integration test for history option
...
Parse the history output to locate the size fields and check
whether they are the correct format or not. Use Column name SIZE
to mark start and end indices of the size fields
Fixes #12578
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-04-22 12:22:01 -07:00
e3e1c2be42
Merge pull request #12376 from Mic92/refactor-hack
...
Refactor shellscripts
2015-04-22 12:12:44 -07:00
6f94ca6d8b
Merge pull request #12647 from duglin/FixTesting
...
Remove old testing stuff that slipped into master
2015-04-22 14:47:37 -04:00
b4988d8d75
Remove old testing stuff that slipped into master
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-22 11:44:54 -07:00
901ae9aaea
Merge pull request #12623 from peggyl/api-client-docs
...
Fix golint errors in docker/api/client
2015-04-22 14:09:23 -04:00
5728426f27
Merge pull request #12637 from sublimino/patch-1
...
Add kali to install script
2015-04-22 11:05:13 -07:00
fd3b722928
Merge pull request #12634 from PeterDaveHello/patch-2
...
Use svg instead of png to get better image quality
2015-04-22 10:53:47 -07:00
9689aab5ec
Update with @moxiegirl's patch and add direct config
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-04-22 10:36:38 -07:00
eeb8ceb9ed
Fix TestEventsImageImport racy, fixes #12499
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-22 17:30:30 +02:00
2dd88af79b
Add kali to install script
...
https://www.kali.org/ is a Debian derivative. This script completes
succesfully using the Debian install path
Signed-off-by: Andrew Martin <sublimino@gmail.com >
2015-04-22 14:56:00 +01:00
b121d94369
Use svg instead of png to get better image quality
...
Signed-off-by: Peter Dave Hello <hsu@peterdavehello.org >
2015-04-22 18:45:29 +08:00
58065d0dd9
Fix golint errors in docker/api/client
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
2015-04-22 00:14:23 -07:00
90a8e45604
Append icc related iptables rules, not INSERT
...
Signed-off-by: Gosuke Miyashita <gosukenator@gmail.com >
2015-04-22 11:45:46 +09:00
54ff1dcb82
Fixing a few links in registry
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-21 18:36:37 -07:00
9424fc14bb
Add Configuring Docker article [WIP]
...
Fixes #12088
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-04-21 17:49:29 -07:00
f3dc351697
remove redundant warning
...
And warning is not supposed to have a prefix WARNING.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-22 08:15:00 +08:00
ccbb93e1cd
Merge pull request #12611 from LK4D4/remove_eng_chain_pull
...
Remove chain of engine passing from builder to loadManifest
2015-04-21 19:19:56 -04:00
61854b171d
Merge pull request #12511 from LK4D4/gocheck_suites
...
Gocheck suites
2015-04-21 15:42:33 -07:00
ddc8acebec
devmapper: Cancel deferred deactivation if device is reactivated
...
If device is being reactivated before it could go away and deferred
deactivation is scheduled on it, cancel it.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-21 18:14:59 -04:00
4986ce7cfb
devicemapper: Create a method to get device info with deferred remove field
...
Deferred reove functionality was added to library later. So in old version
of library it did not report deferred_remove field.
Create a new function which also gets deferred_remove field and it will be
called only on newer version of library.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-21 18:14:59 -04:00
20b38f427a
devicemapper: Create helpers to cancel deferred deactivation
...
If a device has been scheduled for deferred deactivation and container
is started again and we need to activate device again, we need to cancel
the deferred deactivation which is already scheduled on the device.
Create a method for the same.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-21 18:14:59 -04:00
66a53819ae
devmapper: Export deferred removal status in status
...
This will help with debugging as one could just do "docker info" and figure
out of deferred removal is enabled or not.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-21 18:14:59 -04:00
e37c7203bb
devmapper: Use deferred removal
...
Make use of deferred removal of devices.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-21 18:14:59 -04:00
15c158b207
devmapper: Provide a new parameter dm.deferred_device_removal
...
Provide a new command line knob dm.deferred_device_removal which will enable
deferred device deactivation if driver and library support it.
This patch also checks for library support and driver version.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-21 18:14:59 -04:00
6964ab94be
devicemapper: Add helper functions to allow deferred device removal
...
A lot of time device mapper devices leak across mount namespace which docker
does not know about and when docker tries to deactivate/delete device,
operation fails as device is open in some mount namespace.
Create a mechanism where one can defer the device deactivation/deletion
so that docker operation does not fail and device automatically goes
away when last reference to it is dropped.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-21 18:14:59 -04:00
b3e29926ce
make.sh: Define a new build tag libdm_no_deferred_remove
...
libdm started offering deferred remove functionality from version
1.02.89. As docker still builds against older libdm, define a tag
libdm_no_deferred_remove to determine whether we are compiling
against new libdm or older one and enable/disable deferred remove
functionality accordingly.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-21 18:14:59 -04:00
a2f74aa4b4
Remove chain of engine passing from builder to loadManifest
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-21 14:55:23 -07:00
bc7a43cb44
Putting into our new format for cloud
...
Adding in Seb's comments
Updating with Fred's comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-21 14:48:48 -07:00
21c8d211e1
Merge pull request #12536 from mountkin/remove-unsupported-instructions-from-doc
...
Remove some unsupported instructions in the docs.
2015-04-21 14:08:31 -07:00
7ba8c3b26f
Merge pull request #12567 from brahmaroutu/integration_test6_12255
...
moving integration tests to graph unit tests
2015-04-21 13:58:02 -07:00
725ea8c09e
Merge pull request #12600 from LK4D4/remove_image_set
...
Remove image_set engine job
2015-04-21 16:51:46 -04:00
b098a42559
Merge pull request #12564 from LK4D4/remove_jobs_trust
...
Remove engine from trust
2015-04-21 16:49:01 -04:00
783dbcade3
Merge pull request #12609 from runcom/remove-not-needed-readHostConfig
...
Remove not needed call to container.readHostConfig()
2015-04-21 13:45:48 -07:00
79a7fedcd8
Remove image_set engine job
...
It was unused
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-21 13:04:28 -07:00
a3c4801c92
Remove not needed call to container.readHostConfig()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-21 22:00:33 +02:00
a4676503d9
Add Image Digest doc in userguide/dockerimages
...
Fixes #12551
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-04-21 12:47:09 -07:00
b807ac1115
Merge pull request #12601 from runcom/remove-job-image-get
...
Remove job image_get
2015-04-21 15:31:42 -04:00
d07fe18365
Remove job image_get
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-21 21:01:09 +02:00
6f82613ded
Merge pull request #12604 from runcom/remove-job-image-tarlayer
...
Remove job image_tarlayer
2015-04-21 14:53:54 -04:00
ba0017595e
Remove job image_tarlayer
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-21 19:59:45 +02:00
dc944ea7e4
Use suite for integration-cli
...
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-21 10:28:52 -07:00
6dcdf832a3
Add gocheck to vendored deps
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-21 10:28:52 -07:00
364287b741
Add journald as a supported logger for containers
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-04-21 12:57:54 -04:00
371b39c26f
Merge pull request #12598 from runcom/remove-writeJSONEnv
...
Remove writeJSONEnv, fixes #12597
2015-04-21 09:54:55 -07:00
27811355bd
Remove writeJSONEnv
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-21 18:14:39 +02:00
afd5636461
Merge pull request #12563 from kentoj/patch-1
...
Clarify data volume init with existing data
2015-04-21 08:57:22 -07:00
f731b01483
Dockerfile: download go libraries before copy vendor
...
When ever something vendor/ changes the go dependencies have to downloaded again,
which requires internet access and there for is potential slow. COPY and go install is much faster, while the git urls does not change not this often.
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-04-21 11:41:09 +02:00
17d5450bc3
Merge pull request #10736 from coolljt0725/add_cpu_limit
...
Add support cpu cfs_quota
2015-04-20 17:55:01 -07:00
e562495d56
Merge pull request #12181 from inatatsu/enable-netgo-with-gccgo
...
Enable "netgo" library when we build with gccgo
2015-04-20 17:31:49 -07:00
47b703593e
Merge pull request #12430 from icecrime/11551_carry
...
Add -H|--human command-line flag to `docker history`
2015-04-20 17:28:24 -07:00
82f75df9e9
Merge pull request #12457 from calavera/remove_engine_job_builder
...
Remove engine.Job from Builder.
2015-04-20 17:27:17 -07:00
874d64e690
Merge pull request #12517 from mavenugo/master
...
Enhanced port integration-cli tests
2015-04-20 17:26:48 -07:00
4bb8924b52
Merge pull request #12539 from WeiZhang555/httpError
...
change httpError logic
2015-04-20 17:26:09 -07:00
f3d4c33213
actually depreciate -rm, -sig-proxy, -name, seriously its been forever
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-04-20 17:20:23 -07:00
4a25c5d25b
Merge pull request #12533 from ankushagarwal/gofmt-directory
...
gofmt 1.4.2 src directory
2015-04-20 17:02:43 -07:00
e1fd7e25de
Merge pull request #12566 from fntlnz/remove-go1.3.3-support
...
Removed go1.3.3 support
2015-04-20 17:01:57 -07:00
df217120cd
Merge pull request #12471 from coolljt0725/fix_weird_output_format
...
Fix weird terminal output format
2015-04-20 17:01:02 -07:00
fcacb1793e
Merge pull request #12568 from duglin/TweakConfigPerms
...
Make .docker dir have 0700 perms not 0600
2015-04-20 16:33:10 -07:00
23ec4cab60
Merge pull request #12556 from icecrime/update_release_checklist
...
Update release checklist
2015-04-20 16:31:40 -07:00
a8253ec7e7
Early API version bump
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-20 15:52:26 -07:00
9838242db1
Merge pull request #9381 from lebauce/default-gateway
...
Proposal: Allow specifying a default gateway for bridge networking
2015-04-20 15:50:35 -07:00
d5dc565432
Merge pull request #12416 from ya7ya/patch-1
...
adding elementary OS to install script
2015-04-20 14:50:16 -07:00
435643545c
Merge pull request #12450 from brahmaroutu/integration_test3_12255
...
Port test from integration tests - test low memory on create
2015-04-20 17:27:17 -04:00
3b05005a12
Add flusher check to utils.WriteFlusher.
...
That way we can know when the stream has been flushed.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-20 14:25:45 -07:00
27fc39fdc0
Merge pull request #12559 from moxiegirl/fix-12555-rnotes
...
Adding in 1.60 release notes
2015-04-20 14:18:48 -07:00
bfeb98a236
Make .docker dir have 0700 perms not 0600
...
Thanks to @dmcgowan for noticing.
Added a testcase to make sure Save() can create the dir and then
read from it.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-20 14:16:50 -07:00
92849fdcce
Removed go1.3.3 support
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
2015-04-20 23:09:08 +02:00
29c5596176
moving integration tests to graph unit tests
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-04-20 21:08:45 +00:00
2ed4ed50be
Add some stdcopy_test (coverage)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-04-20 22:58:22 +02:00
ae4063585e
Remove engine.Job from builder.CmdBuildConfig.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-20 13:37:06 -07:00
9a2c009751
Remove engine.Job references from builder.CmdBuild
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-20 13:37:04 -07:00
1f4ef5192c
Adding in 1.60 release notes
...
Updating with thaJetzah's comments
Adding in Fred's copy edits
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-20 13:31:22 -07:00
ff9f0134ae
Clarify data volume init with existing data
...
Though I am not clear on the intent of the sentence if it means that existing data in the base image is copied into the new volume then the additions I propose make that more clear than the present language.
Signed-off-by: Kent Johnson <kentoj@gmail.com >
2015-04-20 14:24:40 -06:00
f85eb4baad
Merge pull request #12414 from draghuram/projectdoc
...
Improve documentation in "project" directory.
2015-04-20 13:16:20 -07:00
08ef006d17
Merge pull request #12009 from duglin/AddConfig
...
Migrate .dockercfg to .docker/config.json and support for HTTP Headers
2015-04-20 13:12:17 -07:00
18c9b6c645
Add .docker/config.json and support for HTTP Headers
...
This PR does the following:
- migrated ~/.dockerfg to ~/.docker/config.json. The data is migrated
but the old file remains in case its needed
- moves the auth json in that fie into an "auth" property so we can add new
top-level properties w/o messing with the auth stuff
- adds support for an HttpHeaders property in ~/.docker/config.json
which adds these http headers to all msgs from the cli
In a follow-on PR I'll move the config file process out from under
"registry" since it not specific to that any more. I didn't do it here
because I wanted the diff to be smaller so people can make sure I didn't
break/miss any auth code during my edits.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-20 13:05:24 -07:00
cfe7c9c1b2
Merge pull request #12561 from sergeyevstifeev/12549-fix-test-requires-network
...
Add missing testRequires(t, Network)
2015-04-20 12:58:30 -07:00
9e50bf6270
Remove engine from trust
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-20 12:48:33 -07:00
716e21be2b
Add missing testRequires(t, Network)
...
Fixes #12552
Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com >
2015-04-20 21:19:50 +02:00
a7690076c9
Merge pull request #12453 from runcom/style-minor-fixes
...
Add minor stylistic fixes
2015-04-20 11:51:04 -07:00
490a0bd697
Merge pull request #12545 from coolljt0725/remove_rudundant_enter
...
Remove redundant `\n` in daemon/daemon.go
2015-04-20 14:32:27 -04:00
53edce79f1
Merge pull request #12554 from buddhamagnet/12553-cli-doc-correction
...
12553 fix typo
2015-04-20 14:30:51 -04:00
f0016c5917
Merge pull request #12495 from LK4D4/apiserver_refactoring
...
Refactoring of api/server for reduce engine usage
2015-04-20 14:10:34 -04:00
1a35b16b08
Port test from integration tests
...
Addresses #12255
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-04-20 17:57:53 +00:00
cdd5d5e4c3
fix typo
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com >
2015-04-20 18:56:21 +01:00
fcdb1fbfa1
Improve documentation in "project" directory.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-04-20 13:08:13 -04:00
da7bca4496
Make all http handlers api.server.Server methods
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-20 09:45:31 -07:00
66239ab5c9
change httpError logic
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Signed-off-by: Zhang Wei <zhangwei198900@gmail.com >
2015-04-20 23:26:56 +08:00
dcc50e1d59
Add support cpu cfs quota
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-20 08:16:47 -07:00
d9ed316522
Make API server datastructure
...
Added daemon field to it, will use it later for acces to daemon from
handlers
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-20 08:13:39 -07:00
181fea24aa
Make daemon initialization in main goroutine
...
It is simplifies code and lead to next refactoring step, where daemon
will be incorporated to some structure which represents API.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-20 08:13:39 -07:00
b5584ec24a
Merge pull request #12537 from hqhq/hq_remove_unused_function
...
remove unused function in server_unit_test.go
2015-04-20 07:51:53 -07:00
d2ce1076a4
Merge pull request #12534 from Mashimiao/delete-unused-function-from-drive
...
clenaup: delete unused function getEnv
2015-04-20 07:50:06 -07:00
2d5ede67c0
Remove redundant '\n' in daemon.go and correct the warning messages for memory swap
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-20 22:00:03 +08:00
acb6127c1a
Allow specifying a default gateway for bridge networking
...
Signed-off-by: Sylvain Baubeau <sbaubeau@redhat.com >
2015-04-20 15:13:30 +02:00
dacc0507f0
Merge pull request #12266 from HuKeping/rmjob-info
...
Remove Job from Info API
2015-04-20 07:10:57 -04:00
379773905c
Firewalld tests
...
Signed-off-by: Jiri Popelka <jpopelka@redhat.com >
2015-04-20 13:02:09 +02:00
b052827e02
React to firewalld's reload/restart
...
When firewalld (or iptables service) restarts/reloads,
all previously added docker firewall rules are flushed.
With firewalld we can react to its Reloaded() [1]
D-Bus signal and recreate the firewall rules.
Also when firewalld gets restarted (stopped & started)
we can catch the NameOwnerChanged signal [2].
To specify which signals we want to react to we use AddMatch [3].
Libvirt has been doing this for quite a long time now.
Docker changes firewall rules on basically 3 places.
1) daemon/networkdriver/portmapper/mapper.go - port mappings
Portmapper fortunatelly keeps list of mapped ports,
so we can easily recreate firewall rules on firewalld restart/reload
New ReMapAll() function does that
2) daemon/networkdriver/bridge/driver.go
When setting a bridge, basic firewall rules are created.
This is done at once during start, it's parametrized and nowhere
tracked so how can one know what and how to set it again when
there's been firewalld restart/reload ?
The only solution that came to my mind is using of closures [4],
i.e. I keep list of references to closures (anonymous functions
together with a referencing environment) and when there's firewalld
restart/reload I re-call them in the same order.
3) links/links.go - linking containers
Link is added in Enable() and removed in Disable().
In Enable() we add a callback function, which creates the link,
that's OK so far.
It'd be ideal if we could remove the same function from
the list in Disable(). Unfortunatelly that's not possible AFAICT,
because we don't know the reference to that function
at that moment, so we can only add a reference to function,
which removes the link. That means that after creating and
removing a link there are 2 functions in the list,
one adding and one removing the link and after
firewalld restart/reload both are called.
It works, but it's far from ideal.
[1] https://jpopelka.fedorapeople.org/firewalld/doc/firewalld.dbus.html#FirewallD1.Signals.Reloaded
[2] http://dbus.freedesktop.org/doc/dbus-specification.html#bus-messages-name-owner-changed
[3] http://dbus.freedesktop.org/doc/dbus-specification.html#message-bus-routing-match-rules
[4] https://en.wikipedia.org/wiki/Closure_%28computer_programming%29
Signed-off-by: Jiri Popelka <jpopelka@redhat.com >
2015-04-20 13:02:09 +02:00
8301dcc6d7
Support for Firewalld
...
Firewalld [1] is a firewall managing daemon with D-Bus interface.
What sort of problem are we trying to solve with this ?
Firewalld internally also executes iptables/ip6tables to change firewall settings.
It might happen on systems where both docker and firewalld are running
concurrently, that both of them try to call iptables at the same time.
The result is that the second one fails because the first one is holding a xtables lock.
One workaround is to use --wait/-w option in both
docker & firewalld when calling iptables.
It's already been done in both upstreams:
https://github.com/docker/docker/commit/b315c380f4acd65cc0428009702f99a266f96c59
https://github.com/t-woerner/firewalld/commit/b3b451d6f8946986b8f50c8bcddeef50ed7a5f8f
But it'd still be better if docker used firewalld when it's running.
Other problem the firewalld support would solve is that
iptables/firewalld service's restart flushes all firewall rules
previously added by docker.
See next patch for possible solution.
This patch utilizes firewalld's D-Bus interface.
If firewalld is running, we call direct.passthrough() [2] method instead
of executing iptables directly.
direct.passthrough() takes the same arguments as iptables tool itself
and passes them through to iptables tool.
It might be better to use other methods, like direct.addChain and
direct.addRule [3] so it'd be more intergrated with firewalld, but
that'd make the patch much bigger.
If firewalld is not running, everything works as before.
[1] http://www.firewalld.org/
[2] https://jpopelka.fedorapeople.org/firewalld/doc/firewalld.dbus.html#FirewallD1.direct.Methods.passthrough
[3] https://jpopelka.fedorapeople.org/firewalld/doc/firewalld.dbus.html#FirewallD1.direct.Methods.addChain
https://jpopelka.fedorapeople.org/firewalld/doc/firewalld.dbus.html#FirewallD1.direct.Methods.addRule
Signed-off-by: Jiri Popelka <jpopelka@redhat.com >
2015-04-20 13:02:03 +02:00
f4942ed864
Remove Job from Info API
...
Two main things
- Create a real struct Info for all of the data with the proper types
- Add test for REST API get info
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-20 18:14:06 +08:00
49be84842e
Remove some unsupported instructions in the docs.
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-04-20 16:48:17 +08:00
e607bb49c4
clenaup: delete unused function getEnv
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-04-20 16:32:42 +08:00
641a7ec9ad
remove unused function in server_unit_test.go
...
After engine refactor, some functions are no longer used.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-20 16:27:47 +08:00
edf541c22b
gofmt whole directory
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-04-20 01:08:51 -07:00
b7950b725b
Merge pull request #12524 from RickWieman/12523-remove-redundant-else
...
Removes redundant else in registry/session.go
2015-04-19 22:08:50 -07:00
5f2b051ec5
Removes redundant else in registry/session.go
...
Fixes #12523
Signed-off-by: Rick Wieman <git@rickw.nl >
2015-04-19 23:58:55 +02:00
24b89b7098
Merge pull request #12521 from runcom/else-nit
...
Refactor else branches
2015-04-19 16:36:39 -04:00
b1d8ae3824
Merge pull request #12358 from ZJU-SEL/remove_job_from_tag
...
remove job from tag
2015-04-19 16:02:28 -04:00
2e58350bd6
Merge pull request #12518 from moxiegirl/fix-12516-registry-doc
...
Docker Registry Server > Docker Registry
2015-04-19 07:14:09 -07:00
547ded5df7
Merge pull request #12512 from ankushagarwal/document-binaries
...
Document the download location of Linux, Windows and Mac OS X binaries
2015-04-19 07:12:45 -07:00
8655214b3d
Refactor else branches
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-19 15:32:54 +02:00
448a1a7139
Enhanced port integration-cli tests
...
THe port tests in integration-cli tests just for the port-mapping as
seen by Docker daemon. But it doesn't perform a more indepth testing by
checking for the exposed port on the host.
This change helps to fill that gap.
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-04-19 06:15:23 -07:00
89092252f0
Merge pull request #12432 from Mashimiao/optimize-code-to-clarify-loagic
...
change code to clarify logic
2015-04-19 07:39:24 -04:00
99f6309b97
remove job from tag
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
2015-04-19 18:36:56 +08:00
99251f60c2
Document the download location of binaries
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-04-19 01:51:03 -07:00
7b2b7df386
Docker Registry Server > Docker Registry
...
Fixing registry index
Tested on beta and this redirect works
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-18 19:19:48 -07:00
89df65be5d
Update builder.md
...
Single value labels do not work in 1.6 and multi-label instructions only work when separated by non-EOL whitespace.
I also added an example snip from the inspect output with the labels that are included in this guide.
Signed-off-by: Jeff Nickoloff <jeff@allingeek.com >
2015-04-18 11:38:20 -07:00
2bc3fb5149
Merge pull request #12508 from Mic92/docs-speedup
...
docs: speed up build by reducing build steps
2015-04-18 10:41:31 -07:00
bbe6df1288
docs: speed up build by reducing build steps
...
- should be also easier to maintain
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-04-18 13:28:52 +02:00
c158cdbe6f
Merge pull request #12438 from ourcolorfuldays/fixtypo
...
fix some typos
2015-04-18 07:17:55 -04:00
5fd378c0d1
Merge pull request #12466 from robertabbott/fix_dockerCmd
...
Removed unnecessary error output from dockerCmd
2015-04-17 15:15:34 -07:00
a313b729e4
Merge pull request #12496 from moxiegirl/post-release-updates
...
Updates to Compose docs and ENV vars
2015-04-17 13:43:06 -07:00
3a88367241
Updates to Compose docs and ENV vars
...
- Compose teamhad forgotten some documentation
- Updated ENV for Distribution also
- Forgot one of the readability sections
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-17 13:08:57 -07:00
055c6dbaef
Merge pull request #12490 from LK4D4/carry_12396
...
remove job from pull and import
2015-04-17 15:26:30 -04:00
9922122fd4
Merge pull request #12493 from kostickm/12491-update-message-graphdriver
...
Updated message severity in graphdriver
2015-04-17 14:53:45 -04:00
cdc63ce5d0
Updated message severity in graphdriver
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-17 10:56:12 -07:00
d12a2d8aeb
Merge pull request #12476 from pwaller/small-cl-improvement
...
Improve build cancelation description in CHANGELOG
2015-04-17 10:34:08 -07:00
4492977437
Merge pull request #12484 from superseb/12367-jessie-instructions
...
Added Debian 8 note for adding backports
2015-04-17 10:16:53 -07:00
ced638094f
Merge pull request #12470 from zembutsu/patch-1
...
fix typo
2015-04-17 09:55:56 -07:00
6e38a53f96
remove job from pull and import
...
Closes #12396
Signed-off-by: Simei He <hesimei@zju.edu.cn >
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-17 09:55:02 -07:00
d845932a52
Merge pull request #12486 from runcom/bye-builtins
...
Remove builtins
2015-04-17 09:52:43 -07:00
621b601b3c
Removed unnecessary error output from dockerCmd
...
Changed method declaration. Fixed all calls to dockerCmd
method to reflect the change.
resolves #12355
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
2015-04-17 09:11:14 -07:00
37b9ce61ac
Added Debian 8 note for adding backports
...
Signed-off-by: Sebastiaan van Steenis <mail@superseb.nl >
2015-04-17 16:32:28 +02:00
ddc842ca2a
Merge pull request #12436 from hqhq/hq_fix_inspect_doc
...
update docker-inspect man page
2015-04-17 06:57:12 -07:00
a0bf80fe03
Remove builtins
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-17 14:27:38 +02:00
609fa93aa2
Improve build cancelation description in CHANGELOG
...
The existing text didn't explain what had changed.
(See #9774 )
Signed-off-by: Peter Waller <p@pwaller.net >
2015-04-17 09:44:12 +01:00
70f1910a8b
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com >
2015-04-17 08:12:13 +00:00
05a8de4685
Fix weird terminal output format
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-17 15:28:12 +08:00
3cdf94ed1a
fix typo
...
Is this typo?
Signed-off-by: Masahito Zembutsu <m.zembutsu@gmail.com >
2015-04-17 16:06:54 +09:00
5e40de9286
Merge pull request #12468 from icecrime/disable_test_pull_verified
...
Skip TestPullVerified
2015-04-17 02:31:01 -04:00
d47f3707c5
Merge pull request #12465 from HuKeping/log-level
...
Change log severity for non-tlsverify bind
2015-04-17 02:10:47 -04:00
b052f7a87c
Change log severity for non-tlsverify bind
...
closes #12459
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-17 21:27:58 +08:00
9a4fa9c191
Skip TestPullVerified
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-16 23:05:47 -07:00
5207b3eb2b
Merge pull request #12446 from icecrime/please_go_away_testexp.tar
...
Always remove testexp.tar test file
2015-04-17 01:58:29 -04:00
4e356ee410
Improve export/import tests cleanup
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-16 22:10:55 -07:00
01548ed1dc
update docker-inspect man page
...
- sort inspect out
- update output fields
- format output
- add doc about go template
- other minor fix
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-17 09:25:06 +08:00
24af878358
Merge pull request #12455 from bfirsh/remove-registry-redirect
...
Remove registry redirect
2015-04-16 17:55:02 -07:00
b57830aee4
adding elementary OS to install script
...
It's basically just an Ubuntu, I'm a total noob but I've tried it on elementary OS "Freya" and it worked
Signed-off-by: M Yahya <ya7yaz@gmail.com >
2015-04-17 02:02:22 +02:00
b8530c6c5e
Merge pull request #12383 from jdivock/patch-1
2015-04-16 14:45:36 -07:00
2ba1244ad2
Merge pull request #12452 from moxiegirl/release-versions-set
...
Updating with final version from Stephen
2015-04-16 14:31:45 -07:00
96b5a3f562
Merge pull request #12411 from sbasyal/patch-2
...
The link to issue 407 was broken
2015-04-16 13:32:02 -07:00
4325cbb47c
Merge pull request #12454 from jfrazelle/bump_version
...
Bump version
2015-04-16 16:27:34 -04:00
e79c77fb8d
bump version to 1.6.0-dev
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-04-16 12:56:02 -07:00
4c6d5e3a25
Remove registry redirect
...
... it was causing an infinite redirect.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2015-04-16 12:54:56 -07:00
99d0413033
Bump version to v1.6.0
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
(cherry picked from commit 47496519da
2015-04-16 12:45:02 -07:00
1c89c6ea2f
Add minor stylistic fixes
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-16 21:22:32 +02:00
cb0644a196
Merge pull request #12428 from icecrime/1163_carry
...
Added documentation for functions
2015-04-16 11:43:29 -07:00
b4b21ff0a6
Updating with final version from Stephen
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-16 11:40:36 -07:00
27edbd2868
Merge pull request #12407 from cpuguy83/move_integration_api_tests
...
Move some integration api tests
2015-04-16 11:40:29 -07:00
dfa5feab2f
Merge pull request #12451 from moxiegirl/release-versions-set
...
doc fixes for 1.6
2015-04-16 11:35:46 -07:00
f44aa3b1fb
for 1.6
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-16 11:33:49 -07:00
308a23021d
Move TestPostCreateNull to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-16 13:49:46 -04:00
5dc02a2fa8
Move TestPostJsonVerify to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-16 13:49:28 -04:00
23fa7d41d5
Move TestContainerApiCreate to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-16 13:49:10 -04:00
f19061ccfd
Move TestPostCommit to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-16 13:48:54 -04:00
d9e4b14346
Move TestGetContainersTop to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-16 13:48:33 -04:00
6f5b895bc7
Move SaveAndThenload to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-16 13:40:49 -04:00
8232cc777e
Make sockRequestRaw return reader, not []byte
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-16 13:40:49 -04:00
5224151da9
Merge pull request #12350 from runcom/remove-job-restart
...
Remove job from restart
2015-04-16 10:27:43 -07:00
e41192a3f8
Remove job from restart
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-16 18:50:24 +02:00
ae5cf30c7c
Add -H|--human flag to docker history
...
Add a flag to print sizes and dates in human readable format.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-16 08:38:18 -07:00
dcff07d03d
Adding a verbose time option to output formatted timestamps
...
Fixes #11413
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com >
2015-04-16 08:34:50 -07:00
17ef617c77
Merge pull request #12431 from YanFeng-Adam/typo
...
Fix a typo in docker/daemon/state.go
2015-04-16 09:52:40 -04:00
7e01ecc119
Fix a typo in docker/daemon/state.go
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-04-16 10:56:15 -04:00
93cdb0071b
optimize code to clarify logic
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-04-16 19:56:25 +08:00
73bf9b5c19
add err check before getting term
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-04-16 17:46:32 +08:00
1899b2f41a
Merge pull request #12423 from crosbymichael/idkbutitworks
...
Ensure state is destroyed on daemont restart
2015-04-15 21:19:38 -07:00
dc104ccb40
added documentation for functions
...
Signed-off-by: Jason Smith <jasonrichardsmith@gmail.com >
2015-04-15 19:28:01 -07:00
ad5d655fb2
Merge pull request #12426 from moxiegirl/new-registry-menu
...
In with the old menu layout
2015-04-16 12:22:49 +10:00
fe8fb24b53
In with the old menu layout
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-15 19:02:01 -07:00
de923f59b3
Merge pull request #12253 from calavera/remove_job_from_start_and_create
...
Remove engine.Job from Start and Create
2015-04-15 21:49:25 -04:00
a5f7c4aa31
Ensure state is destroyed on daemont restart
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-04-15 17:44:03 -07:00
83d809f3d2
Merge pull request #12388 from xiaods/issue-12373
...
client.StatusError don't be returned as a pointer
2015-04-15 17:34:38 -07:00
d1855c6cc0
What if authConfig or factory is Null?
...
Signed-off-by: Steven Taylor <steven.taylor@me.com >
2015-04-15 15:35:18 -07:00
2e4d36ed80
Merge pull request #12391 from ibuildthecloud/syslog-format
...
Change syslog format and facility
2015-04-15 14:47:12 -07:00
6860c75b7b
The link to issue 407 was broken
...
The link to issue 407 was broken. The old link was: https://github.com/docker/docker/issues/407%20kernel%20versions
The link must be: https://github.com/docker/docker/issues/407
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com >
2015-04-15 14:06:11 -07:00
0c7b51089c
Merge pull request #12412 from runcom/12410-fix-TestInitializeCannotStatPathFileNameTooLong
...
Fix TestInitializeCannotStatPathFileNameTooLong
2015-04-15 16:11:29 -04:00
05641ccffc
Change syslog format and facility
...
This patch changes two things
1. Set facility to LOG_DAEMON
2. Remove ": " from tag so that the tag + pid become a single column in
the log
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-04-15 12:46:43 -07:00
7afb234741
Fix TestInitializeCannotStatPathFileNameTooLong
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-15 21:15:05 +02:00
5b048ab2f2
Merge pull request #12369 from runcom/fix-links-graph-ref
...
Fix wrong graphdb refs paths purging
2015-04-15 11:34:58 -07:00
f0c60f7085
Merge pull request #12387 from x1022as/inspect-logpath
...
Inspect show right LogPath in json-file driver
2015-04-15 14:28:39 -04:00
2499baefdd
Merge pull request #12399 from emirozer/master
...
closes #8945
2015-04-15 10:53:10 -07:00
2ecccda162
Merge pull request #12139 from hqhq/hq_add_cpusest_mems2
...
add support for cpuset.mems
2015-04-15 13:29:43 -04:00
bae3023eef
client.StatusError don't be returned as a pointer
...
closes #12373
1. remove & from client.StatusError
2. remove * from Error method
Signed-off-by: Deshi Xiao <xiaods@gmail.com >
2015-04-16 01:27:07 +08:00
767df67e31
Decode container configurations into typed structures.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-15 10:22:07 -07:00
ec4b0b1e27
Merge pull request #12382 from jfrazelle/modprobe-all-the-things-modules-for-the-modules-god
...
try to modprobe bridge
2015-04-15 08:45:00 -07:00
b3867b8899
try to modprobe bridge
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
2015-04-15 07:19:37 -07:00
960de9c8dd
closes #8945
...
Signed-off-by: Emir Ozer <emirozer@yandex.com >
2015-04-15 15:31:23 +02:00
6533cb973f
hack/make/test-integration-cli: introduce MAKEDIR variable
...
- every execution of dirname costs time
- less repeating
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-04-15 10:44:14 +02:00
4d53a19528
hack: useless use of cat
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-04-15 10:14:14 +02:00
ac20568b0a
hack: quote all parameters with variable interpolation
...
better safe then sorry. especially for rm
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-04-15 10:14:14 +02:00
23afce5f7f
hack/make.sh: use SCRIPTDIR wherever possible
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-04-15 10:14:14 +02:00
6f812a4ec1
hack/make.sh: use bash internal $PWD
...
Signed-off-by: Jörg Thalheim <joerg@higgsboson.tk >
2015-04-15 10:14:14 +02:00
acf025ad1b
Inspect show right LogPath in json-file driver
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
2015-04-15 11:51:24 +08:00
f8dc7e8754
Add cpuset-mems support for docker build
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-15 09:34:12 +08:00
8077b2fb80
add support for cpuset.mems
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-15 09:33:46 +08:00
da697dbed6
Merge pull request #12360 from yestin/11601-supplement-tests-part-2
...
Improve test accuracy for pkg/chrootarchive (part 2)
2015-04-14 21:00:12 -04:00
3a3ab0e4e7
Merge pull request #12384 from calavera/fix_moxiegirl_handler
...
Fix @moxiegirl's handler to be consistent with other maintainers.
2015-04-14 17:02:44 -07:00
25d07511ed
Update basic setup instructions
...
Without adding the user to the group you're going to hit nasty TLS errors. Figured I'd save the next guy the hassle.
Problem more accurately described here:
https://github.com/docker/docker/issues/5314
Signed-off-by: Jason Divock <jdivock@box.com >
2015-04-14 16:56:34 -07:00
d10c5d95a8
Fix @moxiegirl's handler to be consistent with other maintainers.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-14 16:53:28 -07:00
485071f92e
Merge pull request #11945 from lmars/fix-upstart-post-start
...
Prevent Upstart post-start stanza from hanging
2015-04-14 16:23:04 -07:00
002afbbe77
Make integration tests to call the new start and create endpoints.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-14 15:33:33 -07:00
98996a432e
Remove engine.Job from Create action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-14 15:33:12 -07:00
610c436e07
Remove engine.Job from Start action.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-14 15:33:12 -07:00
5395cdcae5
Merge pull request #12269 from kostickm/12251-remove-not-empty-check
...
Remove container name not empty check
2015-04-14 17:55:13 -04:00
ee54723485
Merge pull request #12379 from sharkone/patch-1
...
Remove sprious `fmt.Printf` from test
2015-04-14 14:25:16 -07:00
088e69da35
Fix wrong graphdb refs paths purging
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-14 23:10:43 +02:00
2ea1febd9a
Remove unnecessary fmt.Printf
...
Signed-off-by: Thomas Texier <sharkone@en-mousse.org >
2015-04-14 20:55:32 +00:00
1e6f7e4ee5
Merge pull request #12356 from jfrazelle/godeps-lolololololololololololol
...
change go tools to use certain commit
2015-04-14 16:18:49 -04:00
2f0f04e8fa
Merge pull request #12292 from cpuguy83/remove_commands_integration
...
Remove commands integration
2015-04-14 16:17:25 -04:00
74f4a88305
Merge pull request #11999 from vbatts/vbatts-decide_storage
...
graphdriver: prefer prior driver state
2015-04-14 13:04:21 -07:00
62e8621095
Merge pull request #12357 from draghuram/prdoc
...
Improve the git instructions to update a PR.
2015-04-14 15:46:10 -04:00
8ce42baaef
Make docker cp bind-mount volumes
...
Allows `docker cp` to work seamlessly, and a lot more cleanly.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-14 15:42:56 -04:00
63331abbca
remove integration/utils setRaw funcs
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-14 15:17:17 -04:00
18a8bcf072
Improve the git instructions to update a PR.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-04-14 15:11:35 -04:00
676bf4afa5
Merge pull request #12282 from cpuguy83/remove_some_integration_tests
...
Move integration/server_test tests to integration-cli
2015-04-14 11:55:05 -07:00
98f857772f
Remove container name not empty check
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-14 11:27:06 -07:00
a3d871220c
Merge pull request #12375 from moxiegirl/12366-change-fix
...
Fixing changed pushed without edit
2015-04-14 11:06:41 -07:00
5be5749d54
Merge pull request #12370 from buddhamagnet/11593-api-client-docs
...
add docs for DockerCli and NewDockerCli fixes #11593
2015-04-14 11:00:19 -07:00
69747b3c1e
add docs for DockerCli and NewDockerCli
...
Signed-off-by: buddhamagnet <buddhamagnet@gmail.com >
2015-04-14 18:33:11 +01:00
4dd4bd00aa
Fixing changed pushed without edit
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-14 10:25:07 -07:00
040176f6e1
Merge pull request #12214 from ahmetalpbalkan/namesgenerator/localrand
...
names-generator: use local random instance
2015-04-14 13:10:26 -04:00
7b29a88146
Merge pull request #12374 from kostickm/12343-fix-vet-warning-archive
...
Fix vet warning in archive.go
2015-04-14 10:06:04 -07:00
3748def343
Merge pull request #12366 from bboreham/12337-force-push
...
Add -f option and explanation to push after rebase
2015-04-14 09:59:48 -07:00
392fd243bc
Merge pull request #12365 from HuKeping/list
...
Use local variable err instead of a outer one
2015-04-14 12:49:15 -04:00
398220f5ff
Merge pull request #12368 from ZJU-SEL/fix-memory-stats-doc
...
fix memory stats display document
2015-04-14 09:44:44 -07:00
8f0b63925e
Merge pull request #12363 from ahmetalpbalkan/integ-cli/use-sockRequest-statuscode
...
integ-cli: Use status code from sockRequest (fix #12335 )
2015-04-14 09:38:10 -07:00
736824ccc1
change go tools to use certain commit
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
2015-04-14 09:32:23 -07:00
a0804e8e11
Use local variable err instead of a outer one
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-15 00:29:53 +08:00
fc20658a01
Fix vet warning in archive.go
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-14 09:13:50 -07:00
fe53c27785
Merge pull request #11992 from runcom/11923-refactor-utils-utils
...
Refactor utils/utils, fixes #11923
2015-04-14 12:01:23 -04:00
5019f35111
Merge pull request #11980 from sunyuan3/TestSearchCmdOptions
...
add TestSearchCmdOptions case
2015-04-14 08:34:40 -07:00
d791f7e9f8
fix memory stats display document
...
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
2015-04-14 18:34:20 +08:00
c89ddb6d01
Add -f option and explanation to push after rebase
...
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
2015-04-14 10:53:37 +01:00
531433e765
integ-cli: Use status code from sockRequest ( fix #12335 )
...
sockRequest now makes the status code available in the returned
values. This helps avoid string checking for non-HttpStatusOK(=200)
yet successful error messages.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-14 08:07:50 +00:00
67df8e4257
Improve test accuracy for pkg/chrootarchive (part 2)
...
Check test correctness of untar by comparing destination with
source. For part 2, it checkes hashes of source and destination
files or the target files of symbolic links.
This is a supplement to the #11601 fix.
Signed-off-by: Yestin Sun <sunyi0804@gmail.com >
2015-04-13 21:46:14 -07:00
25fab69f7d
names-generator: use local random instance
...
Instead of seeding/polluting the global random instance,
creating a local `rand.Random` instance which provides the same
level of randomness.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-14 02:35:16 +00:00
b68e161e5b
graphdriver: prefer prior driver state
...
Before this, a storage driver would be defaulted to based on the
priority list, and only print a warning if there is state from other
drivers.
This meant a reordering of priority list would "break" users in an
upgrade of docker, such that there images in the prior driver's state
were now invisible.
With this change, prior state is scanned, and if present that driver is
preferred.
As such, we can reorder the priority list, and after an upgrade,
existing installs with prior drivers can have a contiguous experience,
while fresh installs may default to a driver in the new priority list.
Ref: https://github.com/docker/docker/pull/11962#issuecomment-88274858
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-04-13 21:37:55 -04:00
bcd5e20a09
Enable "netgo" library when we build a static binary with gccgo
...
Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com >
2015-04-13 21:33:04 -04:00
77f2a4a0e3
add TestSearchCmdOptions case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-14 09:23:26 +08:00
00eddf5e67
Merge pull request #12353 from sunyuan3/duplicate
...
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunni...
2015-04-13 17:48:53 -07:00
7d738e0b8c
Move utils from commands_test.go into utils.go
...
Everything else was gone from this file except these utils which are
being used in other files and can't yet be removed.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 20:48:26 -04:00
125747e967
Remove TestRunAutoremove
...
This test is already being skipped, and is also fully tested by
`TestRunContainerWithRmFlagExitCodeNotEqualToZero`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 20:48:26 -04:00
e4cfd9b392
MovetAttachDisconnect to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 20:48:26 -04:00
28cda04838
Move TestAttachDetachTruncatedID to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 20:48:26 -04:00
ae0883ce00
Move TestAttachDetach to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 20:48:26 -04:00
f7538c77ef
Move TestRunDetach to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 20:48:24 -04:00
f68ad63496
Merge pull request #12345 from kostickm/12324-add-detection-f2fs-jfs-filesystem
...
Add detection for F2Fs and JFS
2015-04-13 17:32:47 -07:00
b85ade79d5
duplicate logDone in TestRmRunningContainerCheckError409 and TestRmRunningContainer
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-14 08:32:25 +08:00
b93d3f8768
Merge pull request #12351 from jfrazelle/fix-test-daemon-with-wrong-key-messing-up-builds
...
cleanup daemon tests
2015-04-13 20:31:41 -04:00
e8a7e76283
Merge pull request #11920 from SvenDowideit/flesh-out-docker-hub-automated-builds-docs
...
Researching Docker Hub account linking and automated builds details
2015-04-14 10:31:21 +10:00
a55f8e1ce7
Researching Docker Hub account linking and automated builds details
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-04-14 10:29:55 +10:00
7e2d05b493
Add detection for F2Fs and JFS
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Alphabetize FSMagic list to make more human-readable.
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-13 17:01:43 -07:00
24df333fa5
Merge pull request #12349 from calavera/patch-1
...
Fix JSON format in the remote api configuration examples.
2015-04-13 16:59:12 -07:00
9a87553e4f
cleanup test wrong key.json leading to other failures
...
wait for container to be running before trying to kill it in daemon tests
Signed-off-by: Jessica Frazelle <jess@docker.com >
2015-04-13 16:58:44 -07:00
c30a55f14d
Refactor utils/utils, fixes #11923
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-14 01:37:36 +02:00
d71c929d08
Fix JSON format in the remote api configuration examples.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-13 16:12:00 -07:00
7ecf4e5d4d
Merge pull request #12166 from cpuguy83/remove_err_when_volume_exists
...
Don't return error when adding existing volume
2015-04-13 14:15:48 -07:00
12f7db1830
Merge pull request #12025 from coolljt0725/add_exec_with_user
...
Add docker exec run command as a different user and in privileged mode
2015-04-13 13:50:51 -07:00
b5c3d01e6b
Merge pull request #12044 from reteptilian/11721-remove-randomstring-3
...
fixes 11721 replace stringutils.GenerateRandomString with stringid.GenerateRandomID
2015-04-13 13:47:50 -07:00
579c9ec1d0
Don't return error when adding existing volume
...
Error wasn't really doing anything except for making a bunch of extra
debug logs.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 16:45:35 -04:00
8652ca5d5f
Merge pull request #12111 from tianon/builder-deb
...
Add "builder-deb" base images for building ".deb" packages properly
2015-04-13 13:41:17 -07:00
02706a40bb
move TestImagesFilter to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 16:40:48 -04:00
2c24a8a4ea
Move TestCreateNumberHostname to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 16:40:48 -04:00
ed6074ea6b
Move TestMergeOnCommit to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 16:40:48 -04:00
9b4d9a3421
Move TestRunWithTooLowMemory to integration-cli
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-13 16:40:48 -04:00
6fa2a1e486
Merge pull request #12172 from ZJU-SEL/change_stats
...
change memory usage display
2015-04-13 13:32:45 -07:00
3d424ead3b
Merge pull request #12287 from calavera/check_memory_swap_when_disabled
...
Log memory swap capabilities properly.
2015-04-13 13:19:52 -07:00
b6e64981e6
Merge pull request #12204 from yestin/11601-supplement-tests-part-1
...
Improve test accuracy for pkg/chrootarchive (part 1)
2015-04-13 16:14:18 -04:00
e961f7da67
Merge pull request #12341 from jfrazelle/add-vet-script
...
Add vet script
2015-04-13 13:13:56 -07:00
75b911eb3c
Merge pull request #12222 from chenhanxiao/cp-support-colon
...
cp: add support for copy filename with ":"
2015-04-13 13:09:12 -07:00
6b40377c18
Merge pull request #12262 from YanFeng-Adam/daemon
...
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
2015-04-13 16:00:20 -04:00
afd973c497
Merge pull request #12342 from LK4D4/fix_vet_warn
...
Fix vet warning
2015-04-13 12:56:47 -07:00
f3ba0a6a35
change tabs to spaces
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
2015-04-13 12:48:40 -07:00
3280ce651b
Adds validate-vet script
...
resolves #11970
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
2015-04-13 12:48:05 -07:00
7523beff41
Log memory swap capabilities properly.
...
Check whether the swap limit capabilities are disabled or not only when memory swap is set to greater than 0.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-13 11:56:59 -07:00
82256c2a54
Merge pull request #12340 from crosbymichael/syslog-tags
...
move syslog-tag to syslog.New function
2015-04-13 14:51:00 -04:00
05433a4dab
Merge pull request #12275 from LK4D4/pid_host_hell
...
Get process list after PID 1 dead
2015-04-13 14:50:23 -04:00
9e0a55b48c
Merge pull request #12276 from estesp/10246-really-fix-arg-list
...
Send archive options via pipe in chrootarchive
2015-04-13 14:44:47 -04:00
213eab995a
Fix vet warning
...
pkg/archive/archive_test.go:496: arg changes for printf verb %s of wrong type: []archive.Change
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-13 11:43:30 -07:00
e29dcd91bd
Merge pull request #12228 from bboreham/12022-signal-doc
...
Add a note about PID 1 not terminating automatically on signal
2015-04-13 14:41:07 -04:00
a8e095b243
Merge pull request #12293 from hqhq/hq_use_hostconfig
...
use hostConfig in verifyDaemonSettings
2015-04-13 14:34:35 -04:00
3434f64827
Merge pull request #12300 from johngossman/master
...
Added some error messages and tracing to bridge network initialization
2015-04-13 14:32:56 -04:00
3509132a6e
Merge pull request #12301 from ewindisch/https_links
...
Use HTTPS links for URLs in READMEs / comments / docs
2015-04-13 14:30:53 -04:00
4f91a333d5
move syslog-tag to syslog.New function
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-04-13 11:24:18 -07:00
85f1410a5a
Merge pull request #12049 from tianon/bundles-latest
...
Add "bundles/latest" symlink
2015-04-13 11:11:38 -07:00
38761bda79
Merge pull request #12264 from Mashimiao/add-event-log-for-push
...
Add event log for push
2015-04-13 11:03:09 -07:00
0e46cc9be4
Merge pull request #12325 from hqhq/hq_fix_build_test
...
fix build test by adding --no-cache
2015-04-13 10:57:19 -07:00
76eeb5d777
Merge pull request #12291 from coolljt0725/add_cfs_bandwidth_to_check_config
...
Add CFS_BANDWIDTH to check-config
2015-04-13 10:55:31 -07:00
5a174e5def
Merge pull request #12297 from vdemeester/11603-pkg-archive-test-coverage
...
Add test on archive.go (#11603 )
2015-04-13 10:54:21 -07:00
c19bee4fb0
Merge pull request #12338 from LK4D4/fix_compile_integr_cli
...
Fix errors due changed sockRequest signature
2015-04-13 10:50:38 -07:00
27fccdbabb
Fix errors due changed sockRequest signature
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-13 10:30:07 -07:00
9a0a4ac02f
Merge pull request #12331 from coolljt0725/fix_panic_release_nil_interface
...
Fix daemon panic when release a nil network interface
2015-04-13 10:13:57 -07:00
6f928be7ef
Merge pull request #12320 from runcom/fix-api-resize-exec-resize
...
fix api server resize&execResize
2015-04-13 09:59:11 -07:00
33e83d0581
Merge pull request #12279 from runcom/remove-job-commit
...
Remove job from commit
2015-04-13 09:57:54 -07:00
d42753485b
Add "bundles/latest" symlink
...
This is a symlink to the latest "bundle" that was assembled. For example, if `VERSION` is currently `1.5.0-dev`, then `bundles/latest` will be a symlink to `bundles/1.5.0-dev` after an attempted build.
One interesting property of this is that after a successful `binary` build, we can `./bundles/latest/binary/docker -v` and get back something like `Docker version 1.5.0-dev, build 3ff6723-dirty`.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-04-13 10:54:17 -06:00
5ad15479a0
Add a note about PID 1 not terminating on SIGINT/SIGTERM.
...
Also re-arranged the description of CTRL-c to make it clearer.
Signed-off-by: Bryan Boreham <bjboreham@gmail.com >
2015-04-13 17:39:38 +01:00
12eff0c26f
Merge pull request #12312 from runcom/remove-job-container-stats
...
Remove job from container stats
2015-04-13 11:58:31 -04:00
a4f98d3225
Merge pull request #12313 from runcom/remove-job-export
...
Remove job from export
2015-04-13 11:57:55 -04:00
bfb487dc50
Merge pull request #12304 from runcom/remove-job-logs
...
Remove job from logs
2015-04-13 08:38:46 -07:00
9c48f6d9a5
Merge pull request #12314 from runcom/remove-engine-links
...
Remove engine from links
2015-04-13 11:27:13 -04:00
871f4cdccb
Merge pull request #12326 from xiaods/issure-12316
...
correct pkg/stdcopy NewStdWriter function comments
2015-04-13 09:39:34 -04:00
6b737752e3
Remove job from export
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-13 15:27:45 +02:00
ad41ba1f95
Merge pull request #12321 from HuKeping/testcase_typo
...
Fix typo in testcase
2015-04-13 08:48:41 -04:00
1567cf2cdf
Fix typo in testcase
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-13 23:09:07 +08:00
8b35481292
Fix daemon panic when release a nil network interface
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-13 20:24:10 +08:00
a715b0e31b
correct pkg/stdcopy NewStdWriter function comments
...
pkg/stdcopy NewStdWriter function has wrong doc comment,
utils is not correct, it should be stdcopy
Signed-off-by: Deshi Xiao <xiaods@gmail.com >
2015-04-13 17:21:27 +08:00
c49cc1f2fb
fix build test by adding --no-cache
...
Testcase TestBuildResourceConstraintsAreUsed run build without
--no-cache, so if you run this test twice, it will fail the
second time.
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[PASSED]
TESTFLAGS='-v -run ^TestBuildResourceConstraintsAreUsed$' ./hack/make.sh binary test-integration-cli
[FAIL]
Because we'll use cID to inspect field and will get empty cID
if we have cache.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-13 16:24:49 +08:00
3341f3a355
fix api server resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-13 08:42:12 +02:00
65a056345c
Remove jobs from stats
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-13 08:33:53 +02:00
91bfed6049
Remove job from logs
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-13 08:25:31 +02:00
f5a07f0c88
Add event log for push
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-04-13 09:41:15 +08:00
908db51804
Send archive options via pipe in chrootarchive
...
After finding our initial thinking on env. space versus arg list space
was wrong, we need to solve this by using a pipe between the caller and
child to marshall the (potentially very large) options array to the
archiver.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com > (github: estesp)
2015-04-12 21:16:54 -04:00
80e9f6f838
More review feedback addressed
...
Signed-off-by: John Gossman <johngos@microsoft.com >
2015-04-12 16:26:37 -07:00
4ce19da739
Addressed feedback. Will squash after further review
...
Signed-off-by: John Gossman <johngos@microsoft.com >
2015-04-12 15:49:29 -07:00
7560018541
Remove engine from links
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-12 16:25:10 +02:00
a54fd325e6
Merge pull request #12305 from runcom/remove-job-exec-inspect
...
Remove job from execInspect
2015-04-12 08:30:38 -04:00
395df2b0a5
Merge pull request #12306 from runcom/remove-job-stop
...
Remove job from stop
2015-04-12 08:29:22 -04:00
04cc6c6aa4
Remove job from stop
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-12 00:41:16 +02:00
621ee1f6a4
Remove job from execInspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-12 00:15:34 +02:00
c4fe5dad1d
Add test on archive.go ( #11603 )
...
- Trying to add or complete unit test to each ``func``
- Removing dead code (``escapeName``)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-04-11 23:21:37 +02:00
a9843cb739
Added some error messages and tracing to bridge network initialization
...
Signed-off-by: John Gossman <johngos@microsoft.com >
2015-04-11 11:15:24 -07:00
5dc83233bc
HTTPS urls for ./project
...
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-04-11 13:58:09 -04:00
ac65c8c380
HTTPS URLs for docs top-level & man pages
...
This updates all of docs outside of sources.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-04-11 13:43:26 -04:00
df9ee6d656
Link to HTTPS urls in contrib comments/maintainers
...
Updates comments and dockerfile maintainer lines
to use HTTPS urls where applicable.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-04-11 13:35:08 -04:00
ca37301d54
Link to HTTPS URLs in engine comments
...
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-04-11 13:31:34 -04:00
723d43387a
HTTPS urls for ./hacking
...
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-04-11 13:22:16 -04:00
67a983fc37
Use HTTPS for package URL
...
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-04-11 13:21:16 -04:00
787d774af0
Link to HTTPS URLs
...
Link to HTTPS URLs in top-level documentation / project files.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-04-11 13:18:57 -04:00
e3dd323336
Merge pull request #12289 from sunyuan3/docker_remote_api
...
update docker_remote_api_v1.19.md
2015-04-11 09:27:36 -05:00
6d8102466a
Merge pull request #12288 from sunyuan3/ubuntu
...
update ubuntulinux.md
2015-04-11 09:25:55 -05:00
d6d8f45b04
change memory usage display
...
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
2015-04-11 20:04:34 +08:00
4f492e794a
update docker_remote_api_v1.*
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-11 18:11:49 +08:00
39932511c1
use hostConfig in verifyDaemonSettings
...
We have moved resource configs to hostConfig.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-04-11 16:37:28 +08:00
e3c1cc8d77
Merge pull request #12290 from yuchangchun1/typo
...
Fix a typo in TestVolumesFromGetsProperMode
2015-04-10 23:45:42 -04:00
d2d583c53b
Add CFS_BANDWIDTH to check-config
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-11 11:39:47 +08:00
72a500e9e5
Add docker exec run a command in privileged mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-11 11:26:37 +08:00
2cce4791b0
Add -u|--user flag to docker exec for running command as a different user
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-11 11:04:24 +08:00
24dd8a4698
Fix a typo in comment of parseMaybeJSONToList
...
Signed-off-by: Yu Changchun <yuchangchun1@huawei.com >
2015-04-11 10:34:21 +08:00
5c3b228b61
Merge pull request #11058 from x1022as/upstream-master
...
fix 'rmi -f imgID' problem
2015-04-10 22:00:14 -04:00
795a58fb44
'docker rmi -f IMAGE_ID' untag all names and delete the image
...
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:
*untag all names and delete the image
*add test to this feature
*modify commandline/cli.md to explain this
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
2015-04-11 09:24:21 +08:00
a8fddbdeae
update ubuntulinux.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-11 08:58:23 +08:00
418195a4fb
Merge pull request #12274 from brahmaroutu/fix_gccgo_compilation
...
Unwanted declaration causing compilation issues with gccgo
2015-04-10 20:22:45 -04:00
d90da05b1b
Merge pull request #12283 from brendandixon/win-cli/wrapfix
...
Turned off Ctrl+C processing by Windows shell
2015-04-10 16:40:43 -07:00
ac8bd12b39
Get process list after PID 1 dead
...
Fix #11087
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-10 16:23:57 -07:00
f3e1178791
Merge pull request #12272 from nathanleclaire/bots_are_our_friends
...
Allow SEO crawling from docs site
2015-04-10 15:58:37 -07:00
c337bfd2e0
Turned off Ctrl+C processing by Windows shell
...
Signed-off-by: Brendan Dixon <brendand@microsoft.com >
2015-04-10 15:43:35 -07:00
de03f4797b
Allow SEO crawling from docs site
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com > (github: nathanleclaire)
2015-04-10 15:29:55 -07:00
c8529fde5f
Remove job from commit
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-11 00:20:45 +02:00
001a7e6bab
Merge pull request #12103 from sunyuan3/pause
...
add TestContainerApiPause case
2015-04-10 18:04:29 -04:00
563041b5c4
Merge pull request #11478 from dmcgowan/v2-vendored-api
...
Use v2 api from distribution
2015-04-10 17:22:38 -04:00
23c12dabbd
Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required
...
devmapper: udev sync is a requirement
2015-04-10 16:52:38 -04:00
96313f7ce0
Merge pull request #12250 from runcom/remove-job-wait
...
Remove job from wait
2015-04-10 16:27:59 -04:00
73d08528ea
Unwanted declaration causing compilation issues with gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-04-10 19:47:15 +00:00
0e21782de5
devmapper: storage-opt override for udev sync
...
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.
Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.
Including link to the docs for users that encounter this daemon error
during an upgrade.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-04-10 15:43:16 -04:00
6d8bba0cc8
Merge pull request #12271 from kostickm/12119-rename-TestStartSilentAttach
...
Rename TestStartSilentAttach to TestStartAttachSilent
2015-04-10 12:20:37 -07:00
6ab4878a01
Merge pull request #12218 from draghuram/apidoc_12055
...
Adds example request and Json parameter information for container
2015-04-10 11:22:57 -07:00
db0ffba3b9
Remove job from wait
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-10 20:17:02 +02:00
904295fd71
Merge pull request #12242 from tianon/functionalize-install
...
Wrap install.sh in a function
2015-04-10 14:15:38 -04:00
bae3273ef4
Merge pull request #12259 from duglin/RemoveJobTop
...
Remove Job from `docker top`
2015-04-10 10:56:01 -07:00
267bd51adb
Merge pull request #12248 from duglin/RemoveJobKill
...
Remove Job from `docker kill`
2015-04-10 10:52:18 -07:00
e7a2e2bf7e
Rename TestStartSilentAttach to TestStartAttachSilent
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-10 10:45:38 -07:00
43aca9adac
Merge pull request #12238 from brendandixon/win-cli/fixes
...
Corrected int16 overflow and buffer sizes
2015-04-10 13:36:23 -04:00
8d1a500303
Only use fallback to short IDs when obvious.
...
As reported in #11294 , the Docker daemon will execute contains it
shouldn't run in the event that a requested tag is present in an image's
ID. This leads to the wrong image being started up silently.
This change reduces the risk of such a collision by using the short ID
iff the actual revOrTag looks like a short ID (not that it necessarily
is).
Signed-off-by: Richard Burnison <rburnison@ebay.com >
2015-04-10 13:20:44 -04:00
7cec5f50c5
Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword
...
cli: Better wording for daemon --log-driver
2015-04-10 08:29:29 -07:00
202e0380f3
Adds example request and Json parameter information for container
...
start API.
Closes #10304 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-04-10 11:10:41 -04:00
bfc68d10ed
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-04-10 11:10:26 -04:00
0693e34d7e
Merge pull request #12260 from HuKeping/rmjob-history
...
Remove Job from History API
2015-04-10 09:53:05 -04:00
5c7c3fea6c
Remove Job from History API
...
a part of issue #12151
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-10 21:37:56 +08:00
5c8e28ec7c
Merge pull request #12263 from chenhanxiao/typo-resize-test
...
api_resize_test: fix a typo
2015-04-10 05:46:42 -07:00
4ddc721f23
api_resize_test: fix a typo
...
s/cintainer/container
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-04-10 03:09:26 -04:00
5037297388
cp: add support for copy filename with ":"
...
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-04-10 00:08:05 -04:00
296323cd6c
Merge pull request #12210 from tiborvass/carry-9916
...
Carry 9916: add comment column in docker history command
2015-04-10 00:02:00 -04:00
fa2ace00a8
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-04-09 21:29:42 -04:00
8d682bf734
Refine document by review comments
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
2015-04-09 21:29:42 -04:00
bf57339527
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
2015-04-09 21:29:41 -04:00
6842bba163
Commonalize more bits of install.sh (especially standardizing around "cat <<-EOF")
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-04-09 19:28:25 -06:00
e690ad9292
Merge pull request #12256 from WiseTrem/remove_go1.2
...
Remove pools_nopool.go & build tag from pools.go
2015-04-09 18:25:09 -07:00
3e096cb9c9
Remove Job from docker top
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-09 18:17:50 -07:00
8636a21991
add TestContainerApiPause case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-10 09:14:01 +08:00
404f81011b
Merge pull request #12254 from runcom/remove-job-resize-execresize
...
Remove job from resize&execResize
2015-04-09 17:00:58 -07:00
02f6d7f98a
Merge pull request #12252 from kostickm/update-contributor-guide-docs
...
Docs cleanup - Contributor Guide
2015-04-09 16:54:08 -07:00
f01d755cd0
Remove pools_nopool.go & build tag from pools.go
...
Fix #11576
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com >
2015-04-10 02:32:55 +03:00
3cb751906a
Remove Job from docker kill
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-09 16:06:54 -07:00
e290a22dc9
Remove job from resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-10 00:56:43 +02:00
eebfcde0ea
Merge pull request #12249 from runcom/remove-job-pause-unpause
...
Remove job from pause/unpause
2015-04-09 15:09:48 -07:00
8ad6031759
Merge pull request #12162 from daviddavis/README
...
Fixing up the README
2015-04-09 14:26:03 -07:00
e4addf1c01
Docs cleanup - Contributor Guide
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-09 14:20:03 -07:00
67676529b3
Merge pull request #12092 from tiborvass/no-jobs-networkdriver-bridge
...
Remove jobs from daemon/networkdriver/bridge
2015-04-09 14:10:21 -07:00
d66f868a83
Merge pull request #12247 from LK4D4/copy_no_engine
...
Removed engine from /copy
2015-04-09 14:09:00 -07:00
5ccb1c764b
Remove job from pause/unpause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-09 22:50:48 +02:00
dd4389fb19
Merge pull request #12109 from runcom/11625-fix-windows-test-build-cancellation
...
Fix TestBuildCancelationKillsSleep to not fail on Windows
2015-04-09 13:33:27 -07:00
ccdef895de
Removed engine from /copy
...
* Client and server use types.CopyConfig
* API calls container.Copy directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-09 13:05:31 -07:00
d38c90140b
Fix TestBuildCancelationKillsSleep to not fail on Windows
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-09 21:03:19 +02:00
6fb8bd0450
Merge pull request #12244 from calavera/fix_typo_in_dispatcher
...
Fix typo in builder/dispatchers.go
2015-04-09 11:51:43 -07:00
bbdf045ac1
Fix typo in builder/dispatchers.go
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-04-09 11:43:05 -07:00
b02cf5239e
Merge pull request #12115 from cpuguy83/fix_events_filter_test
...
Cleanup events filter by container test
2015-04-09 11:40:08 -07:00
c77ac8e29d
Merge pull request #12225 from chenhanxiao/commit-accent
...
docs: add missing accent mark around docker command
2015-04-09 11:34:07 -07:00
94fcded51b
Merge pull request #12208 from twhiteman/master
...
fix #12188 integration-cli: use "top" instead of "sleep" to avoid timeout
2015-04-09 14:30:43 -04:00
fa961ce046
Wrap installer in a function
...
This will assure that the install script will not
begin executing until after it has been downloaded should
it be utilized in a 'curl | bash' workflow.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-04-09 14:26:07 -04:00
92a775bd7a
Merge pull request #12234 from runcom/remove-job-rmi
...
Remove job from rmi
2015-04-09 11:24:20 -07:00
3218f3936d
Merge pull request #12197 from runcom/remove-job-rm
...
Remove job from rm
2015-04-09 11:21:52 -07:00
42d47c3136
fix #12188 integration-cli: tests using "sleep" can timeout too early - change to "top" instead
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com >
2015-04-09 10:46:57 -07:00
e4afc379dc
Remove job from rmi
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-09 19:39:14 +02:00
2052d01b1e
Merge pull request #12240 from LK4D4/fix_attach
...
Fix regressions in attach
2015-04-09 13:34:18 -04:00
2b96bd0bb8
Merge pull request #11895 from liusdu/m
...
show the right image name in job log and docker ps
2015-04-09 10:21:07 -07:00
0fec3e19db
Fix regressions in attach
...
* Wrong bool parsing
* Attach always all streams
Were introduced in #12120
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-09 09:58:44 -07:00
db13cb7f98
Remove job from rm
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-09 18:46:24 +02:00
6b7e520aa3
Merge pull request #12215 from ahmetalpbalkan/execdriver/localrand
...
execdriver/lxc: use local rand.Random in test
2015-04-09 12:22:25 -04:00
6ba7bf440e
Merge pull request #12184 from duglin/RemoveJobImages
...
Remove Job from `docker images`
2015-04-09 09:19:09 -07:00
f16d8db789
Merge pull request #12205 from ahmetalpbalkan/docs/remote-api-LogConfig-format
...
docs: Markdown format fix around LogConfig param
2015-04-09 09:17:24 -07:00
74b5c7b284
Merge pull request #12231 from ahmetalpbalkan/integ-cli/TestInfoEnsureSucceeds-all-required
...
cli_info_test: Check all required fields
2015-04-09 09:07:54 -07:00
a264e1e83d
Corrected int16 overflow and buffer sizes
...
Signed-off-by: Brendan Dixon <brendand@microsoft.com >
2015-04-09 09:03:04 -07:00
7dff1c15d2
Merge pull request #12223 from YanFeng-Adam/typo
...
Fix a typo in docker/daemon/execdriver/native/exec.go
2015-04-09 11:49:02 -04:00
ab11d60555
Fix a typo in docker/daemon/execdriver/native/exec.go
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-04-09 11:46:09 -04:00
8295bed3df
Merge pull request #12207 from WiseTrem/getBoolParam
...
Removing unused getBoolParam func from api/server/server.go
2015-04-09 08:28:48 -07:00
00fd226430
Merge pull request #12227 from HuKeping/rm-rename
...
Remove Job from rename
2015-04-09 11:27:14 -04:00
49c4de4aeb
Remove Job from rename
...
A part of ISSUE#12151-Remove engine.Job mechanism
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-10 01:52:55 +08:00
3ca46f29b8
Merge pull request #12232 from ahmetalpbalkan/names/kilby-joyce
...
namesgenerator: Proposing Kilby/Noyce
2015-04-09 11:25:19 -04:00
645c020f5a
fix up Image-name related issues in docker ps and CI
...
This patch include the following fixs:
- fix image name error when docker ps
- fix docker events test failure: use the exact image name for filter
- fix docker build CI test failure due to "docker events" change
Because of change of daemon log behavior. Now we record
the exact Image name as you typed. So docker run -d busybux sh
and docker run -d busybox:latest are not the same in the log.
So it will affect the docker events. So change the related CI
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-04-09 23:03:23 +08:00
7e70998bb8
Cleanup events filter by container test
...
This also seemed to be checking the ordering of the events, which
doesn't seem like something we sould be interested in this particular
test.
Added check to make sure the filtered events have the expected ID's.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-09 09:47:58 -04:00
197ec4a637
namesgenerator: Proposing Kilby/Noyce
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-09 04:11:06 -07:00
4c69d0dd8a
cli_info_test: Check all required fields
...
`TestInfoEnsureSucceeds` is supposed to check existence of all
expected fields that are going to be shown in `docker info` command.
If this list was complete, it could have helped catching the missing
`"Logging Driver:"` regression.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-09 04:01:39 -07:00
a4b7a9e1e5
cli: Better wording for daemon --log-driver
...
This flag is passed to the daemon CLI. In my opinion, "Container's
logging driver" is not accurate and refers to 'one container'.
Also the `syslog` driver was missing from the list. Having the list
of all logging drivers won't scale here (should be <80 chars per line)
and we have `rotation` driver coming up in the pipeline as well (gh11485).
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-09 02:12:44 -07:00
809d99ad91
docs: add missing accent mark around docker command
...
As we did everywhere.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-04-09 04:37:23 -04:00
0fc75a3136
Removing unused getBoolParam func from api/server/server.go
...
Fix #12199
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com >
2015-04-09 09:13:16 +03:00
d045b9776b
Remove Job from docker images
...
Also removes engine.Table
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-08 19:33:01 -07:00
663d913011
Show the right image name/ID in job log
...
When we tag an Image with several names and we run one of them,
The "create" job will log this event with
+job log(create, containerID, Imagename).
And the "Imagename" is always the first one (sorted). It is the
same to "start/stop/rm" jobs. So use the correct name instand.
This PR refer to #10479
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-04-09 09:41:23 +08:00
c2c45d7769
execdriver/lxc: use local rand.Random in test
...
Preventing the test execution to pollute the deterministic runtime environment
by seeding the global rand.Random.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-08 18:13:07 -07:00
91abff41dd
Merge pull request #12206 from jfrazelle/11966-fix-racy-tests-on-overlay
...
cleanup/fix integration-cli for overlay in overlay
2015-04-08 20:52:58 -04:00
255b84444a
cleanup/fix integration-cli for overlay in overlay
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
2015-04-08 16:59:36 -07:00
b66597eef1
docs: Markdown format fix around LogConfig param
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-08 16:16:37 -07:00
53582321ee
Remove jobs from daemon/networkdriver/bridge
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-04-08 18:50:29 -04:00
7bb4b055ab
Improve test accuracy for pkg/chrootarchive (part 1)
...
Check test correctness of untar by comparing destination with
source. For part one, it only compares the directories.
This is a supplement to the #11601 fix.
Signed-off-by: Yestin Sun <yestin.sun@polyera.com >
2015-04-08 14:07:31 -07:00
7233bd223d
Merge pull request #12163 from duglin/RemoveJobPS
...
Remove Job from PS API
2015-04-08 13:43:47 -07:00
56a2c58760
Merge pull request #12194 from icecrime/update_maintainers
...
Drop shin from MAINTAINERS
2015-04-08 13:43:01 -07:00
66a68e378c
Merge pull request #12171 from cstivers78/patch-1
...
Proposing Seymour Cray
2015-04-08 13:42:13 -07:00
d0c1fba73e
Drop shin from MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-08 13:31:42 -07:00
5206f76f44
Proposing Seymour Cray
...
Signed-off-by: Chris Stivers <chris@stivers.us >
2015-04-08 13:17:22 -07:00
776b7e8559
Merge pull request #12191 from kostickm/12189-fix-json-tags
...
Fixing JSON Tags
2015-04-08 13:11:54 -07:00
57536d82e7
Merge pull request #12187 from moxiegirl/docs-makefile-update
...
Adding environment variables for sub projects
2015-04-08 12:48:09 -07:00
ef8b917fac
Adding environment variables for sub projects
...
Fixes issue #12186
Fixing variables per Jess
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-08 12:23:50 -07:00
88119bb276
Fixing JSON Tags
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-08 12:05:12 -07:00
26e83832c7
Merge pull request #11855 from nfirvine/master
...
Add some new graphics for mac installation with boot2docker
2015-04-08 10:41:50 -07:00
1bfa80bdd9
Remove Job from PS API
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-08 10:30:17 -07:00
ebc1e5ec9f
Merge pull request #12176 from YanFeng-Adam/typo
...
Fix a typo in /doc/sources/reference/run.md
2015-04-08 10:08:05 -07:00
f9d323d712
Fixing up the README
...
Fixing some small issues I found in the README like missing punctuation,
trailing whitespace, etc.
Signed-off-by: David Davis <daviddavis@redhat.com >
2015-04-08 12:57:19 -04:00
b8a7fdade6
Merge pull request #12178 from fschindler/fix-typo
...
Fixing typo.
2015-04-08 09:10:53 -07:00
254d6f7752
Merge pull request #12133 from xiaods/fixed-issue-11500
...
fixed #11500 Add tip about filter proxy
2015-04-08 09:09:54 -07:00
a6d39e2a2d
Merge pull request #12168 from cpuguy83/remove_dup_file_creation
...
Remove duplicate config file creation.
2015-04-08 09:03:43 -07:00
3ebfc99d10
Merge pull request #12066 from LK4D4/split_events
...
Remove engine usage from events
2015-04-08 08:29:24 -07:00
64fd944e30
Fix a typo in /doc/sources/reference/run.md
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-04-08 11:23:47 -04:00
94ade35e46
Merge pull request #12183 from runcom/remove-job-diff
...
Remove engine.Job from diff
2015-04-08 08:21:43 -07:00
e379e2668c
Remove engine.Job from diff
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-08 15:52:10 +02:00
7cfe438151
Merge pull request #12132 from sunyuan3/d
...
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
2015-04-08 08:09:22 -04:00
8afd5cad31
Fixing typo.
...
Added missing white space.
Signed-off-by: Felix Schindler <fschindler@weluse.de >
2015-04-08 11:03:11 +02:00
a40f379878
fixed #11500 Add tip about filter proxy
...
fixed #11500
Add tip about filter proxy to Docker installation Guides
Signed-off-by: Deshi Xiao <xiaods@gmail.com >
2015-04-08 14:13:01 +08:00
cc30282e94
duplicate logDone in TestRenameRunningContainer and TestRenameCheckNames
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-08 13:33:05 +08:00
24057777af
Remove duplicate config file creation.
...
When `toDisk` is called, it is creating a file already, no need to
create it here.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-07 21:36:30 -04:00
06433cf812
Merge pull request #12161 from LK4D4/update_libcontainer
...
Update libcontainer
2015-04-07 16:18:33 -07:00
d08db9a059
Merge pull request #12160 from mrunalp/remove_unused
...
Removes unused function.
2015-04-07 16:05:49 -07:00
ce69dafe4d
Test case for network mode chain container -> container -> host
...
Issue #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 15:20:42 -07:00
195bebd3a7
Removes unused function.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-04-07 18:15:28 -04:00
dccda72a41
Merge pull request #12120 from LK4D4/split_attach
...
Remove engine usage from attach
2015-04-07 18:13:35 -04:00
2f853b9493
Update libcontainer to bd8ec36106086f72b66e1be85a81202b93503e44
...
Fix #12130
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 15:10:44 -07:00
8b71930570
Merge pull request #12154 from moxiegirl/carry-pr-11409
...
Carrying 11409 for a contributor
2015-04-07 15:00:26 -07:00
d1423d28b5
Merge pull request #12155 from kostickm/12146-fix-fail-msg-TestRunDeviceDirectory
...
Fixing fail message in TestRunDeviceDirectory
2015-04-07 14:55:30 -07:00
65ca20e6f1
Merge pull request #12156 from moxiegirl/pr-12008-carry
...
Carry PR 12008 for contributor
2015-04-07 14:54:02 -07:00
c44f513248
Remove engine usage from attach
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 14:23:09 -07:00
8fd2b52146
Fix fail message in TestEventsImageImport
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 14:22:43 -07:00
87e70b6831
Carry PR 12008 for contributor
...
Closes #8040
Remove a tic for the hawk
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-07 14:09:53 -07:00
9dd23be563
Merge pull request #11947 from TonnyXu/master
...
Updated the explanation of ONBUILD in best-practices doc
2015-04-07 16:53:43 -04:00
4d4f201a4d
Merge pull request #12089 from nerdalert/doc-fix-netw-nerdalert
...
Replaced level with layer for OSI model references
2015-04-07 13:29:40 -07:00
ebd7df3bbe
Merge pull request #11909 from runcom/11908-refactor-utils-utils-daemon
...
Refactor utils/utils_daemon
2015-04-07 13:24:24 -07:00
fdfc36db41
Carrying 11409 for a client
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-07 13:20:17 -07:00
05dcf26199
Fixing fail message in TestRunDeviceDirectory
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-07 13:14:47 -07:00
86d66d6273
Merge pull request #12033 from rhvgoyal/devmapper-cleanup
...
Devmapper Graph Driver Misc cleanup
2015-04-07 15:49:32 -04:00
e011119a49
Merge pull request #12129 from duglin/RemoveTable5
...
Remove engine.Table from more daemon side stuff
2015-04-07 12:53:55 -04:00
531d2b3b80
Merge pull request #12136 from YanFeng-Adam/typo
...
Fix 2 typos in /doc/sources/reference/run.md
2015-04-07 09:21:01 -07:00
805f34bb5b
Fix 2 typos in /doc/sources/reference/run.md
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-04-07 14:15:05 -04:00
d487ca03e6
Remove events package
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 08:43:18 -07:00
c9eb37f975
Remove engine usage for events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 08:43:18 -07:00
868f56e083
New package daemon/events
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-07 08:43:14 -07:00
7165089f34
Replaced level with layer for OSI model references
...
- ty to @moxiegirl for the info workflow for patching images.
-link to the v6 svg (grey L2 switch in the top /level/layer/)
http://docs.master.dockerproject.com/article-img/ipv6_switched_network_example.svg
Signed-off-by: Brent Salisbury <brent.salisbury@docker.com >
2015-04-06 22:23:40 -04:00
9ede3f9fc1
Merge pull request #12127 from ahmetalpbalkan/win-cli/termsize-fix
...
Swap width/height in GetWinsize and monitorTtySize
2015-04-06 16:54:29 -07:00
650bc2ffe5
Remove engine.Table from more daemon side stuff
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-06 15:06:02 -07:00
6e44246fed
Swap width/height in GetWinsize and monitorTtySize
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-06 14:31:42 -07:00
3588c5fbc7
Merge pull request #12125 from LK4D4/fix_events_streaming_test
...
Fix events streaming test
2015-04-06 17:12:48 -04:00
e45bf8d2e9
Decrease timeouts in TestEventsStreaming
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2015-04-06 13:40:56 -07:00
5fa3a6f248
Pass right timestamp instead of crap from string(int64)
...
Problem is that --since can consume anything not near looking as
timestamp.
Signed-off-by: Alexandr Morozov <lk4d4@docker.com >
2015-04-06 13:39:02 -07:00
dec48d6708
Merge pull request #12070 from duglin/RemoveTableCLI
...
Last step in removing engine.Table from api/client/*
2015-04-06 16:33:29 -04:00
8a50746b5d
Merge pull request #11686 from willhf/9340_test
...
Add test for net=container and links
2015-04-06 13:21:01 -07:00
488a721dc9
Merge pull request #12121 from tiborvass/copy-not-deprecated
...
Revert "Since `COPY` has been deprecated in the recent release of Docker...
2015-04-06 13:18:55 -07:00
d2992c78dc
Revert "Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY."
...
COPY was not deprecated.
This reverts commit 3148063af1tibor@docker.com >
2015-04-06 15:34:10 -04:00
ca628c6216
devmapper: udev sync is a requirement
...
closes #10664
closes #4036
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-04-06 15:17:57 -04:00
37a16580b1
Merge pull request #12064 from brendandixon/win-cli/rawfix
...
Windows console fixes
2015-04-06 18:45:08 +00:00
9cad920c08
Merge pull request #11993 from crunchywelch/master
...
add centos to supported distros
2015-04-06 11:44:40 -07:00
2c44556ff9
Merge pull request #12093 from malnick/malnick_dockerfile_best_practice_update
...
Updated the dockerfile best practice section on ADD and COPY
2015-04-06 11:43:50 -07:00
ce18734c2c
Merge pull request #12055 from l0kix2/patch-1
...
Improved "start a container" section 1.16 & 1.17 API docs
2015-04-06 11:41:38 -07:00
f5657249a0
Merge pull request #11324 from sunyuan3/TestDaemonwithwrongkey
...
add TestDaemonwithwrongkey test case
2015-04-06 11:35:05 -07:00
a0fc0343b7
Merge pull request #12090 from runcom/12079-events-streaming-tests
...
Test events streaming
2015-04-06 11:23:47 -07:00
ed8d402851
Merge pull request #11978 from x1022as/info-show-loggingdriver
...
docker info show logging driver info
2015-04-06 11:11:31 -07:00
065648a832
Last step in removing engine.Tabel from api/client/*
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-06 10:55:53 -07:00
281b8f67e1
Merge pull request #11293 from shishir-a412ed/docker_load_clobber_image_name
...
Fix for Issue 11285: warning message displayed when updating an existing image
2015-04-06 13:04:49 -04:00
3148063af1
Since COPY has been deprecated in the recent release of Docker I updated the best practices section to inform users that ADD is the way forward and to not use COPY.
...
Signed-off-by: malnick <malnick@gmail.com >
2015-04-06 10:04:42 -07:00
3e077bb3f7
Merge pull request #12100 from draghuram/docker_update
...
Add the missing option to the wget command for updating Docker.
2015-04-06 10:03:23 -07:00
d1c4439b5a
Test events streaming, fixes #12079
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-06 19:00:17 +02:00
96c3141fa5
Merge pull request #12020 from chenhanxiao/docker-import-commit
...
docs: keep the style of docker-commit consistent with docker-import
2015-04-06 09:47:47 -07:00
eee1efcfd6
Add "builder-deb" base images for building ".deb" packages properly
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-04-06 10:43:36 -06:00
d3fa57e051
Merge pull request #12112 from kostickm/12042-fix-logDone-format
...
Fixes logDone format
2015-04-06 12:34:38 -04:00
8b4c3a111d
Merge pull request #10275 from Snorch/master
...
docker-tests: mount hierarchies and make symlinks for subsystems
2015-04-06 10:32:04 -06:00
d489b91aa9
Merge pull request #11915 from ZJU-SEL/fix_issue_11676_11754
...
clarify RLIMIT_AS is disabled, explain how to edit DOCKER_OPTS
2015-04-06 09:23:53 -07:00
ac93a13e27
Merge pull request #11554 from Sirupsen/logrus-fields
...
logging: use logrus fields
2015-04-06 09:00:18 -07:00
d6ada45f45
Closes #12042 - fix logDone format
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-06 08:54:35 -07:00
90be2a66a8
Merge pull request #12102 from x1022as/typo
...
fix typo
2015-04-06 08:46:41 -07:00
b9d2ede4d4
Merge pull request #12107 from cpuguy83/remove_striptrailingchars
...
Remove `stripTrailingCharacters` from tests
2015-04-06 08:46:08 -07:00
716576b0cc
Merge pull request #12110 from leoh0/fix-typo
...
Minor spelling fix
2015-04-06 08:43:18 -07:00
7986c37996
Minor spelling fix
...
Signed-off-by: Eohyung Lee <liquidnuker@gmail.com >
2015-04-06 23:27:53 +09:00
475c65319b
Remove stripTrailingCharacters from tests
...
This was just an alias to `strings.TrimSpace`
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-06 09:21:18 -04:00
7d0053d554
Applying: Fix for Issue 11285: warning message displayed when updating an existing image
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-04-06 09:05:03 -04:00
71de711189
fix typo in cli.md
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
2015-04-06 16:11:40 +08:00
9287e70c12
Add the missing option to the wget command for updating Docker.
...
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-04-05 23:00:21 -04:00
bc0cdc0a4c
Fix incompatible flags conditional
...
Signed-off-by: willhf <willhf@gmail.com >
2015-04-05 19:38:31 -07:00
5057d7da13
fix the space thing.
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
2015-04-06 09:00:59 +08:00
ef13dcd4dc
add TestDaemonwithwrongkey test case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-06 08:57:47 +08:00
58390b6087
Merge pull request #12075 from eljojo/remove_stupid
...
Remove "stupid" wording
2015-04-04 12:37:38 -04:00
4cf5a1c2aa
Remove "stupid" wording
...
Signed-off-by: José Tomás Albornoz <jojo@eljojo.net >
2015-04-04 15:26:45 +02:00
ca8d196d13
Merge pull request #12074 from guoxiuyan/Fix_typo
...
Fix a minor typo
2015-04-04 07:34:35 -04:00
ac12c80537
Improved "start a container" section in 1.16 & 1.17 docs
...
It seems it was lost or something
Signed-off-by: Kirill Sibirev <l0kix2@gmail.com >
2015-04-04 11:23:49 +03:00
ffcc4a1e52
Fix a minor typo
...
Signed-off-by: Guo Xiuyan <guoxiuyan@huawei.com >
2015-04-04 15:36:35 +08:00
e50636617f
Updated the explanation of ONBUILD in best-practices doc
...
Signed-off-by: Tonny Xu <tonny.xu@gmail.com >
2015-04-04 12:46:25 +09:00
2a79d54f4c
Merge pull request #12063 from icecrime/update_maintainers
...
Several updates to MAINTAINERS file
2015-04-03 17:20:20 -07:00
a45375f1f9
Merge pull request #12069 from whoshuu/notice-link
...
Make NOTICE in the README into a link
2015-04-03 17:08:53 -07:00
886026f99e
Add thaJeztah
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-03 16:37:36 -07:00
d94e186442
Make NOTICE in the README into a link
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
2015-04-03 16:36:49 -07:00
6a99c2032e
Merge pull request #12065 from proppy/patch-14
...
test-unit: fix TESTFLAGS doc
2015-04-03 16:26:11 -06:00
e1ca439828
daemon: convert version log statement to fields
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
2015-04-03 18:22:17 -04:00
5846914f91
test-unit: fix TESTFLAGS doc
...
Signed-off-by: Johan Euphrosine <proppy@google.com >
2015-04-03 15:05:14 -07:00
1a36a113d4
Windows console fixes
...
Corrected integer size passed to Windows
Corrected DisableEcho / SetRawTerminal to not modify state
Cleaned up and made routines more idiomatic
Corrected raw mode state bits
Removed duplicate IsTerminal
Corrected off-by-one error
Minor idiomatic change
Signed-off-by: Brendan Dixon <brendand@microsoft.com >
2015-04-03 15:02:52 -07:00
58f07c9d8a
Rename status labels
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-03 14:33:16 -07:00
80f3085651
Sort maintainers alphabetically
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-03 14:33:16 -07:00
370cef012e
Move docs approval section
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-03 14:33:16 -07:00
b2fbd9e632
Merge pull request #12060 from duglin/RemoveTable3
...
Remove engine.Table from docker search and fix missing field
2015-04-03 21:29:36 +00:00
9cdad8a26b
Merge pull request #11886 from jamiehannaford/pkg-mnt-docs
...
Document exported functions and consts in pkg/mount
2015-04-03 21:28:11 +00:00
5c83dfe670
Merge pull request #11994 from unclejack/jsonfilelog_allocations
...
daemon/logger/jsonfilelog: avoid some allocations
2015-04-03 13:58:13 -07:00
4d571257ed
Merge pull request #12039 from ahmetalpbalkan/windows-install-docs-update
...
docs: Add new windows installation tutorials
2015-04-03 20:39:21 +00:00
fb1e10284b
Merge pull request #11968 from thaJeztah/docs-fix-bullets-and-labels-filter
...
docs: fix bullet list and missing label filter
2015-04-03 12:33:22 -07:00
a6c04f33e1
Merge pull request #12003 from sleinen/patch-1
...
Make explanation consistent with command
2015-04-03 12:19:37 -07:00
6d5a0ac11e
Merge pull request #12057 from icecrime/11925_carry
...
Specify running `boot2docker ip` on host
2015-04-03 12:11:53 -07:00
409ed98c3f
Merge pull request #12048 from tianon/auto-btrfs_noversion
...
Change the btrfs_noversion check to be automatic
2015-04-03 19:00:57 +00:00
3985dc299a
Merge pull request #12054 from eluck/master
...
Update userguide/dockervolumes - fixes issue #12052
2015-04-03 18:58:52 +00:00
3683498d6f
Merge pull request #12037 from twhiteman/master
...
integration-cli: in TestPsListContainersSize, check for no containers
2015-04-03 18:52:26 +00:00
55da2e5987
Merge pull request #12059 from whoshuu/readme
...
Clean up formatting in the README
2015-04-03 18:49:26 +00:00
2b320a2309
docs: Add new windows installation tutorials
...
Updated Windows installation documentation with newest
screencasts and Chocolatey instructions to install windows
client CLI.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-04-03 11:33:34 -07:00
67b4cce0f6
Remove engine.Table from docker search and fix missing field
...
registry/SearchResults was missing the "is_automated" field.
I added it back in.
Pull this 'table' removal one from the others because it fixed
a bug too
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-03 11:27:30 -07:00
e64f6baf11
Merge pull request #12010 from ibuildthecloud/small
...
Small changes from #11967 for review comments
2015-04-03 11:27:06 -07:00
b3e9c274dd
Merge pull request #11981 from unclejack/fix_profiler
...
api/server: fix profiler HTTP serving
2015-04-03 18:25:12 +00:00
01724c1cf1
Refactor ultis/utils_daemon, fixes #11908
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-03 20:20:04 +02:00
326a5545d4
Merge pull request #12058 from duglin/RemoveTable2
...
Remove engine.Table from docker history and docker rmi
2015-04-03 10:57:52 -07:00
12e7787540
Merge pull request #12017 from moxiegirl/distribution-man-pages
...
Updating with man pages for distribution
2015-04-03 09:55:08 -07:00
bfddad18ce
Clean up formatting in the README
...
Signed-off-by: Huu Nguyen <whoshuu@gmail.com >
2015-04-03 09:50:35 -07:00
61933395eb
Merge pull request #11860 from maximkulkin/11575-dockerize-image-tool
...
Add tool to conver disk image into Docker image
2015-04-03 09:32:11 -07:00
c8ca904f15
Merge pull request #11881 from jrjang/master
...
mkimage-arch: set default C.UTF-8 locale
2015-04-03 09:28:11 -07:00
bcbdf77ddb
Specify running boot2docker ip on host
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-03 08:53:44 -07:00
03525d5fc6
Merge pull request #11956 from coolljt0725/add_memcg_swap_cgroup_enabled_to_check_config
...
add MEMCG_SWAP_ENABLED to check-config.sh
2015-04-03 08:50:54 -07:00
2c5da7d1ac
Merge pull request #12018 from sunyuan3/search
...
If docker search with --starts=${negative number}, it would show the war...
2015-04-03 11:38:38 -04:00
0b2fa9c707
Remove engine.Table from docker history and docker rmi
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-03 08:31:30 -07:00
05753288c4
Merge pull request #11997 from tiborvass/carry-11926
...
Carry 11926: Added information about accessing host directory on Windows.
2015-04-03 06:43:38 -07:00
da61228501
Merge pull request #11775 from maximkulkin/explain-advanced-contribution-workflow
...
Explain advanced contribution workflow more
2015-04-03 06:41:49 -07:00
a6b8f2e3fe
add centos to supported distros
...
Signed-off-by: Aaron Welch <welch@packet.net >
2015-04-03 08:56:26 -04:00
57b09068ef
Update userguide/dockervolumes - fixes issue #12052
...
Signed-off-by: Evgeny Lukianchikov <mail@eluck.me >
2015-04-03 14:07:51 +03:00
9a98556c2b
Add documentation for exported functions and types
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
2015-04-03 11:33:34 +02:00
3761955e8c
Change the btrfs_noversion check to be automatic
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-04-03 01:30:12 -06:00
8c578b8190
minor edits.
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
2015-04-03 14:43:21 +08:00
a3a45a6ec0
Merge pull request #11883 from coolljt0725/add_missing_option_to_bash_completion
...
Add some missing option to bash completion
2015-04-02 22:49:58 -07:00
4e90b47cc2
Merge pull request #12043 from joeygibson/12041-fix-vet-warnings
...
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
2015-04-02 22:07:55 -07:00
a9443de7c5
Fix vet warnings in pkg/requestdecorator/requestdecorator_test.go #12041
...
Signed-off-by: Joey Gibson <joey@joeygibson.com >
2015-04-03 00:18:21 -04:00
87e0e4eb43
If docker search with --starts=${negative number}, it would show the warning.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-03 08:55:34 +08:00
f92e88b7e0
Merge pull request #11995 from icecrime/test_daemon_stop
...
Properly stop test daemon in integration-cli
2015-04-02 20:27:20 -04:00
3f1590f679
Merge pull request #12040 from duglin/TableFromDiff
...
Remove use of Table from 'docker diff'
2015-04-02 17:21:40 -07:00
49c72506ac
Remove use of Table from 'docker diff'
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-02 16:55:58 -07:00
9c505c906d
Merge pull request #11571 from noironetworks/11555-Docker-since-beginning-of-unix-time-doesnt-work
...
Fixes docker events since beginning of unix time
2015-04-02 15:03:04 -07:00
962ded2dee
Merge pull request #12036 from crosbymichael/update-libcontainer-apr2
...
Update libcontainaer to d00b8369852285d6a830a8d3b9
2015-04-02 14:46:44 -07:00
3e51a81475
integration-cli: add check for TestPsListContainersSize when no containers are returned
...
* when no containers are returned, go test would then aborts with:
panic: runtime error: index out of range
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com >
2015-04-02 14:45:52 -07:00
d12fef1515
Update libcontainaer to d00b8369852285d6a830a8d3b9
...
Fixes #12015
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-04-02 14:12:55 -07:00
c737800b7f
devmapper: Retry device removal after 100ms instead of 10ms
...
Right now we try device removal at the interval of 10ms and keep on trying
till either device is removed or 10 seconds are over. That means if device
is busy, we will try 1000 times in those 10 seconds.
Sounds too high a frequency of deivce removal retrial. All the logs are
filled easily. I think it is a good idea to slow down a bit and retry at
the interval of 100ms instead of 10ms.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-02 16:47:14 -04:00
f74d12012c
devmapper: Remove call to waitClose()
...
During device removal, we are first waiting for device to close() in a tight
loop for 10 seconds. I am not sure why do we need it. First of all we come
here once the umount() is successful so device should be free. For some reason
of device is temporarily busy, then removeDevice() logic retries device removal
logic in a loop for 10 seconds and that should cover it. Can't see why one
more 10 seoncds loop is required before attempting device removal.
One loop should be able to cover all the temporary device busy conditions and
if condition is not temporary then 10 seconds loop is not going to help anyway.
So instead of two loops of 10 seconds each, I am converting it to a single
loop of 20 seconds. May be 10 second loop is good enough but for now I am
keeping it 20 seconds to avoid any regressions.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-02 16:47:14 -04:00
dbf04ec4e2
devmapper: Remove extra wait after device removal
...
Currently in device removal path (device deactivation), we wait
for 10 seconds for devive to actually go away. waitRemove().
In current code this is not required. If dm removal task has completed
and one has done the wait on udev cookie, then device is gone and there
is no need to write another loop to wait for device removal.
This patch removes the waitRemove() which waits for 10 seconds after
device removal. This seems unnecessary.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-02 16:47:14 -04:00
665656afbb
devmapper: Use a pointer as argument to deferred function UdevWait()
...
UdevWait() is deferred and takes uint cookie as an argument. As arguments
to deferred functions are calculated at the time of call, it is possible
that any update to cookie later by libdm are not taken into account when
UdevWait() is called. Hence use a pointer to uint as argument to UdevWait()
function.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-02 16:47:14 -04:00
cb7c893275
devicemapper: Remove debug messages from RemoveDevice()
...
devmapper graph driver retries device removal 1000 times in case of failure
and if this fills up console with 1000 messages (when daemon is running in
debug mode). So remove these debug messages.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-02 16:47:14 -04:00
e07d3cd9ac
devmapper: Fix libdm logging
...
There are issues with libdm logging. Right now if docker daemon is run
in debug mode, logging by libdm is too verbose. And if a device can't
be removed, thousands of messages fill the console and one can not see
what's going on.
This patch removes devicemapper.LogInitVerbose() call as that call will
only work if docker was not registering its own log handler with libdm.
For some reason docker registers one with libdm and libdm hands over
all the messages to docker (including debug ones). And now it is up to
devmapper backend to figure out which ones should go to console and
which ones should not.
So by default log only fatal messages from libdm. One can easily modify
the code to change it for debugging purposes.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-04-02 16:47:14 -04:00
c88b2c422f
Merge pull request #12012 from jfrazelle/fix-race-volumes-from-api
...
TestVolumesFromHasPriority fix race
2015-04-02 16:01:09 -04:00
42c7855014
Merge pull request #12011 from jfrazelle/fix-lxc-device-test
...
fix device test on lxc...
2015-04-02 16:00:39 -04:00
104b20a133
Merge pull request #12026 from cpuguy83/add_self_to_maintainers
...
Add cpuguy83 to maintainers.people
2015-04-02 09:20:19 -07:00
02c2308e39
Properly stop test daemon in integration-cli
...
Always stop the test daemon in an attempt to fix race conditions in
subsequent tests.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-02 08:53:31 -07:00
ccfbe880c8
Merge pull request #12029 from unclejack/testpsgroupportrange_fast
...
integration-cli: make TestPsGroupPortRange fast
2015-04-02 08:48:08 -07:00
132da3f036
daemon/logger/jsonfilelog: avoid some allocations
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-04-02 18:33:23 +03:00
cfa8aaf16f
integration-cli: make TestPsGroupPortRange fast
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-04-02 18:26:29 +03:00
6896016b7c
Fixes #11721 removed GenerateRandomString
...
Signed-off-by: Peter Esbensen <pkesbensen@gmail.com >
gofmt
Signed-off-by: Peter Esbensen <pkesbensen@gmail.com >
2015-04-02 08:07:52 -07:00
11287f7714
Added unit tests for stringutils GenerateRandomAlphaOnlyString and GenerateRandomAsciiString
...
Signed-off-by: Peter Esbensen <pkesbensen@gmail.com >
2015-04-02 07:12:47 -07:00
6ac845edad
Add cpuguy83 to maintainers.people
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-04-02 08:51:47 -04:00
9707286a5c
Merge pull request #11149 from duglin/8667-AdvancedVars
...
Add support for advanced ${} uses
2015-04-02 08:25:49 -04:00
8fa03df885
docs: keep the style of docker-commit consistent with docker-import
...
add a pair of accent mark around dockerfile commands
in docker-commit, as the same thing in docker-import.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-04-02 05:01:14 -04:00
3bea892d54
api/server: fix profiler HTTP serving
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-04-02 09:53:40 +03:00
b6d55ebcbc
Updating with man pages for distribution
...
Went through the man pages to update for the
v2 instance. Checked against the commands.
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-01 21:02:19 -07:00
c447fd339a
TestVolumesFromHasPriority fix race
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com > (github: jfrazelle)
2015-04-01 18:06:28 -07:00
f472c7236f
fix device test on lxc, on lxc in contianers there are no dirs with devices in /dev, but this works outside a container...
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
2015-04-01 17:47:36 -07:00
a9588158b5
Add MEMCG_SWAP_ENABLED to check-config.sh
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-02 08:38:39 +08:00
7433c9c92a
Make server_windows.go consistent with server_linux.go
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-04-01 17:31:15 -07:00
34f44c642f
Infer type
...
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-04-01 17:31:09 -07:00
b9be50b578
Merge pull request #10745 from jfrazelle/device-dir
...
Mounting a dir of devices like /dev/snd should mount all child devices
2015-04-01 16:53:01 -07:00
37c7f3a204
docs: fix bullet list and missing label filter
...
Some bullet lists didn't render as bullet-lists because
of a missing newline.
Also added missing "label" filter for `docker ps` and
slightly re-worded the header above the supported filters.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-04-02 01:48:28 +02:00
3f77f627d0
Merge pull request #12007 from crosbymichael/fix-oom-hang
...
Return closed channel if oom notification fails
2015-04-01 15:59:20 -07:00
664004ed0c
Mounting a directory of devices like /dev/snd should mount all child devices.
...
I have seen a lot of people try to do this and reach out to me on how to mount
/dev/snd because it is returning "not a device node". The docs imply you can
_just_ mount /dev/snd and that is not the case. This fixes that. It also allows
for coolness if you want to mount say /dev/usb.
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2015-04-01 15:57:41 -07:00
3fe7a3d537
Merge pull request #12005 from LK4D4/bump_docs
...
Bump API version and docs to v1.19
2015-04-01 15:34:28 -07:00
88b8fc10e3
Merge pull request #11099 from iavael/bugfix/tar-symlinks
...
Fixed handling hardlinks to symlinks in tar stream
2015-04-01 18:34:00 -04:00
7061a993c5
Return closed channel if oom notification fails
...
When working with Go channels you must not set it to nil or else the
channel will block forever. It will not panic reading from a nil chan
but it blocks. The correct way to do this is to create the channel then
close it as the correct results to the caller will be returned.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-04-01 15:30:48 -07:00
2c0ee48224
Merge pull request #12006 from icecrime/add_kitematic_to_readme
...
Add Kitematic to README.md
2015-04-01 14:41:41 -07:00
7bd250c74d
Add Kitematic to README.md
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-04-01 14:38:49 -07:00
1a4d2a5c8b
Add some new graphics for installation and understanding docs
...
Fixes : #11552
- scalable SVG
- uses colours from the rest of the page
- emphasizes that boot2docker is the ordinary Linux setup in a VM
- Add new graphic for architecture diagram
- Add windows boot2docker diagram
- Add windows diagram to documentation
- Remove old PNGs; replaced with SVGs
- Add redirects for new SVG versions of installation diagrams
Signed-off-by: Nick Irvine <nfirvine@nfirvine.com >
2015-04-01 14:24:53 -07:00
81f9b72c64
Bump API version and docs to v1.19
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-01 13:40:56 -07:00
4467b6a2cb
Merge pull request #11974 from crosbymichael/registry-jobs
...
Remove jobs from registry.Service
2015-04-01 16:32:41 -04:00
b58c4b8e68
Make explanation consistent with command
...
To reduce confusion of the reader. Fixes a likely cut & paste error.
Signed-off-by: Simon Leinen <simon.leinen@gmail.com >
2015-04-01 21:54:21 +02:00
7101419c1c
Merge pull request #11990 from duglin/11985-RemoveDeadCode
...
Remove dead code looking for non-existent err msg
2015-04-01 10:46:10 -07:00
6e46204ab8
Added information about accessing host directory on Windows.
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-04-01 13:36:43 -04:00
8f7ac20bac
Fixes docker events since beginning of unix time
...
Fixes issue #11555
Applied a workaround to check if since and until flags are valid or not.
Signed-off-by: André Martins <martins@noironetworks.com >
2015-04-01 18:14:59 +01:00
624de8a9cd
Merge pull request #11949 from MabinGo/fix_randombug_in_eventtest
...
Fix random error in cli events test
2015-04-01 09:26:48 -07:00
39908fc6d9
Add support for more advanced ${xxx:...} syntax
...
Just ${xxx:+...} and ${xxx:-...} for now
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-01 08:11:15 -07:00
39711c8b26
Merge pull request #11969 from powo/patch-1
...
Update networking.md (IPv6 wrong prefix)
2015-04-01 07:45:31 -07:00
d351aef8af
Remove dead code looking for non-existent err msg
...
Closes #11985
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-01 07:37:10 -07:00
dc564d8cf8
Merge pull request #11972 from thaJeztah/docs-fix-heading-level
...
docs: fix heading level of logging drivers
2015-04-01 07:34:45 -07:00
f73109b883
Merge pull request #11982 from sunyuan3/docker-run
...
Fix typoes in docker-run.1.md
2015-04-01 07:32:06 -07:00
a73b7354a6
Merge pull request #11954 from ankushagarwal/#11953
...
Use different host and container port for clarity
2015-04-01 09:21:15 -04:00
a44451d40e
Fix typoes in docker-run.1.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-01 17:09:01 +08:00
f5a401d3fe
docker info show logging driver info
...
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
2015-04-01 16:05:14 +08:00
e15c3e36cc
Fix random bug in cli events test
...
Signed-off-by: Mabin <bin.ma@huawei.com >
2015-04-01 11:00:01 +08:00
7105f93a72
Add some missing option to bash completion
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-04-01 10:35:05 +08:00
98cfa2aecd
Merge pull request #11975 from duglin/FixOOMTest
...
Increase timeout on TestRunOOMExitCode test
2015-03-31 17:24:26 -07:00
8d1455d88b
Increase timeout on TestRunOOMExitCode test
...
I can never get it to work for me when its just 3 seconds.
With this change it generates the OOM message around 17 seconds, but
I increased the timeout to 30 for people with slower machines
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-31 16:57:43 -07:00
e736f16bbd
Merge pull request #11930 from unclejack/broadcastwriter_refactor
...
pkg/broadcastwriter: use []byte to lower alloc
2015-03-31 16:47:23 -07:00
03d3d79b2b
Remove jobs from registry.Service
...
This makes `registry.Service` a first class type and does not use jobs
to interact with this type.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-31 16:38:04 -07:00
596ddef7d7
Merge pull request #11967 from LK4D4/fix_panic
...
Avoid ServeApi race condition
2015-03-31 16:37:32 -07:00
f855d5dde7
Fix heading level of logging drivers
...
Syslog was a heading-2, but should be heading-3;
changed the headings to heading-4 to match the
"network settings" section.
Also changed "Log driver" to "logging driver" for JSON.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-04-01 01:07:22 +02:00
6a47c70d60
Update networking.md
...
Signed-off-by: Wolfgang Powisch <powo@powo.priv.at >
2015-04-01 00:44:41 +02:00
153f98bad5
pkg/broadcastwriter: reset after 4 KB w/o stream
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-04-01 01:26:19 +03:00
c717475714
Fix panic in integration tests
...
Closing activationLock only if it's not closed already. This is needed
only because integration tests using docker code directly and doesn't
care about global state.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-03-31 15:12:15 -07:00
62009ef77e
Use vendored v2 registry api
...
Update registry package to use the v2 registry api from distribution. Update interfaces to directly take in digests.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-31 15:02:27 -07:00
d15d1674c3
Skip heavy operations if there is no jsonlog writers
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-04-01 01:02:18 +03:00
5550a46946
pkg/broadcastwriter: use []byte to lower alloc
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-04-01 01:02:18 +03:00
b535ed3595
pkg/jsonlog: add JSONLogBytes for low allocations
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-04-01 01:02:18 +03:00
f26f405b00
pkg/broadcastwriter: add test w/ "" stream only
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-04-01 01:02:18 +03:00
f011d722ce
Vendor distribution v2 api
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-31 14:58:45 -07:00
7dd79dcc7b
Merge pull request #11952 from ankushagarwal/#11581
...
Add some documentation to pkg/system
2015-03-31 14:58:32 -07:00
ded5c73deb
Merge pull request #11962 from vbatts/vbatts-promote_overlay
...
graphdriver: promote overlay above vfs
2015-03-31 14:39:08 -07:00
e4545ed8cb
Merge pull request #11963 from crosbymichael/api-server
...
API Server Socket Refactoring
2015-03-31 14:25:32 -07:00
2c72ff1dbf
graphdriver: promote overlay above vfs
...
It's about time to let folks not hit 'vfs', when 'overlay' is supported
on their kernel. Especially now that v3.18.y is a long-term kernel.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-03-31 17:18:49 -04:00
da6248751b
Merge pull request #11961 from dmcgowan/fix-build-progress-output-11849
...
Fix progress reader output on close
2015-03-31 14:04:33 -07:00
749a117267
Merge pull request #11934 from cpuguy83/fix_volume_symlink_check
...
Fix volume symlink check
2015-03-31 13:56:23 -07:00
e04acf8a38
Merge pull request #11045 from brahmaroutu/fixtest_10964
...
Skip TestEventsImagePull unless network is available
2015-03-31 13:48:54 -07:00
62806cc85e
Refactor API socket handling
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-31 13:37:49 -07:00
b85cf5da5e
Merge pull request #11958 from LK4D4/fix_portmapper_race
...
Move portmapper initialization to var block
2015-03-31 13:23:45 -07:00
a381a1bb03
Merge pull request #11473 from pradeepchhetri/docker-wait-cli-integration-test
...
Added basic integration tests for docker wait command
2015-03-31 13:23:23 -07:00
aa3083f577
Fix progress reader output on close
...
Currently the progress reader won't close properly by not setting the close size.
fixes #11849
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-31 13:17:25 -07:00
b875e126dd
Merge pull request #11137 from rhvgoyal/fix-removal
...
Do not remove container if underlying resource cleanup failed
2015-03-31 13:09:23 -07:00
63708dca8a
Use getResourcePath instead
...
Also cleans up tests to not shell out for file creation.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-03-31 15:10:30 -04:00
e94a48ffc8
Add some documentation to pkg/system
...
Partially addresses #11581
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-03-31 12:00:33 -07:00
8caf8f0a79
Use different host and container port for clarity
...
Fixes #11953
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-03-31 11:59:58 -07:00
7609d52797
Move Profiler into specific http.Handler
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-31 11:38:17 -07:00
584180fce7
Initialize portMapper in RequestPort too
...
Api requesting port for daemon before init_networkdriver called.
Problem is that now initialization of api depends on initialization of
daemon and their intializations runs in parallel. Proper fix will be
just do it sequentially. For now I don't want refactor it, because it
can bring additional problems in 1.6.0.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-03-31 11:30:57 -07:00
9e9adf8075
mkimage-arch: set C.UTF-8 default locale
...
It may not work fine when doing expect script if setting other locales.
Signed-off-by: Jun-Ru Chang <jrjang@gmail.com >
2015-04-01 00:40:34 +08:00
ddbc68f564
Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize
...
windows: monitorTtySize correctly by polling
2015-03-31 11:14:04 -04:00
40945fc186
container: Do not remove contianer if any of the resource failed cleanup
...
Do not remove container if any of the resource could not be cleaned up. We
don't want to leak resources.
Two new states have been created. RemovalInProgress and Dead. Once container
is Dead, it can not be started/restarted. Dead container signifies the
container where we tried to remove it but removal failed. User now needs to
figure out what went wrong, corrent the situation and try cleanup again.
RemovalInProgress signifies that container is already being removed. Only
one removal can be in progress.
Also, do not allow start of a container if it is already dead or removal is
in progress.
Also extend existing force option (-f) to docker rm to not return an error
and remove container from user view even if resource cleanup failed.
This will allow a user to get back to old behavior where resources
might leak but atleast user will be able to make progress.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-03-31 09:51:19 -04:00
d322cd5dcb
docker-tests: mount hierarchies and make symlinks for subsystems
...
Docker does not know about our named cpuacct,cpu,cpuset cgroup
hierarchy with multiple subsystems in it. So to use them with docker
in integration-cli test TestRunWithCpuset inside docker container
we need to add symlinks to them in hack/dind script.
Example:
old version of parser will do:
cat /proc/1/cgroup
11:cpu,cpuacct,name=my_cpu_cpuacct:/
...
and create and mount this hierarchy to directory
/cgroup/cpu,cpuacct,name=my_cpu_cpuacct/
so docker cannot find it because it has strange name
in new parser directory will be same as on host
/cgroup/my_cpu_cpuacct
and have symlinks for docker to find it
/cgroup/cpu -> /cgroup/my_cpu_cpuacct
/cgroup/cpuacct -> /cgroup/my_cpu_cpuacct
in other case if where is no name
cat /proc/1/cgroup
11:cpu,cpuacct:/
...
mount will be same for both parsers
/cgroup/cpu,cpuacct
and new one will also create symlinks
/cgroup/cpu -> /cgroup/cpu,cpuacct
/cgroup/cpuacct -> /cgroup/cpu,cpuacct
Signed-off-by: Pavel Tikhomirov <ptikhomirov@parallels.com >
2015-03-31 15:49:10 +03:00
97f621bcd8
Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table
...
Fix-11752 add capabilities list information table.
2015-03-30 23:18:30 -04:00
bf15f675b9
Revison the some columns to make table clearer
...
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
2015-03-31 02:41:49 +00:00
8d3d34d5e3
fix issue #11676 #11754 , disable RLIMIT_AS,edit DOCKER_OPTS
...
Signed-off-by: Simei He <hesimei@zju.edu.cn >
2015-03-31 10:13:37 +08:00
73b7cee89c
Merge pull request #11946 from crosbymichael/no-pkg-init
...
Remove port mapper/allocator global state
2015-03-30 22:03:12 -04:00
d8c628cf08
Ensure that bridge driver does not use global mappers
...
This has a few hacks in it but it ensures that the bridge driver does
not use global state in the mappers, atleast as much as possible at this
point without further refactoring. Some of the exported fields are
hacks to handle the daemon port mapping but this results in a much
cleaner approach and completely remove the global state from the mapper
and allocator.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-30 18:28:24 -07:00
302e3834a0
Prevent Upstart post-start stanza from hanging
...
Once the job has failed and is respawned, the status becomes `docker
respawn/post-start` after subsequent failures (as opposed to `docker
stop/post-start`), so the post-start script needs to take this into
account.
I could not find specific documentation on the job transitioning to the
`respawn/post-start` state, but this was observed on Ubuntu 14.04.2.
Signed-off-by: Lewis Marshall <lewis@lmars.net >
2015-03-31 01:56:16 +01:00
8f6a14452d
Avoid ServeApi race condition
...
If job "acceptconnections" is called before "serveapi" the API Accept()
method will hang forever waiting for activation. This is due to the fact
that when "acceptconnections" ran the activation channel was nil.
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-03-30 17:39:43 -07:00
62522c9853
Refactor portmapper to remove ALL global state
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-30 17:31:21 -07:00
43a50b0618
Refactor port allocator to not have ANY global state
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-30 17:30:59 -07:00
e7c48f5817
Merge pull request #11942 from crosbymichael/update-libct-mar30
...
Update libcontainer to c8512754166539461fd860451ff
2015-03-30 17:12:53 -07:00
f0ddbbaa86
Merge pull request #11933 from LK4D4/fix_err_mask
...
Various fixes for execdriver
2015-03-30 17:12:35 -07:00
e2d96d4304
Merge pull request #11939 from jfrazelle/fix-go1.3.3
...
fix basicAuth function not in go1.3.3
2015-03-30 16:51:42 -07:00
1ce39e234c
Merge pull request #11904 from albers/completion-filters
...
Add missing filters to bash completion for docker images and docker ps
2015-03-30 16:37:01 -07:00
17ecbcf8ff
Update libcontainer to c8512754166539461fd860451ff
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-30 16:29:10 -07:00
2742bf5cbc
Merge pull request #11938 from achanda/patch-1
...
Remove unused daemon.LogToDisk function
2015-03-30 15:48:03 -07:00
f468bbb7e8
Do not mask *exec.ExitError
...
Fix #11764
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-03-30 15:31:49 -07:00
4a2ef6c805
fix basicAuth function not in go1.3.3
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
2015-03-30 15:28:34 -07:00
69b84c5be9
Merge pull request #11936 from runcom/11935-remove-duplicate-assignment
...
Remove duplicate assignment
2015-03-30 15:16:11 -07:00
1d23bae785
Remove unused daemon.LogToDisk function
...
Fixes #11937
Signed-off-by: Abhishek Chanda <abhishek.becs@gmail.com >
2015-03-30 14:54:17 -07:00
cc46ae8eae
Remove duplicate assignment
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-30 23:07:43 +02:00
fe9f3227b1
Merge pull request #11859 from HuKeping/eof
...
Add nice error message
2015-03-30 13:53:09 -07:00
00a15227f8
Merge pull request #11893 from runcom/11892-refactor-utils-flags
...
Refactor utils/flags.go
2015-03-30 13:35:40 -07:00
5a1e5cf8c9
Get child processes before main process die
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-03-30 13:28:34 -07:00
489ab77f4a
Use proper wait function for --pid=host
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-03-30 13:27:38 -07:00
b6d6ffa1dd
Merge pull request #11896 from vdemeester/9998-cp
...
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
2015-03-30 13:15:00 -07:00
70a479dda5
Merge pull request #11900 from runcom/11899-refactor-utils-http
...
Refactor utils/http.go
2015-03-30 13:11:45 -07:00
a7a93fd2b2
Merge pull request #11931 from scarletmeow/11563_log_timestamp
...
Upgrade logrus to v0.7.2
2015-03-30 13:09:17 -07:00
72dfd6728f
Merge pull request #11869 from dmcgowan/v2-push-gzipped
...
Compress layers on push to a v2 registry
2015-03-30 12:58:55 -07:00
711e580320
Upgrade logrus to v0.7.2
...
- Daemon logs now report to millisecond resolution
Signed-off-by: Tiffany Low <the.second.angel@gmail.com >
2015-03-30 12:27:03 -07:00
851c64725d
Compress layers on push to a v2 registry
...
When buffering to file add support for compressing the tar contents. Since digest should be computed while writing buffer, include digest creation during buffer.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-30 12:15:15 -07:00
f3a048516e
Merge pull request #11901 from albers/dockerfile-bash-completion
...
Enable bash completion in build environment
2015-03-30 11:52:43 -07:00
446437d1a1
Merge pull request #11928 from crosbymichael/aufs-build-errors
...
Fix AUFS logrus build errors on import
2015-03-30 11:49:14 -07:00
d1306e63e4
Fix AUFS logrus build errors on import
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-30 11:46:44 -07:00
a0d90f18d5
Merge pull request #11890 from albers/completion-run-cgroup-parent
...
Do not complete --cgroup-parent as _filedir
2015-03-30 12:42:30 -06:00
14fed352cb
Merge pull request #11799 from dqminh/aufs-dirperm1
...
aufs: apply dirperm1 by default if supported
2015-03-30 11:36:02 -07:00
3a706d6580
Merge pull request #11894 from ankushagarwal/11630
...
Explain --net=host option usage
2015-03-30 11:18:01 -07:00
ddd27616e0
Explain --net=host option usage
...
Fixes #11630
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-03-30 10:28:44 -07:00
924d503cb1
Merge pull request #11898 from unclejack/broadcastwriter_writestring
...
pkg/broadcastwriter: avoid alloc w/ WriteString
2015-03-30 09:28:08 -07:00
0995ab5946
Refactor utils/http.go, fixes #11899
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-30 17:59:57 +02:00
a2ea4a9d9d
Merge pull request #11906 from runcom/11905-refactor-utils-tmpdir
...
Refactor utils/tmpdir.go
2015-03-30 08:58:51 -07:00
a27057d779
Merge pull request #11888 from jamiehannaford/commit-cmd-struct
...
Use ContainerCommitResponse struct for Commit cmd
2015-03-30 08:20:32 -07:00
5ab98eae3c
Merge pull request #11913 from sunyuan3/docker_cli_restart_test
...
Verify MaximumRetryCount=0 if the restart policy is always.
2015-03-30 10:05:08 -04:00
d95fae062b
Merge pull request #11912 from sunyuan3/typo
...
Fix a typo in daemon/networkdriver/ipallocator/allocator.go
2015-03-29 21:59:50 -04:00
f5310f403d
Verify MaximumRetryCount=0 if the restart policy is always.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-03-30 09:08:33 +08:00
08331294bc
Fix a typo in daemon/networkdriver/ipallocator/allocator.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-03-30 08:31:46 +08:00
41e47bbf34
Merge pull request #11678 from botchagalupe/docker-11465
...
Closes #11465 - Add additional doc for local registries on pull command
2015-03-29 14:10:20 -07:00
4edf8e1e53
Merge pull request #11798 from amylindburg/11792-fix-typo
...
Fixing typo in cd instruction
2015-03-29 14:01:35 -07:00
3bf9869234
Merge pull request #11897 from ankushagarwal/glossary
...
Add Glossary to documentation
2015-03-29 13:49:22 -07:00
8b3d8f21a0
Merge pull request #11885 from bobrik/fix-formatting
...
Fixed code formatting on docs.docker.com
2015-03-29 13:21:26 -07:00
3ff71c24c1
Merge pull request #11875 from ahmetalpbalkan/docs/boot2docker-windows
...
Update Documentation for Windows Installation
2015-03-29 13:18:00 -07:00
8bc330d863
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
...
Add a integration test TestCpSpecialFiles
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-03-29 22:10:14 +02:00
584df44d42
Merge pull request #11870 from dekobon/master
...
11558 - Documentation fixes and improvements for Riak Dockerfile
2015-03-29 12:42:54 -07:00
567f723721
Add Glossary to documentation
...
Closes #11057
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-03-29 12:24:54 -07:00
f1bbc1f34f
Refactor utils/tmpdir.go, fixes #11905
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-29 20:56:07 +02:00
cf438a542e
Add missing filters to bash completion for docker images and docker ps
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-03-29 10:13:47 -07:00
1f27ebc2c7
Merge pull request #11880 from miwest929/feature/add_man_pages_docs
...
Feature/add man pages docs
2015-03-29 09:39:56 -07:00
e8edcf47b4
Enable bash completion in build environment
...
Installs and configures bash completion for Docker.
Note that bash completion still has to be initialized by a custom
.bashrc file.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-03-29 06:50:46 -07:00
db877d8a42
pkg/broadcastwriter: avoid alloc w/ WriteString
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-03-29 15:20:53 +03:00
7583b49125
Fix create volume in a directory which is a symbolic link
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-03-29 13:35:36 +08:00
5670c6c695
Refactor utils/flags.go, fixes #11892
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-29 03:22:46 +02:00
a09cc935c3
Do not complete --cgroup-parent as _filedir
...
This is a follow-up on PR 11708, as suggested by tianon.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-03-28 11:32:33 -07:00
8b795a05a8
Use ContainerCommitResponse struct for Commit cmd
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
2015-03-28 17:55:45 +01:00
0dc996a7d7
fixed code formatting on docs.docker.com
...
Signed-off-by: Ian Babrou <ibobrik@gmail.com >
2015-03-28 14:32:53 +03:00
61069d8b69
Merge pull request #11281 from coolljt0725/fix_ipc_from_non_exist_container
...
Fix error from daemon no such image even when the image exist
2015-03-28 06:58:48 -04:00
cee62a95a2
Add nice error message
...
Generally, when using Remote API to push images there needs a http Header
X-Registry-Auth.
For compatibility if there was no authConfig header, everything will be
okay if a proper JSON-http-body was applied.
But when both X-Registry-Auth Header and the Body are missing, due to
the function of decode JSON, it will return an EOF error which was not
very clear to user.
So I think we can make the respone error be more nice.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-03-28 16:27:30 +08:00
b4905859d5
Add a missing definite article
...
Signed-off-by: Michael West <mwest@mdsol.com >
2015-03-27 23:35:37 -04:00
f7d75cc08a
Add man pages generation instructions.
...
Signed-off-by: Michael West <mwest@mdsol.com >
2015-03-27 23:35:13 -04:00
194cad243c
Remove dupllicated prefix to make table shorter & fix bugs
...
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
2015-03-28 01:49:28 +00:00
013fb87543
Fix error from daemon no such image even when the image exist
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-03-28 09:07:20 +08:00
789a67e931
Merge pull request #11805 from runcom/11804-remove-err-field-job-struct
...
Remove err field from Job struct
2015-03-27 16:27:04 -07:00
e3b0014987
Merge pull request #11708 from coolljt0725/add_cgroup_parent_to_bash_completion
...
Add new docker run option to bash completion
2015-03-27 15:06:10 -07:00
221ff368df
Merge pull request #11852 from clnperez/doc-dev-container
...
Fix typo in doc at /set-up-dev-env
2015-03-27 15:03:36 -07:00
c088486093
Merge pull request #11845 from lobatt/master
...
Issue #11836
2015-03-27 14:55:04 -07:00
de09c55394
Update boot2docker on Windows documentation
...
Boot2Docker experience is updated now that we have a Docker
client on Windows. Instead of running `boot2docker ssh`, users
can also use boot2docker on Windows Command Prompt (`cmd.exe`)
and PowerShell.
Updated documentation and screenshots, added a few details,
reorganized sections by importance, fixed a few errors.
Remaining: the video link in the Demonstration section needs
to be updated once I shoot a new video.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-03-27 14:54:37 -07:00
d1af2bc253
Add tool to conver disk image into Docker image
...
dockerize-image tool takes a virtual disk image file
and creates a Docker image based on it. You can
specify a base Docker image to make this tool create
an image that will contain only filesystem diff
instead of full filesystem.
See tools usage for details.
Signed-off-by: Maxim Kulkin <maxim.kulkin@gmail.com >
2015-03-27 14:53:54 -07:00
7cc73607a2
Merge pull request #11853 from EricR/doc-PkgSysInfo
...
Add some basic doc for SysInfo
2015-03-27 14:52:20 -07:00
cc609c7556
Merge pull request #11871 from NinjaTrappeur/dry-run-test
...
Fix vet warning in devicemapper.
2015-03-27 14:48:55 -07:00
240f3e14c7
Merge pull request #11848 from duglin/CleanupIntTests
...
Clean up integration-cli tests
2015-03-27 14:11:56 -07:00
37241db5f3
Merge pull request #11872 from ankushagarwal/11825
...
Replace fmt.Fprint* with io.WriteString
2015-03-27 14:05:15 -07:00
986ae5d52a
docs: remove unused windows images
...
These images was just sitting around and referenced from
nowhere, nor they seemed any useful.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-03-27 13:59:35 -07:00
8c58bdd3a7
Merge pull request #11842 from brahmaroutu/events_tests
...
Events tests
2015-03-27 13:45:11 -07:00
6d21b2ba80
Replace fmt.Fprint* with io.WriteString
...
This fixes vet warnings in api/client/stats.go
Fixes #11825
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-03-27 13:08:20 -07:00
6b764bba8a
Fix vet warning in devicemapper.
...
Issue #11828
Signed-off-by: Félix Baylac-Jacqué <baylac.felix@gmail.com >
2015-03-27 20:16:25 +01:00
de45aacc32
Added updated working Riak Dockerfile and documentation.
...
Signed-off-by: Elijah Zupancic <elijah@zupancic.name >
2015-03-27 12:03:46 -07:00
31c5041157
Removed references to creating an OpenSSH server. This method of accessing the Docker container is no longer needed now that the exec command is available.
...
Signed-off-by: Elijah Zupancic <elijah@zupancic.name >
2015-03-27 12:03:34 -07:00
17303b18b8
Removed ulimit steps from Dockerfile because they aren't applied according to @cpuguy83.
...
Signed-off-by: Elijah Zupancic <elijah@zupancic.name >
2015-03-27 12:03:24 -07:00
60085e22ff
Remove err field from Job struct, fixes #11804
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-27 19:08:53 +01:00
3716df57c0
Update inline doc for New
...
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com >
2015-03-27 13:55:22 -04:00
121de9e4e3
Merge pull request #11850 from kytrinyx/11796-git-mental-model
...
Clarify git instructions in project guide. Fixes #11796
2015-03-27 09:02:03 -07:00
89a29d7e99
Add capabilities list information table.
...
Signed-off-by: Chen Qiu <21321229@zju.edu.cn >
2015-03-27 08:45:36 +00:00
da5c863d20
Merge pull request #11788 from reikani/pchoi
...
Changed snake case naming to camelCase.
2015-03-26 23:55:50 -07:00
6abe160eae
Add missing . in comment
...
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com >
2015-03-26 23:22:05 -04:00
01bbc3fbb9
Add some basic doc for SysInfo
...
Signed-off-by: Eric Rafaloff <erafaloff@gmail.com >
2015-03-26 23:05:07 -04:00
f5ad895ba6
Use common code to test all events, when using filter that expect all lifecycle events.
...
Addresses: #10654
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-03-27 02:47:46 +00:00
dd6f988b23
Fix typo in doc at /set-up-dev-env
...
Save a whale!
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
2015-03-26 21:46:35 -05:00
54c9ae187f
Clarify git instructions in project guide. Fixes #11796
...
The git model uses `upstream master` to refer to the branch on
the remote repository, and `upstream/master` to refer to the
local cache of the upstream branch.
I did not explain the difference in the docs (that seemed a bit
excessive), but I did clarify the instructions so that it refers
to the correct concept in each place.
Signed-off-by: Katrina Owen <katrina.owen@gmail.com >
2015-03-26 19:24:14 -07:00
d2df901be3
Merge pull request #11846 from voltaic/master
...
Update set-up-dev-env.md
2015-03-26 18:09:28 -07:00
cd8ea1d17e
Merge pull request #11793 from lolilo/update-project-doc
...
fix typos, grammar, more concise wording
2015-03-26 17:57:45 -07:00
9a9d23dbc4
Clean up integration-cli tests
...
My AR couldn't take it any more:
- one logDone per test
- PASSED lines don't wrap
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-26 17:25:50 -07:00
756b8f2fde
Merge pull request #11841 from runcom/11762-replace-aliased-logrus-imports
...
Replace aliased imports of logrus
2015-03-26 16:49:01 -07:00
ddcb3ad061
Update set-up-dev-env.md
...
Signed-off-by: graycoder <patgray1127@gmail.com >
2015-03-26 19:41:31 -04:00
be5fd157d5
Merge pull request #11813 from miminar/show-verified-status
...
Consider tag updated also in case repo does not exist
2015-03-26 16:29:13 -07:00
cf7104a0e8
Merge pull request #11840 from ahmetalpbalkan/win-cli/term-resize-fix
...
term/winconsole: Identify tty correctly, fix resize problem
2015-03-26 16:19:27 -07:00
f581f74209
Issue #11836
...
Signed-off-by: chli <chli@freewheel.tv >
2015-03-26 19:18:23 -04:00
ebbceea8a7
windows: monitorTtySize correctly by polling
...
This change makes `monitorTtySize` work correctly on windows by polling
into win32 API to get terminal size (because there's no SIGWINCH on
windows) and send it to the engine over Remove API properly.
Average getttysize syscall takes around 30-40 ms on an average windows
machine as far as I can tell, therefore in a `for` loop, checking every
250ms if size has changed or not.
I'm not sure if there's a better way to do it on windows, if so,
somebody please send a link 'cause I could not find.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-03-26 16:08:05 -07:00
8c1118a8f9
Merge pull request #11832 from jamiehannaford/patch-1
...
Fix spelling
2015-03-26 15:47:27 -07:00
296642035d
Merge pull request #11801 from hqhq/hq_fix_doc_for_exec
...
update docs for container exec
2015-03-26 15:31:16 -07:00
6f4d847046
Replace aliased imports of logrus, fixes #11762
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-26 23:22:04 +01:00
0532dcf3dc
term/winconsole: Identify tty correctly, fix resize problem
...
This change fixes a bug where stdout/stderr handles are not identified
correctly.
Previously we used to set the window size to fixed size to fit the default
tty size on the host (80x24). Now the attach/exec commands can correctly
get the terminal size from windows.
We still do not `monitorTtySize()` correctly on windows and update the tty
size on the host-side, in order to fix that we'll provide a
platform-specific `monitorTtySize` implementation in the future.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-03-26 15:11:28 -07:00
ae907e7af1
Changed snake case naming to camelCase
...
Signed-off-by: Peter Choi <phkchoi89@gmail.com >
2015-03-26 15:05:45 -06:00
2c07fd9fdf
#11465 Add additional doc for locagi registries on pull command - for docker-pull.1.md
...
Signed-off-by: John Willis <john.willis@docker.com >
2015-03-26 16:09:56 -04:00
1401b8fe0d
Added integration tests for docker wait command
...
Signed-off-by: Pradeep Chhetri <pradeep@indix.com >
2015-03-27 01:24:11 +05:30
42f9594fd3
Merge pull request #11834 from jamiehannaford/contributor-guide-fix
...
Make gofmt use the filename previously referenced
2015-03-26 12:41:53 -07:00
7fdf5257b4
Make gofmt use the filename previously referenced
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
2015-03-26 20:39:15 +01:00
df90fb716b
Merge pull request #10050 from lindenlab/9922-private-registry-search-401
...
9922-fix: private registry search with auth returns 401
2015-03-26 12:24:06 -07:00
849e55f4e4
Fix spelling
...
Signed-off-by: Jamie Hannaford <jamie.hannaford@rackspace.com >
2015-03-26 20:24:01 +01:00
dcc6e818fe
Merge pull request #11747 from moxiegirl/11694-remove-sudo-added-in-error
...
Proposal: Removing sudo from examples
2015-03-26 15:18:48 -04:00
6b2eeaf896
Fix for issue 9922: private registry search with auth returns 401
...
Signed-off-by: Don Kjer <don.kjer@gmail.com >
2015-03-26 18:59:16 +00:00
29d01b7dde
Removing sudo from command line examples
...
We now advise people to configure docker group and
add to sudo. Mac shouldn't use sudo. Removed sudo
from command examples. Left in installation to be removed
in installation doc sweep -- removing requires finer
grain control.
Signed-off-by: Mary Anthony <mary@docker.com >
2015-03-26 11:12:37 -07:00
6a43d71014
Merge pull request #11734 from yestin/11601-test-chrootarchive
...
Add more tests for pkg/chrootarchive
2015-03-26 11:03:58 -07:00
d68d5f2e4b
print dirperm1 supported status in docker info
...
It's easier for users to check if their systems support dirperm1 just by using
docker info
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
2015-03-26 17:58:49 +00:00
708ed9d87a
Merge pull request #11766 from peggyl/11596-api-commands-godoc
...
Add godoc-style docstrings to Cmd... methods
2015-03-26 10:58:35 -07:00
a196cc943c
Merge pull request #11791 from moo-mou/11768-vetwarning
...
Fix vet warning
2015-03-26 10:52:07 -07:00
ec8f61044a
Merge pull request #11811 from VladimirAus/11585-3
...
#11585 : README for pkg/signal.
2015-03-26 10:44:09 -07:00
5f295a6e82
Merge pull request #11821 from duglin/FixCPUTest
...
Fix TestBuildResourceConstraintsAreUsed Cpuset test
2015-03-26 10:42:43 -07:00
a4609a1dfb
Removing sudo from examples
...
We now have instructions in our Unix installs about setting up
docker group to avoid sudo. Also, Mac/Windows shouldn't use
sudo. So, I've removed sudo from our examples and added a
section at the top reminding them that if they have to use
sudo to run docker they can change that.
Signed-off-by: Mary Anthony <mary@docker.com >
2015-03-26 10:13:19 -07:00
2bbf1987d2
Merge pull request #11800 from hqhq/hq_fix_create_issue
...
add back job.Errorf
2015-03-26 11:12:55 -06:00
b9d19fdaef
Merge pull request #11786 from peggyl/golint-api-client
...
Fix golint errors for casing in api/client package
2015-03-26 09:28:33 -07:00
d4fca8047c
Merge pull request #11789 from parknicker/PostContainerWaitFix
...
Changes response of postContainersWait to use a struct
2015-03-26 08:40:00 -07:00
dd492dc15d
Merge pull request #11702 from jimmypuckett/feature/bitflag_checking_style_11668
...
Feature/bitflag checking style 11668. Fixes #11668
2015-03-26 08:34:58 -07:00
389d0ae453
Fix TestBuildResourceConstraintsAreUsed Cpuset test
...
Set cpuset to "0" so that it works on single core machines.
W/o this (and set to "1") we'll see something like this error
when running:
System error: write /cgroup/cpuset/docker/66689499bbd08cd8dccc9b7bfd1d6b34e85d73ce8c84d3c69b5e91944322da60/docker/79d7c548b58c85c4cfad6cd01eb7c3b30db254d1014c496137edd93ddc528a6f/cpuset.cpus: invalid argument"
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-26 07:31:39 -07:00
afc8ae939a
Merge pull request #11806 from aneshas/11770-redundant-err-nil-check
...
Removed redundant err == nil check
2015-03-26 10:07:40 -04:00
3b8d4bb82b
Consider tag updated also in case repo does not exist
...
This patch causes `The image you are pulling has been verified` status
message to be produced also when the repository is pulled for the first
time.
Signed-off-by: Michal Minar <miminar@redhat.com >
2015-03-26 12:52:56 +01:00
9b876b9c03
#11585 : README for pkg/signal. Signed-off-by: Vladimir Roudakov <v_roudakov@yahoo.com>
...
Signed-off-by: VladimirAus <v_roudakov@yahoo.com >
2015-03-26 21:18:27 +10:00
b38e11b3c4
Removed redundant err == nil check
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
2015-03-26 11:36:13 +01:00
d7bbe2fcb5
document dirperm1 fix for #783 in known issues
...
Since `dirperm1` requires a more recent aufs patch than many current OS release,
we cant remove #783 completely. This documents that docker will apply `dirperm1`
automatically for systems that support it
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
2015-03-26 07:46:13 +00:00
281abd2c8a
aufs: apply dirperm1 by default if supported
...
Automatically detect support for aufs `dirperm1` option and apply it.
`dirperm1` tells aufs to check the permission bits of the directory on the
topmost branch and ignore the permission bits on all lower branches.
It can be used to fix aufs' permission bug (i.e., upper layer having
broader mask than the lower layer).
More information about the bug can be found at https://github.com/docker/docker/issues/783
`dirperm1` man page is at: http://aufs.sourceforge.net/aufs3/man.html
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com >
2015-03-26 07:25:42 +00:00
fabb5114d8
update docs for container exec
...
https://github.com/docker/docker/pull/11665 This PR changed container
exec API response, we need docs updated.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-03-26 13:55:46 +08:00
40ef253ef5
add back job.Errorf
...
c79b9bab54h.huangqiang@huawei.com >
2015-03-26 13:12:36 +08:00
0f702094ec
Fixing typo in cd instruction
...
Signed-off-by: Amy Lindburg <amy.lindburg@docker.com >
2015-03-25 21:52:32 -07:00
bc0f1e0e09
Merge pull request #11794 from moo-mou/11790-pkgulimit
...
Fixes pointer error
2015-03-25 21:30:37 -07:00
89d63d2a82
fixes comment for ContainerWaitResponse struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com >
2015-03-25 22:22:58 -06:00
191f88dd2c
Merge pull request #11795 from grubernaut/net_none_test_fixes
...
Add fixes for integration-cli tests w/ --net none
2015-03-25 21:22:28 -07:00
ff2fc9757d
Merge pull request #11781 from xamyzhao/patch-1
...
Updated step 5 with Windows instructions so that installation works in W...
2015-03-25 23:51:35 -04:00
23699f5a29
Merge pull request #11468 from robertabbott/10959-refactor-progressreader-hack
...
Fixes hacks from progressreader refactor
2015-03-25 23:50:43 -04:00
c2fe262439
Add fixes for integration-cli tests w/ --net none
...
Adds network to integration tests that were failing without network.
Fixes #10964
Fixes #10968
Signed-off-by: Jake Champlin <jake.champlin.27@gmail.com >
2015-03-25 23:46:04 -04:00
273fdd97ed
Fixes pointer error
...
Signed-off-by: Paul Mou <ppymou@gmail.com >
2015-03-25 20:45:17 -07:00
c5bf2145f1
Fix vet warning
...
Signed-off-by: Paul Mou <ppymou@gmail.com >
2015-03-25 20:31:02 -07:00
2a5a402c71
Update CmdCommit docstring and fix CmdHelp whitespace
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
2015-03-25 20:07:00 -07:00
4982374739
fix typos, grammar, more concise wording
...
Signed-off-by: Liana Lo <liana.lixia@gmail.com >
2015-03-25 20:03:42 -07:00
1bc266dfa7
Changes response of postContainersWait to use a struct
...
Signed-off-by: Nick Parker <nikaios@gmail.com >
2015-03-25 21:01:14 -06:00
a465e26bb0
Fix golint errors for casing in api/client package
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
2015-03-25 19:54:29 -07:00
0cd6c05d81
Fixes hacks from progressreader refactor
...
related to #10959
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
2015-03-25 18:21:02 -07:00
f84086be2a
Merge pull request #11776 from shin-/security_opt_docs_fix
...
API docs fix for SecurityOpt parameter.
2015-03-25 18:20:59 -07:00
b4d7b0f865
Explain advanced contribution workflow more
...
Explain why advanced contribution workflow have to be so complex
Signed-off-by: Maxim Kulkin <mkulkin@mirantis.com >
2015-03-25 18:04:41 -07:00
667452ec63
Merge pull request #11779 from blatyo/add_ulimit_test
...
Add test for successful Ulimit Parse.
2015-03-25 17:34:58 -07:00
d0b2cfa1f1
Merge pull request #11778 from blatyo/fix_ulimit_string
...
Fix (*Ulimit).String() function. Closes #11769 .
2015-03-25 17:33:00 -07:00
ba222f7bc8
Updated step 5 with Windows instructions so that installation works in Windows
...
Signed-off-by: Amy Zhao <x.amy.zhao@gmail.com >
Signed-off-by: Amy Zhao <xamyzhao@mit.edu >
2015-03-25 20:32:50 -04:00
a97ca674f0
Add test for successful Ulimit Parse.
...
Signed-off-by: Allen Madsen <blatyo@gmail.com >
2015-03-25 20:03:26 -04:00
cb168e5622
Fix (*Ulimit).String() function. Closes #11769 .
...
Signed-off-by: Allen Madsen <blatyo@gmail.com >
2015-03-25 19:39:05 -04:00
61dba98608
SecurityOpt parameter is singular, and belongs in HostConfig
...
since API 1.17
Signed-off-by: Joffrey F <joffrey@docker.com >
2015-03-25 16:25:13 -07:00
e589dc7424
Merge pull request #11757 from ankushagarwal/Fds
...
Rename 'Fds' to 'File Descriptors' in docker info
2015-03-25 16:24:57 -07:00
5dde99163e
running code formatter as @tiborvass requested
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
2015-03-25 19:24:55 -04:00
89e7f5e661
Merge pull request #11772 from aneshas/11718-redundant-else
...
Fixed redundant else
2015-03-25 16:16:16 -07:00
f14bf9b53c
Merge pull request #11773 from icecrime/unused_securityopt_field
...
Remove unused runconfig.Config.SecurityOpt field
2015-03-25 16:15:41 -07:00
8cd3564ec1
Merge pull request #11771 from aneshas/11719-redundant-elses
...
Removed redundant elses
2015-03-25 16:06:30 -07:00
8d62e12f4d
Merge pull request #11745 from imdreamrunner/patch-1
...
Add missing newline for bash code example
2015-03-25 16:58:55 -06:00
136f8fa2ff
Merge pull request #11774 from thaJeztah/fix-workdir-typo
...
Fix typo "WRKDIR" -> "WORKDIR"
2015-03-25 16:55:57 -06:00
87e877e3c1
Merge pull request #11748 from minimum2scp/fix/debootstrap
...
removed unnecessary tabs from /usr/sbin/policy-rc.d, and /sbin/initctl for mkimage.sh debootstrap
2015-03-25 16:55:13 -06:00
6fdb583f38
Fix typo "WRKDIR" -> "WORKDIR"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-03-25 23:47:38 +01:00
e39646d2e1
Remove unused runconfig.Config.SecurityOpt field
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-03-25 15:46:42 -07:00
3d7b9e8f30
Fixed redundant else
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
2015-03-25 23:44:32 +01:00
e6cbffe94b
Merge pull request #11761 from runcom/11731-remove-engine-status
...
Remove engine.Status, replace with standard go error
2015-03-25 15:41:02 -07:00
1b6065de8f
Removed redundant elses
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
2015-03-25 23:34:00 +01:00
c79b9bab54
Remove engine.Status and replace it with standard go error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-25 22:32:08 +01:00
b5d0380108
Add godoc-style docstrings to Cmd... methods
...
Signed-off-by: Peggy Li <peggyli.224@gmail.com >
2015-03-25 14:17:11 -07:00
3d9cbf0e71
Merge pull request #11758 from crosbymichael/update-libct-mar25
...
Update libcontainer to a6044b701c166fe538fc760f9e2
2015-03-25 12:17:33 -07:00
161c2e5e74
Rename Fds to File Descriptors in docker info
...
This makes the docker info more readable. Also change a log line
in a test file renaming Fds
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-03-25 12:04:15 -07:00
54a607a22d
Merge pull request #11691 from matthewkmayer/feature-dont-create-bind-dirs
...
Removes bind dir creation in daemon start.
2015-03-25 11:44:13 -07:00
667df336b7
Merge pull request #11756 from vbatts/vbatts-remove_trailing_whitespaces
...
.: remove trailing white spaces
2015-03-25 11:36:10 -07:00
b4196f7892
Update libcontainer to a6044b701c166fe538fc760f9e2
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-25 11:32:14 -07:00
e6e2893fa3
Merge pull request #11753 from vbatts/vbatts-btrfs_ifdef_build_version
...
btrfs: #ifdef for build version
2015-03-25 11:25:49 -07:00
09165e0fe0
removed unnecessary tab from /usr/sbin/policy-rc.d, and /sbin/initctl
...
Signed-off-by: YAMADA Tsuyoshi <tyamada@minimum2scp.org >
2015-03-26 03:10:34 +09:00
b76e300b4c
btrfs: #ifdef for build version
...
We removed it, because upstream removed it. But now it will be coming
back, so work with it either way.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-03-25 13:56:51 -04:00
7617ec176d
.: remove trailing white spaces
...
blame tibor this one ;-)
```
find . -type f -not -name '*.png' -not -name '*.go' -not -name '*.md'
-not -name '*.tar' -not -name '*.pem' -not -path './vendor/*' -not -path
'./.git/*' -not -path '*/testdata/*' -not -path './docs/*images*' -not
-path '*/testfiles/*' -not -path './bundles/*' -not -path
'./docs/*static*/*' -not -path './docs/*article-img/*' -exec grep -HnEl
'[[:space:]]$' {} \; | xargs sed -iE 's/[[:space:]]*$//'
```
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-03-25 13:38:17 -04:00
ed7907a988
Add missing newline for bash code example
...
Signed-off-by: Zhou Xinzi <imdreamrunner@gmail.com >
2015-03-26 01:24:00 +08:00
a0cfe83435
Merge pull request #11751 from tiborvass/revert-validate-spaces
...
Revert "Dealing with trailing whitespaces"
2015-03-25 13:01:58 -04:00
444c967aec
Merge pull request #11750 from MabinGo/adjust_log_func_call
...
Use appropriate func to record logs according to different scene
2015-03-25 09:41:41 -07:00
5f7e142c46
Merge pull request #11729 from icecrime/11048_carry
...
Carry #11048
2015-03-25 09:27:07 -07:00
9359e2bed3
Merge pull request #11749 from duglin/FixLogin
...
Fix login
2015-03-25 09:22:52 -07:00
bb65c808df
Merge pull request #11730 from runcom/11725-fix-volume-initialize-error-check
...
Fix volume initialize error check
2015-03-25 09:19:42 -07:00
639d60b538
Merge pull request #11533 from hqhq/hq_fix_decode
...
fix decode data loss when using int64 in json
2015-03-25 10:17:10 -06:00
0252ad0adc
Revert "Dealing with trailing whitespaces"
...
The validation script from #10681 is too pedantic, and does not handle
well situations like:
```
cat <<EOF # or <<-EOF
Whether the leading whitespace is stripped out or not by bash
it should still be considered as valid.
EOF
```
This reverts commit 4e65c1c319tibor@docker.com >
2015-03-25 10:04:56 -06:00
0d65069a17
Fix login
...
Right now it returns:
```
FATA[0001] json: Unmarshal(non-pointer types.AuthResponse)
```
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-25 08:45:14 -07:00
f08e9f44a9
Merge pull request #11737 from duglin/FixTestOutput
...
TestBuildCancelationKillsSleep sends exec cmd to stdout
2015-03-25 08:45:09 -07:00
1d1230ea32
Fix volume initialize error check, Fixes #11725
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-25 16:36:00 +01:00
b46beb170f
Use appropriate function to record logs
...
Signed-off-by: Mabin <bin.ma@huawei.com >
2015-03-25 23:32:12 +08:00
3bed92a7bf
Merge pull request #11741 from aneshas/11720-redundant-else
...
Fixed redundant else in GetDeviceStatus
2015-03-25 08:28:38 -07:00
7c2cc476da
Merge pull request #11735 from Sirupsen/listenbuffer-promote
...
listenbuffer: add docs and test
2015-03-25 08:14:21 -07:00
be5de5bcb8
Fix the events, pull test to use v2 local server
...
Closes #10964
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-03-25 15:12:47 +00:00
dea660874c
Merge pull request #11715 from duglin/DocCliEnvVars
...
Add some info about what environment variables are available
2015-03-25 07:29:27 -07:00
67eb10defe
Merge pull request #11694 from hqhq/hq_add_memsw_example
...
docs: add memory and swap memory usage examples
2015-03-25 07:01:44 -07:00
e479e1c9f7
Fixed redundant else in GetDeviceStatus
...
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com >
2015-03-25 09:53:04 +01:00
65584318d2
Merge pull request #11738 from joeygibson/11610-split
...
api/client - The code for all cli commands are in one file #11610
2015-03-25 00:48:50 -04:00
494c41519b
Merge pull request #11733 from jfrazelle/fix-lxc
...
Get rid of panic in stats/ fix dir lxc
2015-03-25 00:41:11 -04:00
c959d26d2f
fix 2 integration tests on lxc
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
2015-03-24 21:12:16 -07:00
7dce902494
Get rid of panic in stats for lxc
...
Fix containers dir
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
2015-03-24 21:12:06 -07:00
58690c9cca
api/client - The code for all cli commands are in one file #11610
...
Signed-off-by: Joey Gibson <joey@joeygibson.com >
2015-03-24 23:57:23 -04:00
fbd47969a8
TestBuildCancelationKillsSleep send exec cmd to stdout
...
and makes the testing output ugly.
This hides the output since it not used.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-24 20:56:26 -07:00
67bd859481
listenbuffer: add docs
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
2015-03-25 03:11:34 +00:00
b6b8032a17
listenbuffer: add test
...
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com >
2015-03-25 03:11:33 +00:00
0d2190e679
Add some info about what environment variables are available
...
Having the list in one spot makes it easier for people to see what's
avaiable instead of having to scan all of the docs and extract the info.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-24 18:29:21 -07:00
a08048d5c8
Add more tests for pkg/chrootarchive
...
Fixes issue #11601
Change-Id: Ifc1dbcc59cc4dc581ed43fc8fbe43fbaec4ccad0
Signed-off-by: Yestin Sun <sunyi0804@gmail.com >
2015-03-24 18:23:28 -07:00
e8e60befd6
Code simplification that @tiborvass requested
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
2015-03-24 21:10:07 -04:00
ec5e22efe3
Changing bitflag checking style to preferred style. Fixes #11668
...
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com >
2015-03-24 21:09:25 -04:00
22dba32b4d
Merge pull request #10527 from mfojtik/lxc_11
...
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
2015-03-24 17:37:27 -07:00
d214e64032
Merge pull request #11018 from delftswa2014/10958-pidfile
...
Moves pid file operations to /pkg/
2015-03-24 17:20:52 -07:00
8900ae2928
Revert all but TestPullImageFromCentralRegistry changes
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-03-24 16:27:35 -07:00
aecc5b606f
Merge pull request #11728 from crosbymichael/lxc-mkdir
...
Mkdir for lxc root dir before setup of symlink
2015-03-24 16:25:12 -07:00
322095ed63
Merge pull request #10681 from noironetworks/whitespaces-cleaner
...
Removed all trailing whitespaces from every text file
2015-03-24 16:02:14 -07:00
772833274f
Moved pidfile from utils to pkg
...
Fixes #10958 by moving utils.daemon to pkg.pidfile.
Test cases were also added.
Updated the daemon to use the new pidfile.
Signed-off-by: Rick Wieman <git@rickw.nl >
2015-03-24 23:59:32 +01:00
246cab90f2
Mkdir for lxc root dir before setup of symlink
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-24 15:53:23 -07:00
f3fc857e01
Merge pull request #11716 from LK4D4/root_in_run
...
Use /var/run/docker as root for execdriver
2015-03-24 14:58:30 -07:00
08d75bc450
Squashed commit of the following:
...
commit d379f7645026001ce57fd6421c819f6c7df77964
Author: Matthew Mayer <matthewkmayer@gmail.com >
Date: Mon Mar 23 22:13:06 2015 -0700
Removes unused imports.
Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com >
commit 6e1f77c7f1566c8719087d88fbe06bade122691c
Author: Matthew Mayer <matthewkmayer@gmail.com >
Date: Mon Mar 23 20:41:16 2015 -0700
Removes bind dir creation in daemon start.
Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com >
Signed-off-by: Matthew Mayer <matthewkmayer@gmail.com >
2015-03-24 14:56:45 -07:00
46be6bb403
Merge pull request #11651 from vbatts/vbatts-dont_rm_dockerversion
...
make.sh: leave around the generated version
2015-03-24 14:47:42 -07:00
979283a166
Merge pull request #11726 from noxiouz/history-swap-parallel-assignment
...
History.Swap Use parallel assignment to swap elements
2015-03-24 14:43:44 -07:00
73dab8205a
Merge pull request #11679 from avidas/api-common-constants-document
...
Add comments to api/common constants
2015-03-24 14:43:09 -07:00
a4e1de58a3
Merge pull request #11727 from tiborvass/carry-11441
...
Carry 11441: fix docker ps help message
2015-03-24 14:42:02 -07:00
a153e80f72
fix docker ps help message
...
Signed-off-by: Xian Chaobo <xianchaobo@huawei.com >
2015-03-24 15:33:53 -06:00
fc325274e8
History.Swap Use parallel assignment to swap elements, as it's
...
a more idiomatic way for golang than using a temp variable.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2015-03-25 00:13:13 +03:00
46321a1e4f
Merge pull request #11713 from icecrime/update_gitignore
...
Update .gitignore
2015-03-24 14:03:31 -07:00
439e0ab23f
Merge pull request #11712 from 4gh/test_httputils
...
add tests for pkg/httputils
2015-03-24 13:56:31 -07:00
28b96cc613
Merge pull request #11663 from arthurbarr/master
...
Fix #11589 by adding README and comments to exported functions
2015-03-24 14:45:05 -06:00
8fc9e40086
Merge pull request #11417 from rhatdan/btrfs
...
Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version
2015-03-24 16:00:15 -04:00
131b29f7bc
Merge pull request #10283 from rhatdan/dev
...
We want to allow the sharing of /dev from the host into the container.
2015-03-24 12:57:44 -07:00
f7900cdd67
Merge pull request #11689 from calavera/ipallocator_refactor
...
Use a structure to keep the allocated ips pool.
2015-03-24 12:42:30 -07:00
d20ba329d1
Merge pull request #11717 from moxiegirl/tweaks-from-contributathon
...
Adding in comments from party
2015-03-24 12:18:18 -07:00
ce372cd664
Merge pull request #11709 from paulbellamy/11626-portallocator
...
Refactor global portallocator and portmapper state
2015-03-24 13:51:00 -05:00
8eee55a35c
Merge pull request #11710 from runcom/11599-refactor-pkg-common
...
Refactor pkg/common, Fixes #11599
2015-03-24 11:45:07 -07:00
7e95b13460
Use a structure to keep the allocated ips pool.
...
Fixes #11624 .
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-03-24 11:41:44 -07:00
6de806f348
Adding in comments from party
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-03-24 11:25:26 -07:00
25c4a92342
Merge branch 'master' of github.com:docker/docker into btrfs
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-03-24 14:14:54 -04:00
1e788ec985
Use /var/run/docker as root for execdriver
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-03-24 10:47:30 -07:00
557cca536f
Fix #11589 by adding README and comments to exported functions
...
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com >
2015-03-24 17:30:19 +00:00
b80fae7356
Refactor pkg/common, Fixes #11599
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-24 18:19:59 +01:00
4433b4c19e
Sort .gitignore content
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-03-24 09:40:07 -07:00
2770a88413
add tests for pkg/httputils
...
closes #11597
Signed-off-by: Frank Herrmann <fgh@4gh.tv >
2015-03-24 16:27:09 +00:00
4b4bdb5be5
Merge pull request #11697 from pdxdan/7447-GID-Doc
...
Updated Dockerfile and docker-run documentation for USER commands
2015-03-24 09:17:41 -07:00
dbd00822ec
Merge pull request #11693 from jessedearing/login_docs
...
Add documentation about the semantics of `docker login` @jessedearing thanks for the PR!
2015-03-24 09:13:53 -07:00
d827b4d235
Merge pull request #11688 from afewremarks/master
...
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
2015-03-24 09:12:00 -07:00
9d7f58100f
Merge pull request #11670 from runcom/11607-api-route-post-auth-response
...
Return AuthResponse from postAuth api endpoint
2015-03-24 08:26:07 -07:00
05c23cad85
Merge pull request #11690 from ssdonline/fix_issue_11683
...
Fixes error #11683
2015-03-24 06:28:24 -07:00
7d70736015
Add some run option to bash completion
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-03-24 20:15:16 +08:00
1ad6aae272
Merge pull request #11701 from HuKeping/typo
...
Fix minor typo
2015-03-24 08:03:09 -04:00
96d8c3584c
Fix minor typo
...
Fix minor typo and make the comments of version-comparison functions
uniform.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-03-25 00:46:22 +08:00
87df5ab41b
Refactor global portallocator and portmapper state
...
Continuation of: #11660 , working on issue #11626 .
Wrapped portmapper global state into a struct. Now portallocator and
portmapper have no global state (except configuration, and a default
instance).
Unfortunately, removing the global default instances will break
```api/server/server.go:1539```, and ```daemon/daemon.go:832```, which
both call the global portallocator directly. Fixing that would be a much
bigger change, so for now, have postponed that.
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com >
2015-03-24 11:15:30 +00:00
a5cbb5c3ae
add cpuset and examples to run.md
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-03-24 18:48:08 +08:00
babd1b3e1f
Return AuthResponse from postAuth api endpoint, Fixes #11607
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-24 09:57:01 +01:00
ed0d2ac3b7
Add documentation about the semantics of docker login
...
Fixes #10550
Signed-off-by: Jesse Dearing <jesse.dearing@gmail.com >
2015-03-23 23:53:50 -07:00
0f9c20fe68
docs: add memory and swap memory usage examples
...
fix: https://github.com/docker/docker/issues/11629
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-03-24 13:45:16 +08:00
617f18b001
Merge pull request #11692 from khoomeister/ck-fix-another-typo
...
fix test-and-docs typo "do" to "due"
2015-03-23 21:36:40 -07:00
df98ce0a28
fix test-and-docs typo "do" to "due"
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com >
2015-03-23 21:12:09 -07:00
a57d7c5c79
Added documentation for specifying groupname or GID for commands. Also clarified used of the possible use of multiple USER commands in a Dockerfile.
...
Signed-off-by: Dan Anolik <dan@anolik.net >
2015-03-23 20:47:04 -07:00
6fa6b5bcbb
Fixes error #11683
...
Signed-off-by: Swapnil Daingade <swapnil.daingade@gmail.com >
2015-03-23 23:45:55 -04:00
72394a5d7a
Merge pull request #11684 from khoomeister/ck-fix-prereq-typo
...
fix broken prerequisite link
2015-03-24 13:45:48 +10:00
c136591f40
Add comments to api/common constants, closes #11583
...
Signed-off-by: Avi Das <andas222@gmail.com >
2015-03-23 22:35:41 -05:00
ef0275c66c
RE: Issue #6114 . Updated docs to reflect docker inpsect for volumes
...
Signed-off-by: Mark West <markewest@gmail.com >
2015-03-23 20:16:40 -07:00
6dba2d01b5
Add test for net=container and links
...
Signed-off-by: willhf <willhf@gmail.com >
2015-03-23 19:50:33 -07:00
3ebd768487
Merge pull request #11681 from alena1108/master
...
Removed unused "mutex" field
2015-03-23 19:40:38 -07:00
b21751da90
fix broken prerequisite link
...
Signed-off-by: Chris Khoo <chris.khoo@gmail.com >
2015-03-23 19:22:17 -07:00
dabd8a02ae
Removed unused "mutex" field
...
fixes #11659
Signed-off-by: Alena Prokharchyk <alena@rancher.com >
2015-03-23 19:05:21 -07:00
3d28fc7d1c
#11465 Add additional doc for locagi registries onn pull command
...
Signed-off-by: John Willis <john.willis@docker.com >
2015-03-23 21:00:02 -04:00
e6b7d93072
Merge pull request #11665 from runcom/11613-api-exec-start-structured-response
...
Return ContainerExecCreateResponse from container exec create API endpoint
2015-03-23 17:52:15 -07:00
f586145cf1
Merge pull request #11634 from robertabbott/testutils_refactor
...
Refactors pkg/testutils
2015-03-23 17:30:51 -07:00
26f84d50aa
Merge pull request #11674 from jamshid/docfix
...
correcting git fetch command
2015-03-23 17:11:31 -07:00
841692ff86
correcting git fetch command
...
Signed-off-by: Jamshid Afshar <jafshar@yahoo.com >
2015-03-23 19:00:05 -05:00
d5eea4e8b0
Merge pull request #11636 from robertabbott/refactor_networkfs
...
Refactor pkg/networkfs
2015-03-23 16:58:29 -07:00
f99da5745c
Merge pull request #11672 from nparker94/master
...
Added missing code example in the RM command reference
2015-03-23 16:53:39 -07:00
4e3c72a026
Merge pull request #11667 from icecrime/integration-cli_image_cleanup
...
Cleanup "hello-world" image in build tests
2015-03-23 16:42:46 -07:00
0c3d2f6f96
Return ContainerExecCreateResponse from container exec start API endpoint, Fixes #11613
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-24 00:41:54 +01:00
92f9e2d395
Merge pull request #11657 from GeorgeMac/cleanup-redundant-else
...
#11602 - Cleanup redundant else statements find via golint
2015-03-23 18:27:29 -05:00
f7af5b0a84
Merge pull request #11666 from dmcgowan/fix-v2-get-all-tags
...
Fix v2 get all tags (carrying 11334)
2015-03-23 16:21:58 -07:00
839350d377
Merge pull request #11671 from noxiouz/11669-syslog-log-remove-redundant-stringcast
...
Syslog.Log - Remove redundant cast of msg.Line []byte to string
2015-03-23 16:16:18 -07:00
fe1f5ac77c
Added missing code example in the RM command reference of command to delete all stopped containers
...
Signed-off-by: Natalie Parker <nparker@omnifone.com >
2015-03-23 23:05:57 +00:00
5d70a97b1f
Fix the TestPullImageFromCentralRegistry to skip and add local v1 registry test when net=none
...
Closes #10966
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-03-23 22:53:04 +00:00
197a3f0a98
Merge pull request #11570 from runcom/9658-consistent-autoremove
...
Remove container if --rm flag is passed and container cannot be started
2015-03-23 15:38:51 -07:00
f2c7b4d743
Syslog.Log - Remove redundant cast of msg.Line []byte to string as
...
it's a fmt.Sprintf responsibility.
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru >
2015-03-24 01:35:54 +03:00
bcb369af11
Merge pull request #11469 from albers/completion-cp
...
restrict bash completion for hostdir arg to directories
2015-03-23 15:31:00 -07:00
9d00d8137f
Merge pull request #11422 from vbatts/vbatts-overlay_dir_mtime_changes
...
pkg/archive: ignore mtime changes on directories
2015-03-23 15:24:05 -07:00
3b4ff1c132
Merge pull request #11264 from brahmaroutu/fixtest_10967
...
Test image api through local V1 repo, skip network test.
2015-03-23 15:20:39 -07:00
bfc748221b
Cleanup "hello-world" image in build tests
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-03-23 15:16:13 -07:00
dccaf1434f
Merge pull request #11664 from crosbymichael/update-libct-mar23
...
Update libcontainer to fd0087d3acdc4c5865de1829d4accee5e3ebb658
2015-03-23 15:00:34 -07:00
4925d98d1f
Add struct tags on v2 remote tags struct
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-23 14:33:52 -07:00
221e9624e3
Fix decode tags value error when call get /v2/<name>/tags/list in registry api v2.
...
Signed-off-by: Meaglith Ma <genedna@gmail.com >
2015-03-23 14:33:52 -07:00
9f894c93e4
Merge pull request #11658 from 4gh/doc_package_builder
...
Add builder/evaluator comments for the package in godoc-style
2015-03-23 14:27:23 -07:00
ccd4181d10
Merge pull request #11545 from cpuguy83/remove_allocator_warning
...
Don't warn when ip_local_port_range not found
2015-03-23 14:19:57 -07:00
e321ec9807
Update libcontainer to fd0087d3acdc4c5865de1829d4a
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-23 14:14:20 -07:00
d852e5fde8
Merge pull request #11660 from paulbellamy/11626-portallocator
...
Refactoring portallocator away from a global var
2015-03-23 14:10:56 -07:00
a0cd004528
Add builder/evaluator comments for the package in godoc-style
...
fixes #11617
Signed-off-by: Frank Herrmann <fgh@4gh.tv >
2015-03-23 20:56:03 +00:00
1257679876
Refactor global portallocator state into a global struct
...
Signed-off-by: Paul Bellamy <paul.a.bellamy@gmail.com >
2015-03-23 20:41:41 +00:00
664ef0cbe2
Cleanup redundant else statements find via golint #11602
...
Signed-off-by: George MacRorie <gmacr31@gmail.com >
2015-03-23 20:40:29 +00:00
8e4d9f3cf9
Improve err message when parsing kernel port range
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-03-23 13:29:25 -07:00
bc73f0ea4c
Merge pull request #11656 from runcom/11611-builder-evaluator-remove-hardcoded-error
...
Remove hardcoded error from builder/evaluator.go
2015-03-23 13:25:08 -07:00
8b02d85e17
Remove hardcoded error
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-23 20:58:16 +01:00
b094677559
Merge pull request #11648 from ahmetalpbalkan/win-cli/ansi-emulation-check
...
Disable ANSI emulation in certain windows shells
2015-03-23 12:55:31 -07:00
2717302cc6
Merge pull request #11654 from runcom/11650-syslog-close-redunant-nil-check
...
syslog Close() - Remove redunant nil check, s.writer cannot be nil
2015-03-23 12:32:26 -07:00
ec27b77dc2
Merge pull request #11653 from runcom/11649-syslog-refactor-log-else-clause
...
Refactor syslog Log else clause
2015-03-23 12:29:35 -07:00
e600df2d97
Remove redunant nil check, s.writer cannot be nil
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-23 20:03:24 +01:00
8f025aae36
Refactor syslog Log else clause
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-23 20:01:01 +01:00
3a939d9987
make.sh: leave around the generated version
...
For positerity (largely of packagers) lets leave around the generated
version files that happen during build.
They're already ignored in git, and recreated on every build.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-03-23 14:46:44 -04:00
b38ff8c83d
Disable ANSI emulation in certain windows shells
...
This disables recently added ANSI emulation feature in certain Windows
shells (like ConEmu) where ANSI output is emulated by default with builtin
functionality in the shell.
MSYS (mingw) runs in cmd.exe window and it doesn't support emulation.
Cygwin doesn't even pass terminal handles to docker.exe as far as I can
tell, stdin/stdout/stderr handles are behaving like non-TTY. Therefore not
even including that in the check.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
2015-03-23 18:38:43 +00:00
65e21f5703
Merge pull request #11458 from ibuildthecloud/syslog
...
Add syslog logging driver
2015-03-23 11:34:33 -07:00
61966d281b
Merge pull request #10431 from duglin/Issue10391
...
Clarify ENV non-recursivenes w.r.t. env var substitution + fix escaping
2015-03-23 13:30:11 -05:00
85ab3c3b49
Merge pull request #11573 from icecrime/11572-restore_pull_test
...
Restore TestPullVerified test
2015-03-23 11:21:16 -07:00
1fe55b2f8b
Merge pull request #10365 from cpuguy83/9981_fix_cannot_overwrite_nonbind_as_bind
...
Allow path from normal volume existing to overwrite in start Binds
2015-03-23 10:43:02 -07:00
bd95202161
Merge pull request #11406 from MabinGo/CmdStart_fix
...
Fix hanging up problem when start and attach multiple containers at once
2015-03-23 10:17:50 -07:00
c4603de56a
Merge pull request #10347 from unclejack/bufreader_reset
...
reset bufReader to avoid extreme growth of buffers
2015-03-23 10:07:43 -07:00
56acb1aac8
Merge pull request #11395 from mitchcapper/master
...
Change windows default permissions to 755 not 711, read access for all p...
2015-03-23 09:59:40 -07:00
bf304cc414
Merge pull request #11574 from icecrime/release_version_push
...
Document VERSION file update scheme
2015-03-23 09:47:16 -07:00
5daa9260bc
Test image api through local V1 repo
...
Closes #10967
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-03-23 16:45:48 +00:00
d124197cc7
Remove container if --rm flag is passed and container cannot be started
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-03-23 13:03:31 +01:00
a91b2431a3
Refactor pkg/networkfs
...
Solves #11591
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
2015-03-22 23:53:47 -07:00
5de1e7bc3a
Refactors pkg/testutils
...
Solves #11579 .
Signed-off-by: bobby abbott <ttobbaybbob@gmail.com >
2015-03-22 22:31:46 -07:00
7dc1af146d
Fix hanging up problem when start and attach multiple containers
...
Signed-off-by: Mabin <bin.ma@huawei.com >
2015-03-23 12:10:22 +08:00
f07ac12791
Document VERSION file update scheme
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-03-22 18:45:01 -07:00
33448ac3c9
Restore TestPullVerified test
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-03-22 17:56:05 -07:00
eaecd8b1b5
add syslog driver
...
Signed-off-by: wlan0 <sid@rancher.com >
2015-03-21 18:01:18 -07:00
b7dc9040f0
Change windows default permissions to 755 not 711, read access for all poses little security risk and prevents breaking existing Dockerfiles
...
Signed-off-by: Mitch Capper <mitch.capper@gmail.com >
2015-03-20 21:54:33 -07:00
6d66e3e7a5
Fix some escaping around env var processing
...
Clarify in the docs that ENV is not recursive
Closes #10391
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-03-20 20:09:00 -07:00
0aa250bd60
fix decode data loss when using int64 in json
...
The problem is when I create container though REST api, set memory limit
in hostConfig, the memory limit didn't work. Because when we DecodeEnv,
we got hostConfig part of Env like this:
{"Binds":["/:/tmp"],"CpuShares":512,"CpusetCpus":"0,1","Devices":[],"Memory":1.6777216e+07,"MemorySwap":0}
And we cannot unmarshal number 1.6777216e+07 into Go value of type int64,
so we got 0.
We can fix this by setting Decoder as UseNumber().
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-03-21 10:16:18 +08:00
3c136333af
Btrfs has eliminated the BTRFS_BUILD_VERSION in latest version
...
They say we should only use the BTRFS_LIB_VERSION
They will no longer support this since it had to be managed manually
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-03-20 11:43:53 -04:00
fe9fe1473c
We want to allow the sharing of /dev from the host into the
...
container.
docker run -v /dev:/dev should stop mounting other default mounts in i
libcontainer otherwise directories and devices like /dev/ptx get mishandled.
We want to be able to run libvirtd for launching vms and it needs
access to the hosts /dev. This is a key componant of OpenStack.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-03-20 08:56:21 -04:00
d62f25e422
Fix lxc-start in lxc>1.1.0 where containers start daemonized by default
...
Signed-off-by: Michal Fojtik <mfojtik@redhat.com >
2015-03-19 14:51:05 +01:00
e5ea2b2357
pkg/ioutils: avoid huge Buffer growth in bufreader
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-03-18 19:51:55 +02:00
028f7987fe
pkg/ioutils: add tests for BufReader
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-03-18 19:32:46 +02:00
418b7a9abb
restrict bash completion for hostdir arg to directories
...
The previous state assumed that the HOSTPATH argument referred to a
file. As clarified by moxiegirl in PR #11305 , it is a directory.
Adjusted completion to reflect this.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-03-18 18:10:58 +01:00
2ce37f6616
pkg/archive: ignore mtime changes on directories
...
on overlay fs, the mtime of directories changes in a container where new
files are added in an upper layer (e.g. '/etc'). This flags the
directory as a change where there was none.
Closes #9874
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-03-17 10:53:34 -04:00
4e65c1c319
Dealing with trailing whitespaces
...
Created a validation that detects all trailing whitespaces from every
text file that isn't *.go, *.md, vendor/*,
docs/theme/mkdocs/tipuesearch*
Removed trailing whitespaces from every text file except from vendor/*
builder/parser/testfiles*, docs/theme/mkdocs/tipuesearch* and *.md
Signed-off-by: André Martins <martins@noironetworks.com >
2015-03-17 03:34:01 +00:00
ab181ce557
Fixed handling hardlinks to symlinks in tar stream
...
Signed-off-by: Iavael <iavaelooeyt@gmail.com >
2015-03-03 16:10:53 +03:00
49e1ad49c8
Allow normal volume to overwrite in start Binds
...
Fixes #9981
Allows a volume which was created by docker (ie, in
/var/lib/docker/vfs/dir) to be used as a Bind argument via the container
start API and overwrite an existing volume.
For example:
```bash
docker create -v /foo --name one
docker create -v /foo --name two
```
This allows the volume from `one` to be passed into the container start
API as a bind to `two`, and it will overwrite it.
This was possible before 7107898d5ccpuguy83@gmail.com >
2015-02-10 20:46:37 -05:00
David Calavera
