6743a6e665
Merge pull request #16111 from Mashimiao/fix-typo-daemon-daemon
...
daemon/daemon: fix typo
2015-09-07 09:31:54 +02:00
89f99343ff
daemon/daemon: fix typo
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-09-07 14:43:22 +08:00
7ce97dbe30
Merge pull request #16102 from HuKeping/rmdeadcode
...
Remove dead code
2015-09-06 08:40:45 -04:00
c957d9c768
Remove dead code
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-09-06 19:52:39 +08:00
8562c423b8
Merge pull request #16091 from sallyom/man-docker-pull
...
correct man docker-pull
2015-09-05 14:14:11 +02:00
e4f721e73e
Merge pull request #16082 from sallyom/manDocker
...
add --insecure-registry warning to online docs
2015-09-05 22:06:45 +10:00
835acd96ec
Merge pull request #15992 from Microsoft/10662-cli
...
Windows: Get Integration CLI running
2015-09-04 13:38:41 -07:00
73fe42e3db
correct man docker-pull
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-09-04 16:34:40 -04:00
f9a3558a9d
Windows: Get Integration CLI running
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-04 12:32:40 -07:00
bc915d0856
Merge pull request #16087 from Microsoft/turn-off-dockerhubpull-suite
...
Temp: Turn off dockerhubpullsuite on Win2Linux CI
2015-09-04 12:30:06 -07:00
0b18b1b309
Temp: Turn off dockerhubpullsuite on Win2Linux CI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-04 11:53:40 -07:00
6b14d9a645
Merge pull request #16065 from Microsoft/10662-fix2panics
...
Fixes 2 panics initialising tests
2015-09-04 11:07:17 -07:00
5b46d8f0fa
Merge pull request #16039 from icecrime/update_pull_tests
...
Update pull tests
2015-09-04 09:52:41 -07:00
7c667f9d6e
Merge pull request #15999 from cpuguy83/15994_ext_volume_bind
...
Set bind driver after volume is created
2015-09-04 09:47:10 -07:00
5446aac0e5
add --insecure-registry warning to online docs
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-09-04 10:28:35 -04:00
4a0606423b
Merge pull request #16043 from sallyom/manDockerfile
...
man Dockerfile ADD/COPY/FROM clarify
2015-09-04 10:03:50 +02:00
409212be24
Merge pull request #16057 from sallyom/manDocker
...
clarify --insecure-registry in man docker
2015-09-04 09:56:01 +02:00
0009852cb0
Merge pull request #15877 from Microsoft/10662-trigger
...
Fix trigger count and output
2015-09-03 20:04:05 -07:00
38ecc7fc32
Merge pull request #16054 from jfrazelle/update-sqlite3-dep
...
code.google.com is shutting down so update the dep
2015-09-03 19:20:57 -07:00
69bf17ffbd
Fixes 2 panics initialising tests
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-03 18:26:38 -07:00
90477e8e94
Merge pull request #16066 from jfrazelle/remove-reprepro
...
remove reprepro
2015-09-03 18:20:01 -07:00
1fa560e6eb
Merge pull request #15706 from clnperez/vendor-helper-use-branch
...
Allow branch name in vendor-helper script
2015-09-03 18:02:06 -07:00
b019229996
Merge pull request #16052 from jfrazelle/fix-release-selinux
...
make docker-engine-selinux findable
2015-09-03 17:52:39 -07:00
c8c1c472b2
Merge pull request #15845 from calavera/refactor_daemon_list
...
Refactor daemon container list.
2015-09-03 20:48:54 -04:00
057f53f503
Merge pull request #15846 from ZJU-SEL/11646-fix-path-validations
...
fix 11646 to check volume path in server side
2015-09-03 20:42:37 -04:00
4a864a7552
code.google.com is shutting down so update the dep
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-09-03 17:39:29 -07:00
6620102926
Fix trigger count and output
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-03 17:39:19 -07:00
e7cf75c103
remove reprepro
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-09-03 17:31:49 -07:00
07d2eae6d5
Merge pull request #16060 from vdemeester/14756-lint-pkg-term-windows
...
Lint pkg/term/windows package
2015-09-03 19:54:20 -04:00
2d605ce53b
Merge pull request #16041 from runcom/portmapping-doc-cleaning
...
Clean latest api doc from PortMapping and outdated error check
2015-09-03 19:37:34 -04:00
9b072fb722
Merge pull request #16067 from jfrazelle/fix-release-branch-in-suites-script
...
fix release branch in suites.sh
2015-09-03 16:33:32 -07:00
f324f4851f
Update image pull tests
...
Update and migrate existing tests to the `DockerHubPullSuite`. Most
tests were preserved, but refactored and made more exhaustive. One test
was deliberately removed (`TestPullVerified`) as it is unreliable and
that the feature was obsoleted by content trust.
Move all trust related tests to `docker_cli_pull_trusted_test.go`.
Move tests depending on a local registry to `docker_cli_pull_local_test.go`.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-09-03 15:57:41 -07:00
c87cbd3862
Add integration-cli/checker package
...
Add a `checker` package that adds some utility Checker implementation,
the first one being `checker.Contains`, as well as brining all go-check
provided Checker implementations in scope as a commodity.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-09-03 15:57:41 -07:00
e38a9ecef6
fix release branch in suites.sh
...
we changed the naming scheme of the release branch
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-09-03 15:48:02 -07:00
6ffbea3c94
Merge pull request #16027 from Microsoft/10662-utimes
...
Windows: Fix dockerfile ADD from HTTP
2015-09-03 18:44:34 -04:00
f0a5d03400
Merge pull request #16022 from nalind/cgo-windows
...
Fix a daemon build error when cgo isn't available
2015-09-03 18:42:58 -04:00
2d9ea188d4
clarify --insecure-registry in man docker
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-09-03 17:10:40 -04:00
3409de971c
Lint pkg/term/windows package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-09-03 22:25:52 +02:00
9d0eef55ea
Merge pull request #16025 from sallyom/overlayfsSelinux
...
selinux/overlay incompatible err
2015-09-03 16:08:55 -04:00
6f5eb78519
Merge pull request #16018 from surya-shodan/master
...
Typo in README.md
2015-09-03 11:57:06 -07:00
8258996cf2
Merge pull request #16036 from Microsoft/10662-httpdirectory
...
Windows: Fix HTTP download directory
2015-09-03 11:54:53 -07:00
288275ab60
Merge pull request #16038 from aboch/sbx
...
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
2015-09-03 11:48:02 -07:00
c7b3e7e770
make docker-engine-selinux findable
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-09-03 08:58:33 -07:00
48badd2a2e
man Dockerfile ADD/COPY/FROM clarify
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-09-03 09:08:25 -04:00
d9065fcdb5
Merge pull request #16001 from jfrazelle/apt-repo-pinning
...
use apt-ftparchive and reprepro to enable apt-pinning;
2015-09-03 11:18:54 +02:00
137c12f19a
Clean latest api doc from PortMapping and outdated error check
...
Regarding the outdated error check, there's no `docker.PortMapping`
struct anymore and this is linked to something really old #1334
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-09-03 11:01:55 +02:00
ee4de4d163
Merge pull request #15984 from jlhawn/document_build_auth_config
...
[docs] Add description of "X-Registry-Config"
2015-09-03 08:40:34 +02:00
9e4addde76
Add test suite for push/pull code
...
Introduce the `DockerHubPullSuite` that interacts with its own dedicated
daemon, thus allowing to start from a clean environment and finely test
against the impact of isolated push and pull operations.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-09-02 22:06:24 -07:00
2bd30cd6cb
Merge pull request #16035 from aaronlehmann/remove-test-push-interrupt
...
Remove TestPushInterrupt
2015-09-02 21:07:55 -07:00
56fdb05258
Docker changes for libnetwork Sandbox
...
- Ground-work for integrating with user namespace support
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-09-02 17:24:56 -07:00
39be36658d
Set bind driver after volume is created
...
When using a named volume without --volume-driver, the driver was
hardcoded to "local".
Even when the volume was already created by some other driver (and
visible in `docker volume ls`), the container would store in it's own
config that it was the `local` driver.
The external driver would work perfecly fine until the daemon is
restarted, at which point the `local` driver was assumed because that is
as it was set in the container config.
Set the bind driver to the driver returned by createVolume.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-09-02 20:13:20 -04:00
fb4cce5e53
Merge pull request #16030 from Microsoft/fix-golint-commit
...
Windows: Fix golint daemon breaking commit
2015-09-02 20:10:33 -04:00
414dfbf681
Vendor libnetwork dc52820147f40fe424c8959987af3b396f842639
...
Main changes in this vendoring are to allow user name space integration in docker.
And it includes major fix for network namespace handling
Signed-off-by: Alessandro Boch <aboch@docker.com >
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-09-02 16:57:43 -07:00
7beb026f0e
Windows: Fix HTTP download directory
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-02 16:24:53 -07:00
c6dd451073
Merge pull request #16002 from Microsoft/10662-workdir-platformsemantics
...
Windows: Ensure workdir handled in platform semantics
2015-09-02 16:09:35 -07:00
04329e0b3e
selinux/overlay incompatible err
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-09-02 18:52:10 -04:00
6cc38775bb
Remove TestPushInterrupt
...
This test relies on a race condition, and has been failing often in CI.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-09-02 15:30:55 -07:00
cfddca2bf9
Windows: Fix golint daemon breaking commit
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-02 14:36:45 -07:00
3715e60c71
Windows: Fix dockerfile ADD from HTTP
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-02 13:53:09 -07:00
2434bd8e63
Merge pull request #15935 from vdemeester/badges-all-the-things
...
Add more badges :)
2015-09-02 11:07:25 -07:00
12a71c8954
use apt-ftparchive and reprepro to enable apt-pinning;
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-09-02 09:32:24 -07:00
8c5d511aa6
Merge pull request #16020 from runcom/remove-port-mapping-field
...
Remove PortMapping from container NetworkSettings
2015-09-02 09:10:38 -07:00
00ab6d9d47
Fix a daemon build error when cgo isn't available
...
Avoid duplicate definitions of NewSqliteConn when cgo isn't enabled, so
that we can at least build the daemon.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com > (github: nalind)
2015-09-02 11:41:42 -04:00
db4f20404d
Remove PortMapping from container NetworkSettings
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-09-02 14:32:53 +02:00
dae50f9b5e
Typo in README.md
...
The number of StackOverflow question is 7000, not 7000k. The extra 'k' is redundant.
Signed-off-by: Suryakumar Sudar <suryakumar.sudar@gmail.com >
2015-09-02 15:52:05 +05:30
9ea7267285
Merge pull request #16014 from angt/angt-patch-2
...
Fix typo
2015-09-02 11:25:12 +02:00
1ed3cb2b6c
Merge pull request #15921 from srust/volume_driver_register_retry
...
Retry registering a volume driver
2015-09-02 11:24:52 +02:00
4c54751cab
Merge pull request #16007 from toddjcrane/master
...
Normalized, ungrouped, and sorted names
2015-09-02 11:24:42 +02:00
01059cba78
Fix typo
...
Signed-off-by: Adrien Gallouët <agallouet@gmail.com >
2015-09-02 10:43:49 +02:00
ed14fe2afa
Normalized, ungrouped, and sorted names
...
Signed-off-by: Todd Crane <todd@toddcrane.com >
2015-09-01 21:57:01 -07:00
6c56f917d3
Windows: Ensure workdir handled in platform semantics
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-01 18:50:41 -07:00
7f8954cb79
Merge pull request #15989 from tianon/ubuntu
...
Swap "ubuntu-debootstrap" for just "ubuntu"
2015-09-01 15:19:16 -07:00
3111aa7293
Merge pull request #15988 from runcom/use-stringutils-strslice
...
Use StrSlice from pkg/stringutils
2015-09-01 14:32:58 -07:00
a5eec723f8
Swap "ubuntu-debootstrap" for just "ubuntu"
...
See https://github.com/docker-library/official-images/pull/982#issuecomment-133207587 .
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-09-01 14:03:49 -07:00
7c44209037
Merge pull request #15986 from runcom/add-strslice-tests
...
pkg: stringutils: Add more tests to strslice
2015-09-01 12:29:27 -07:00
17999c70c3
Use StrSlice from pkg/stringutils
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-09-01 21:23:46 +02:00
45fdce8a0d
Retry registering a volume driver
...
Signed-off-by: Stephen Rust <srust@blockbridge.com >
2015-09-01 14:56:29 -04:00
cac8f4f0d0
pkg: stringutils: Add more tests to strslice
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-09-01 20:27:45 +02:00
70f0d6d84c
Merge pull request #15983 from Microsoft/unix-run-test
...
Move run tests out of unix files
2015-09-01 10:49:01 -07:00
61de962979
[docs] Add description of "X-Registry-Config"
...
The structure of this header has never been specified in the docs and has
been a pain point for those who have tried to get registry authentication
to work during builds. This Patch *finally* adds a description of JSON
object which should be base64-url-safe-encoded and used as the value of
the X-Registry-Config HTTP request header during `POST /build`.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-09-01 10:05:30 -07:00
82415adc81
Merge pull request #15980 from Microsoft/unix-links-test
...
Moved unix links tests to non-platform
2015-09-01 10:03:54 -07:00
d7eb85bb1f
Move run tests out of unix files
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-01 09:42:19 -07:00
2093616d7f
Merge pull request #15871 from Microsoft/10662-absolute
...
Windows: Fix absolute checks
2015-09-01 18:38:36 +02:00
7f58fb5f01
Merge pull request #15972 from calavera/remove_containers_ps
...
Remove /containers/ps from the api router.
2015-09-01 09:15:35 -07:00
4fccf8adfa
Moved unix links tests to non-platform
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-01 09:10:24 -07:00
be8e126a0f
Merge pull request #15834 from Microsoft/10662-fixdockercp
...
Windows: Fix docker cp
2015-09-01 08:41:59 -07:00
49c1b51ae2
Windows: Fix absolute checks
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-09-01 08:41:37 -07:00
26fb160610
Merge pull request #15976 from duglin/MissingDefer
...
Add missing defer to delete temp dir
2015-09-01 17:13:37 +02:00
4bb2449188
Merge pull request #15913 from mountkin/abstract
...
abstract the string slice struct to stringutils package
2015-09-01 17:06:13 +02:00
51e721ab07
Add missing defer to delete temp dir
...
Minor thing I just noticed
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-09-01 07:19:38 -07:00
3b2c9fa049
Merge pull request #15965 from tonistiigi/pull-goroutine-leak
...
Fix goroutine leak on pull
2015-09-01 09:27:55 -04:00
567687fd98
Merge pull request #15900 from Microsoft/10662-testinfra
...
Test infrastructure for cross platform
2015-09-01 09:18:29 -04:00
5eb4a6b933
Merge pull request #15927 from SvenDowideit/clean-up-parsehost
...
Change ParseTCPAddr to use tcp://127.0.0.0:2375 format as default consistently
2015-09-01 08:25:59 -04:00
e98ec2b567
Merge pull request #15970 from Mashimiao/cleanup-daemon-commit-unneeded-code
...
daemon/commit: remove unneeded code
2015-09-01 14:15:56 +02:00
dd49002055
Merge pull request #15958 from vdemeester/14570-contrib-completion-image
...
Add docker ps --filter=… ancestor image bash completion
2015-09-01 12:16:52 +02:00
b5cc077864
Remove /containers/ps from the api router.
...
This route was deprecated more than two years ago in the linked
commit[1]. It's not referenced anywhere in the documentation and it's
time to stop maintaning it.
[1]: https://github.com/docker/docker/commit/4f9443927e8bc8a724b43afae6cf7a183cd9acd0
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-09-01 05:17:35 -04:00
ab868ad79c
daemon/commit: remove unneeded code
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-09-01 16:34:07 +08:00
6ae2cb7ad1
Add docker ps --filter=… image completion
...
I missed that on #15919 , thanks @albers
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-09-01 08:47:02 +02:00
d080f6524b
Merge pull request #15969 from charleswhchan/issue-15939
...
Fix issue #15939 : Hyperlink to MongoDB Dockerfile not found.
2015-09-01 08:33:22 +02:00
f814ae437f
Fix issue #15939 : Hyperlink to MongoDB Dockerfile not found. Replaced with link to file in Github.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-31 19:28:36 -07:00
84bc41a3fb
Merge pull request #15963 from Microsoft/fix-unixtestport
...
Move TestPort out of _unix
2015-08-31 17:09:59 -07:00
0f878cfa00
Merge pull request #15966 from Microsoft/test-typo
...
Fix typo in test title
2015-08-31 18:59:55 -04:00
3037e4f7c4
Fix goroutine leak on pull
...
Close the pipeWriter even if there was no error.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-31 15:56:19 -07:00
3c2b128582
Fix typo in test title
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-31 15:28:40 -07:00
68c7d24a12
Move TestPort out of _unix
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-31 14:40:36 -07:00
166412e529
Merge pull request #15827 from williamh/fix-openrc-script
...
Fix openrc script
2015-08-31 20:32:00 +02:00
c844effeda
Merge pull request #15926 from moxiegirl/carry-15210
...
add: best practice for security when sharing host directories.
2015-08-31 19:51:15 +02:00
7271dca8cc
updating again.
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-31 09:56:35 -07:00
95495d20be
Updating with SEb's comments
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-31 09:54:15 -07:00
3bd8016259
Merge pull request #15922 from unclejack/lower_reset_timeout_bufreader
...
pkg/ioutils: lower bufReader reset timeout
2015-08-31 18:43:45 +02:00
84614fdae0
Merge pull request #15489 from aaronlehmann/pull-updates
...
Show pull progress in terminal for inflight pull requests
2015-08-31 09:37:33 -07:00
38ac1f908e
Merge pull request #15920 from mikebrow/docker-engine-update-to-index
...
Adding additional instructions to the Docker Engine installation/inde…
2015-08-31 09:35:34 -07:00
b0fd4f882f
add: best practice for security when sharing host directories.
...
Closes and carries PR #15210
Updating with Seb's comment
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-31 09:32:42 -07:00
96974170f8
Merge pull request #15606 from jlhawn/img_delete
...
[daemon] Refactor image_delete.go
2015-08-31 18:22:48 +02:00
cd18e7bb73
Test infrastructure for cross platform
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-31 09:10:18 -07:00
4ae81e145e
Merge pull request #15918 from duglin/HttpHeaderTests
...
More httputil tests for the docker header
2015-08-31 08:48:28 -07:00
3272b3d120
Merge pull request #15954 from jfrazelle/no-t-install-script
...
we dont need the tty in the install script
2015-08-31 08:45:35 -07:00
754c10430b
Merge pull request #15807 from coolljt0725/remove_remove_redundant_tag_name
...
Minor fix: remove redundant tag name in error message of create failed.
2015-08-31 11:34:40 -04:00
e9eaef6f1e
Adding additional instructions to the Docker Engine installation/index page per discussions with @moxiegirl.
...
Removed the "Other Linux" heading; Changed the "Next Steps" heading to "Where to go After Installing"
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
2015-08-31 10:25:41 -05:00
80c32162b5
we dont need the tty in the install script
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-31 08:12:01 -07:00
81d6f350f7
Merge pull request #13266 from shishir-a412ed/docker_lvm_devmapper_loopbackdevices
...
Warning message for lvm devmapper running on top of loopback devices
2015-08-31 16:40:16 +02:00
4870fb36d4
Warning message for lvm devmapper running on top of loopback devices
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2015-08-31 10:35:48 -04:00
06699f73fb
Refactor daemon container list.
...
Separate container iteration, filtering and reducing.
This will make easier in the future to improve the implementation of
docker ps as we know it.
The end goal is to unify the objects returned by the api for docker ps
and docker inspect, leaving all docker ps transformations to the client.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-31 04:24:08 -04:00
754d81bd69
Merge pull request #15873 from cpuguy83/no_args_for_volume_subcmd
...
Fix `docker volume invalidarg` so it displays usage
2015-08-31 10:04:45 +02:00
998699316c
Merge pull request #15901 from Microsoft/10662-revendorhcs
...
Windows: Revendor HCSShim with godoc
2015-08-31 10:03:18 +02:00
d6a94fbf22
Merge pull request #15919 from vdemeester/14570-contrib-completion
...
Update shell completion on docker ps for ancestor
2015-08-31 09:58:05 +02:00
9703c3a90e
Merge pull request #15914 from dmcgowan/fix-upload-sanitize
...
Fix sanitize URL bug on layer upload
2015-08-31 09:35:28 +02:00
50be74ba14
just check -v /src:dest and test it
...
Signed-off-by: xlgao <xlgao@zju.edu.cn >
2015-08-31 10:50:49 +08:00
10005433eb
Add jenkins and godoc badges
...
Build badges are for master and one for experimental (in the `README.md`
of the experimental folder)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-30 21:31:13 +02:00
16220e0681
Minor fix: remove redundant tag name in error message of create failed.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-30 10:43:33 +08:00
e137f2d081
Merge pull request #15932 from lyndaoleary/15909-daemon-flag
...
Removed deprecated -d flag from docs
2015-08-29 22:10:35 -04:00
ad91d2e97a
Merge pull request #15929 from jjn2009/patch-1
...
ubuntu-14-10-x64 is not a valid image on digital ocean
2015-08-30 02:54:16 +02:00
bace51571f
Merge pull request #15925 from moxiegirl/carry-14234
...
Closes #14234 and updates text
2015-08-30 01:33:57 +02:00
55468e2ac4
Removed deprecated -d flag from docs
...
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com >
2015-08-29 23:31:27 +01:00
fd1b21b646
Merge pull request #15885 from tombee/7866-10463-runmetrics-doc-updates
...
Updated runmetrics article to use up-to-date cgroup paths
2015-08-29 13:36:20 -07:00
2920550211
Closes #14234 and updates text
...
Updating with Seb's comments
Entering Sven's comment
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-29 13:15:36 -07:00
626c05036c
Merge pull request #15832 from jfrazelle/add-docker-seliux-policy-for-rpm
...
Add docker seliux policy for rpm
2015-08-29 11:07:20 -07:00
3d510f15da
Change ParseTCPAddr to use tcp://127.0.0.0:2375 format as default consistently
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-08-29 11:23:51 +00:00
24c4594cc3
ubuntu-14-10-x64 is not a valid image on digital ocean
...
Signed-off-by: Jordan Jennings <jjn2009@gmail.com >
2015-08-28 23:59:30 -07:00
8fe675d799
add selinux-policy and docker-engine-selinux rpm
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-28 17:54:04 -07:00
42d8fe6105
add build deps for selinux-policy/selinux-policy-devel
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-28 17:43:30 -07:00
df6d928370
update spec file to require docker-engine-selinux policy
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-28 17:43:30 -07:00
b1c1f42bcc
Fix sanitize URL bug on layer upload
...
Update the distribution version to include sanitize URL fix
Fixes #15875
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-08-28 14:35:06 -07:00
0b2cff35ba
Merge pull request #15917 from srust/volume_create_dont_lock_around_volume_driver
...
Don't hold lock around volume driver for volume create.
2015-08-28 17:13:47 -04:00
0ef740a5bf
Don't hold lock around volume driver for volume create.
...
Signed-off-by: Stephen Rust <srust@blockbridge.com >
2015-08-28 16:28:28 -04:00
f9df813a99
pkg/ioutils: lower bufReader reset timeout
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
2015-08-28 23:13:02 +03:00
5e540bdc13
More httputil tests for the docker header
...
follow-on to #15911
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-08-28 12:16:37 -07:00
672bae2dc0
Update shell completion on docker ps for ancestor
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-28 20:56:52 +02:00
111d2f3487
[daemon] Refactor image_delete.go
...
This file was not well documented and had very high cyclomatic complexity.
This patch completely rearranges this file and the ImageDelete method to
be easier to follow and more maintainable in the future.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-08-28 11:01:24 -07:00
b1cb1b1df4
Merge pull request #14570 from vdemeester/13365-ps-image-filter
...
Add docker ps ancestor filter for image
2015-08-28 19:47:43 +02:00
279bbbedb2
Merge pull request #15872 from lyndaoleary/find-an-issue-style-updates
...
Style updates to find an issue page
2015-08-28 19:18:19 +02:00
317a5462e4
Make the broadcaster write messages to the observers in the same units they were written to the broadcaster
...
This means the writing to a WriteFlusher will flush in the same places
as it would if the broadcaster wasn't sitting in front of it.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-08-28 10:09:00 -07:00
ea4a06740b
abstract the string slice struct to stringutils package
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-08-29 01:08:40 +08:00
50bcf17c39
Merge pull request #15902 from SvenDowideit/add-more-tests-for-parsehost
...
Exploring the parsehost using unit tests
2015-08-28 09:14:35 -07:00
e6e210164e
Merge pull request #15910 from mimoralea/patch-1
...
Typo fix then -> than
2015-08-28 18:09:26 +02:00
2a66beef7f
Merge pull request #15911 from calavera/carry_14296
...
[Carry 14296] Increased test coverage of pkg/httputils
2015-08-28 09:04:43 -07:00
95e3a4ca6d
Typo fix then -> than
...
Signed-off-by: Miguel Morales <mimoralea@hp.com >
2015-08-28 10:44:39 -05:00
433956cc47
Merge pull request #15310 from MHBauer/demon-lint-squash
...
golint fixes for daemon/ package
2015-08-28 17:34:36 +02:00
6caaa8a635
Merge pull request #15023 from hqhq/hq_add_status_in_inspect
...
Add status string to State field for inspect
2015-08-28 08:27:36 -07:00
243f98ff6d
Fix server header parsing.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-28 11:06:24 -04:00
f753f6d597
unit test refactor in pkg/httputils as suggested by vdemeester; using pattern if x := …; x == nil {}
...
Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com >
(cherry picked from commit c3f1b2a5bd4a4330bcbad401c316af90925b99ad)
2015-08-28 10:41:19 -04:00
b3f999e863
Increased test coverage of httputils to 70 %
...
Signed-off-by: Kristina Zabunova <triara.xiii@gmail.com >
(cherry picked from commit d71817464e859cd323d6cdaf4dec5a9dd530f57e)
2015-08-28 10:41:19 -04:00
e48a222828
Exploring the code using unit tests - these 2 functions do not work consistently
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-08-28 10:29:52 +00:00
abd72d4008
golint fixes for daemon/ package
...
- some method names were changed to have a 'Locking' suffix, as the
downcased versions already existed, and the existing functions simply
had locks around the already downcased version.
- deleting unused functions
- package comment
- magic numbers replaced by golang constants
- comments all over
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-08-27 22:07:42 -07:00
5a5f9e93e9
Windows: Revendor HCSShim with godoc
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-08-27 15:46:00 -07:00
6f22cc9b5c
Style updates to find an issue page
...
* Fixed exp/beginner label colour background
* Added thead element to label table
* Updated issue list screenshot (old one referenced old whitebelt label)
* Content tweaks as per style guide
Signed-off-by: Lynda O'Leary <lyndaoleary29@gmail.com >
2015-08-27 23:05:00 +01:00
fdc73cc3fc
Merge pull request #15778 from dharmit/13595-update-docs-process-interaction-container
...
Added note about process interaction with container in detached mode
2015-08-27 22:39:20 +02:00
9b9d70ad27
Remove "...already being pulled" messages
...
These don't get seen, so they are unnecessary.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-08-27 13:22:08 -07:00
26c9b58504
Clean up ProgressStatus
...
- Rename to Broadcaster
- Document exported types
- Change Wait function to just wait. Writing a message to the writer and
adding the writer to the observers list are now handled by separate
function calls.
- Avoid importing logrus (the condition where it was used should never
happen, anyway).
- Make writes non-blocking
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-08-27 13:22:08 -07:00
ba019dc0d0
Merge pull request #15882 from vdemeester/14756-lint-opts-trust
...
Carry #14813 on linting package opts and trust
2015-08-27 15:58:13 -04:00
0ca2c3abf5
Merge pull request #15893 from tonistiigi/fix-testsuite
...
Use DockerSuite for PullClientDisconnect test
2015-08-27 12:30:44 -07:00
9dd6c8822d
Use DockerSuite for PullClientDisconnect test
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-27 11:22:54 -07:00
80513d85cf
Change poolAdd to return a boolean instead of an error
...
Previously, its other return value was used even when it returned an
error. This is awkward and goes against the convention. It also could
have resulted in a nil pointer dereference when an error was returned
because of an unknown pool type. This changes the unknown pool type
error to a panic (since the pool types are hardcoded at call sites and
must always be "push" or "pull"), and returns a "found" boolean instead
of an error.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-08-27 11:18:42 -07:00
572f008e89
Show pull progress in terminal for inflight pull requests
...
Based on #12874 from Sam Abed <sam.abed@gmail.com >. His original commit
was brought up to date by manually porting the changes in pull.go into
the new code in pull_v1.go and pull_v2.go.
Fixes #8385
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-08-27 11:18:40 -07:00
04b0fb6314
Merge pull request #15822 from vdemeester/docs-update-filtering-ps-and-images
...
Update filtering chapters on ps/images references
2015-08-27 10:39:20 -07:00
0634c653d5
Merge pull request #15646 from tonistiigi/15589-pull-cancellation
...
Fix pull on client disconnect
2015-08-27 17:54:08 +02:00
0bd016b1c3
Finish linting opts and trust package.
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-27 17:36:11 +02:00
38da43184d
Fix docker volume invalid so it displays usage
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-27 09:46:05 -04:00
5572148477
golint: trust
...
contributes to #14756
Signed-off-by: Sevki Hasirci <s@sevki.org >
2015-08-27 11:40:27 +02:00
6eb03c53db
Opts lint issues, ip and ulimit
...
Signed-off-by: Sevki Hasirci <s@sevki.org >
2015-08-27 11:40:27 +02:00
b582977bc8
Updated to use correct cgroup paths
...
Signed-off-by: Tom Barlow <tomwbarlow@gmail.com >
2015-08-27 10:39:37 +01:00
4579d5ac78
Merge pull request #15878 from brahmaroutu/vendor_netns
...
Allow vendoring netns changes to build Docker on s390x
2015-08-27 10:02:25 +02:00
61de442c49
Update filtering chapters on ps/images references
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-27 08:47:03 +02:00
9f8891a855
Added note about process interaction with container in detached mode
...
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
Added note about process interaction with container in detached mode
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
2015-08-27 09:39:34 +05:30
44ea7e91fb
Merge pull request #15760 from mikebrow/9235-improve-documentation
...
Improvement to userguide/dockerrepos/ documentation
2015-08-27 01:21:12 +02:00
5caccd27cd
improvement to documentation
...
Signed-off-by: Mike Brown <brownwm@us.ibm.com >
2015-08-26 16:49:31 -05:00
5e8038d0b0
Merge pull request #15773 from charleswhchan/patch-3
...
Fix #14572 : Improve explaination for using `RUN` command inside Docke…
2015-08-26 14:19:44 -07:00
459c2c66c3
Merge pull request #15801 from jfrazelle/btrfs-rm-subvolume-recursion
...
remove btrfs subvolumes when destroying containers (recursive)
2015-08-26 14:00:53 -07:00
c1af0ac082
Add 'ancestor' ps filter for image
...
Makes it possible to filter containers by image, using
--filter=ancestor=busybox and get all the container running busybox
image and image based on busybox (to the bottom).
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-26 22:59:48 +02:00
7a74422724
Merge pull request #15826 from Microsoft/start-from-one
...
Builder counts from 1
2015-08-26 13:59:38 -07:00
70a814c3f3
Merge pull request #15493 from stevvooe/no-buffer-on-push
...
Avoid buffering to tempfile when pushing with V2
2015-08-26 13:59:01 -07:00
ea65c38ac0
Merge pull request #15843 from MHBauer/version-order
...
reweight api doc for v1.21 to correct the order.
2015-08-26 13:51:06 -07:00
31a52a31c6
reweight api doc for v1.21 to correct the order.
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-08-26 13:40:37 -07:00
47cdae243a
Merge pull request #15865 from Microsoft/10662-isabs
...
Windows: Fix use of IsAbs check
2015-08-26 13:29:24 -07:00
fa13f7cde8
Merge pull request #14242 from cpuguy83/add_volume_api
...
Add volume api
2015-08-26 21:57:12 +02:00
f11ba3135b
Windows: Fix use of IsAbs check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-26 12:38:28 -07:00
b3b7eb2723
Add volume API/CLI
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-26 13:37:52 -04:00
5dadfa8b69
Merge pull request #15848 from calavera/revert_ipc_mounts
...
DO NOT MERGE: Check if these commits broke the builds.
2015-08-26 10:29:25 -07:00
17d6c6c7e5
Builder counts from 1
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-26 10:05:04 -07:00
7ef08f39ed
Merge pull request #15850 from choleraehyq/15849-fixtypo
...
api/client/restart.go:Fix a typo in comment
2015-08-26 16:10:31 +02:00
2cec06fbcd
Merge pull request #13304 from coolljt0725/restart_daemon_with_paused_containers
...
Fix restart docker daemon with paused containers
2015-08-26 09:04:14 -04:00
d30990d7b1
api/client/restart.go:Fix a typo in comment
...
Signed-off-by: Yingqian Hu <choleraehyq@gmail.com >
2015-08-26 18:59:56 +08:00
b857dadb33
Merge pull request #15711 from monitorjbl/import-commit-message
...
adding message option to the import subcommand
2015-08-26 11:42:10 +02:00
688dd8477e
Revert "Add support for sharing /dev/shm/ and /dev/mqueue between containers"
...
This reverts commit d88fe447dfdavid.calavera@gmail.com >
2015-08-26 05:23:00 -04:00
a9378a0ab5
Revert "Modify test to include /dev/shm sharing"
...
This reverts commit 457aeaa2e1david.calavera@gmail.com >
2015-08-26 05:22:46 -04:00
b6621a1b6c
Fix #14572 : Improve explaination for usng RUN and apt-get inside Dockerfil.
...
Based on example provided by @thaJeztah and @moxiegirl:
https://github.com/docker/docker/pull/15773
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-25 21:58:20 -07:00
8720f71b52
Merge pull request #15836 from rsmitty/issue-15835
...
Resolves link to introduction to Docker
2015-08-26 12:06:29 +10:00
3bc375c6e4
Merge pull request #15831 from yasker/master
...
Update plugins.md
2015-08-26 12:05:35 +10:00
a0f6ff7d58
Merge pull request #15838 from rsmitty/issue-15837
...
Updates link to the understanding-docker section
2015-08-26 11:53:58 +10:00
90be489f40
Updates link to the understanding-docker section
...
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com >
2015-08-25 14:12:29 -07:00
9a71dd2b90
Resolves link to introduction to Docker
...
Signed-off-by: Spencer Smith <robertspencersmith@gmail.com >
2015-08-25 13:54:39 -07:00
bdba406492
Merge pull request #15821 from vbatts/tarsum_warning
...
tarsum: add a big fat warning
2015-08-25 22:53:04 +02:00
459451de8b
tarsum: add a big fat warning
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-08-25 16:50:08 -04:00
f950de5754
Windows: Fix docker cp
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-25 13:26:49 -07:00
bd06432ba3
cleanup and fix btrfs subvolume recursion deletion
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-25 13:00:41 -07:00
5f156d8c25
Update plugins.md
...
Add Convoy to Docker plugin list.
Signed-off-by: Sheng Yang <sheng.yang@rancher.com >
2015-08-25 12:01:31 -07:00
7dbb5fafcd
Merge pull request #15824 from Microsoft/10662-moredocs
...
Windows: Minor doc clarification
2015-08-25 13:30:54 -04:00
e3772538c0
Fix OpenRC init script
...
The shebang for OpenRC init scripts is now #!/sbin/openrc-run, and we
can also use the default start and stop functions built into OpenRC.
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com >
2015-08-25 12:02:01 -05:00
1c0c68b18f
Drop execute bit from openrc init script
...
Signed-off-by: William Hubbs <w.d.hubbs@gmail.com >
2015-08-25 12:00:54 -05:00
e134ccada7
Merge pull request #14978 from gesellix/websocket-disable-check-origin
...
skip checkOrigin during websocket handshake
2015-08-25 12:56:30 -04:00
759ed647fb
Windows: Minor doc clarification
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-25 09:36:51 -07:00
78698855ce
Merge pull request #15818 from calavera/fix_api_json_examples
...
Fix json examples in the api reference.
2015-08-25 09:22:38 -07:00
eecf6cd48c
Allow vendoring netns change to build Docker on s390x
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-25 15:07:17 +00:00
7296c845b7
Fix json examples in the api reference.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-25 10:55:12 -04:00
6f8c4480e4
Merge pull request #14665 from coolljt0725/fix_build_with_resource_limit
...
Fix build with resource limit which system not support.
2015-08-25 16:42:13 +02:00
ee2c476f22
Merge pull request #15804 from epc/epc-2015236
...
Copy edits for typos
2015-08-25 08:04:53 +02:00
cefb72080d
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
2015-08-24 23:02:44 -04:00
936b2c6afe
adding message option to the import subcommand
...
Signed-off-by: Taylor Jones <monitorjbl@gmail.com >
2015-08-25 02:55:04 +00:00
9a9724ad56
Fix docker daemon restart with paused container.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-25 09:42:58 +08:00
349aef06d5
Avoid buffering to tempfile when pushing with V2
...
The practice of buffering to a tempfile during a pushing contributes massively
to slow V2 push performance perception. The protocol was actually designed to
avoid precalculation, supporting cut-through data push. This means we can
assemble the layer, calculate its digest and push to the remote endpoint, all
at the same time.
This should increase performance massively on systems with slow disks or IO
bottlenecks.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-08-24 18:08:05 -07:00
903cd2b9e3
Merge pull request #12159 from mrunalp/feature/ipc_share_dev
...
ipc: Share /dev/shm and /dev/mqueue when --ipc container:<id/name> is used
2015-08-24 17:55:03 -07:00
562cc6254f
Merge pull request #15702 from LK4D4/fix_events_tests_15
...
Make events test more deterministic in go1.5
2015-08-24 20:15:09 -04:00
dea78fc2ce
fix 9939: docker does not remove btrfs subvolumes when destroying container
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-08-24 14:52:07 -07:00
82e2dec06d
Merge pull request #15393 from azurezk/exportImage-toplevel
...
change exportImage to top-level func
2015-08-24 14:35:55 -07:00
25f4f5588e
Merge pull request #15756 from tonistiigi/15724-remove-nil-contexts
...
Remove nil contexts
2015-08-24 14:29:48 -07:00
ebe27cb34c
Merge pull request #14868 from jeffminard-ck/rhel-init-detect-failure
...
Allow RHEL init script to detect daemon start pid failure
2015-08-24 14:24:36 -07:00
0ce37336b3
Merge pull request #15800 from moxiegirl/carry-14503
...
Closes PR #14503 with this carry
2015-08-24 13:22:19 -07:00
831747d59e
Closes PR #14503 with this carry
...
- Refer to Joyent's blogs and docs rather than following from our end
- All of this information exists on Joyent's site
Updating with thaJeztah's comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-24 13:21:27 -07:00
1269dd35dc
Merge pull request #15728 from tonistiigi/parallel-pulls
...
Mitigate parallel pull issues
2015-08-24 12:56:21 -07:00
b779bc3102
Mitigate parallel pull issues
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-24 11:41:45 -07:00
137df3048c
Merge pull request #15389 from aidanhs/aphs-simpler-pull-codepath
...
Remove unnecessary function parameter, add mirror endpoint test
2015-08-24 11:03:01 -07:00
6b21e98432
Merge pull request #15766 from hqhq/hq_fix_device
...
Add mode check for device
2015-08-24 10:58:49 -07:00
fd8b25c802
Merge pull request #15348 from tonistiigi/11008-always-unless-stopped-restart-policy
...
Add always-unless-stopped restart policy
2015-08-24 13:48:56 -04:00
1544c5edb6
Merge pull request #15735 from tonistiigi/graph-register-readcloser
...
Make graph.Register take in io.Reader
2015-08-24 10:40:04 -07:00
654b555d09
Merge pull request #15789 from calavera/add_cors_head_option
...
Allow HEAD requests to container archives via CORS.
2015-08-24 10:27:07 -07:00
386aefb9fc
Make events test more deterministic in go1.5
...
Now scheduler makes order of events pretty random, so I added little
sleeps to make order intact. Also I renamed to test so name better
describes its nature.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-24 09:35:11 -07:00
c0a48a676d
Merge pull request #15762 from mattrobenolt/trim
...
opts/envfile: trim all leading whitespace in a line
2015-08-24 12:32:27 -04:00
e14eaba784
Merge pull request #12918 from thieman/tnt-issue-12595
...
Use image ID in ps if tag has been updated
2015-08-24 12:24:42 -04:00
37f58d266f
Merge pull request #14564 from docteurklein/master
...
[experimental compose/swarm] explain how to make it work on awazon ec2.
2015-08-24 17:47:26 +02:00
88cacbf529
Merge pull request #15767 from hqhq/hq_fix_optional_comments
...
Change all optional unit to [unit]
2015-08-24 17:36:01 +02:00
32053b965b
Merge pull request #15791 from agonzalezro/broken-links-revert
...
Revert "Fix broken links at plugins documentation"
2015-08-24 15:27:40 +02:00
02683dfa09
Merge pull request #15745 from Microsoft/readme
...
Update readme
2015-08-24 06:13:02 -07:00
e4147bcad4
Merge pull request #15776 from duglin/buildEnvTest
...
Add some builder getEnv tests
2015-08-24 08:57:41 -04:00
2b174d3d9d
Merge pull request #15444 from coolljt0725/add_test_require_for_test_blkio
...
Add test require for TestRunWithBlkioInvalidWeight and TestRunWithBlkio
2015-08-24 08:33:17 -04:00
1ee53d4fb7
Merge pull request #15779 from mountkin/split-build-test
...
split build API tests to a separate file
2015-08-24 08:31:48 -04:00
62ce5b6929
Revert "Fix broken links at plugins documentation"
...
This reverts commit 354147df01agonzalezro@gmail.com >
2015-08-24 11:48:59 +01:00
354a2e105d
Allow HEAD requests to container archives via CORS.
...
Add HEAD to Access-Control-Allow-Methods.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-24 05:57:22 -04:00
429423624c
Add mode check for device
...
This fixes two problems:
1. docker run --device /dev/sda:rw ubuntu bash doesn't work
2. --device /dev/zero:/dev/noro:ro doesn't show clear error message,
but fail when writing to cgroup file.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-24 17:57:12 +08:00
888d1d0e20
Merge pull request #15787 from agonzalezro/patch-1
...
Fix broken links at plugins documentation
2015-08-24 11:49:55 +02:00
354147df01
Fix broken links at plugins documentation
...
Signed-off-by: Álex González <agonzalezro@gmail.com >
2015-08-24 10:47:56 +01:00
c99ed5ae5d
Change return value for ValidateMountMode
...
1. rename it from ValidateMountMode to ValidMountMode
Because it's a function simply check mount mode is valid or not.
2. remove the rw check return value
It's not supposed to be combined into this function, and we already
have a function for that check.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-24 17:28:19 +08:00
9bac520c12
Merge pull request #15571 from ewindisch/apparmor_denywproc
...
AppArmor: Deny w to /proc/* files
2015-08-24 11:03:41 +02:00
cb00396f61
Merge pull request #15332 from pugnascotia/master
...
Make run and rmi bash completions configurable
2015-08-24 10:49:01 +02:00
c340ca4f5d
Add some missing cgroup test require and refactor the require check.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-24 11:37:11 +08:00
2167f40a76
Use image ID if tag has been updated
...
Fixes #12595
Signed-off-by: Travis Thieman <travis.thieman@gmail.com >
2015-08-23 12:11:24 -04:00
96e37f671a
split build API tests to a separate file
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-08-23 23:59:15 +08:00
7ead74d903
Merge pull request #15774 from charleswhchan/patch-4
...
Revise Mac Docker instructions
2015-08-23 10:26:58 +02:00
819166c16c
Merge pull request #15769 from charleswhchan/patch-1
...
Revise Windows Docker instructions
2015-08-23 12:11:37 +10:00
eeeae2c235
Add some builder getEnv tests
...
In particular I want to make sure that calling getEnv() when the same
var name appears more than once in the env list that we only pick up
the first one. PR #15182 counts on this
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-08-22 13:12:43 -07:00
f1988f046f
opts/envfile: trim all leading whitespace in a line
...
Signed-off-by: Matt Robenolt <matt@ydekproductions.com >
2015-08-22 09:01:27 -07:00
9572edc34a
Revise Mac Docker instructions
...
* Clarify `default` VM
* Various minor changes
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-22 08:00:48 -07:00
3faba5fbe2
Revise Windows Docker instructions
...
* Fix Windows 7 (not 7.1 ;p)
* Clarify virtualization technology section, add link to wiki
* Fix heading level for various ways of starting Docker container
* Clarify `default` VM
* Various minor changes
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-22 07:26:26 -07:00
efabc8ee1a
Merge pull request #15764 from coolljt0725/docs_update_readme_in_daemon
...
Docs: remove networkdriver from README.md in daemon
2015-08-22 13:36:38 +02:00
76a5fdc3d4
Change all optional unit to [unit]
...
As suggested before, we should change every signal one.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-21 21:29:52 -07:00
5fd15da7da
Merge pull request #15763 from tianon/dind-tmp
...
Update dind "/tmp" mounting to be optional
2015-08-21 21:14:35 -07:00
ce5bbed858
Docs: remove networkdriver from README.md in daemon
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-22 10:09:07 +08:00
5929502b4e
Merge pull request #15412 from vdemeester/dont-sleep-too-much
...
time.Sleep in integration tests — comment and waitRun/waitInspect
2015-08-21 20:43:55 -04:00
90801ab939
Merge pull request #15708 from Microsoft/sjw/graphdriver_missing_parent
...
Windows: Graphdriver should reject create of layer w/o parent
2015-08-21 16:34:03 -07:00
fefc9a3a6a
Merge pull request #15750 from mountkin/fix-exec-panic
...
fix a panic when the exec fails to start
2015-08-21 15:54:58 -07:00
b8bed8832b
Update dind "/tmp" mounting to be optional
...
This allows someone running the image to use `-v` to mount a non-tmpfs `/tmp` into their image if they so require/desire.
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-08-21 15:47:50 -07:00
c5733e6a20
Merge pull request #15366 from rvesse/sysvinit-redhat-silent-fail
...
Fix silent failure in RedHat sysvinit script
2015-08-21 14:54:25 -07:00
e5e6eaacee
Merge pull request #15492 from vbatts/update-tar-split
...
vendor: update tar-split to v0.9.6
2015-08-21 14:45:19 -07:00
9415db7e95
Merge pull request #15742 from Microsoft/addazure
...
Add Microsoft Azure
2015-08-21 23:41:36 +02:00
9bd8a9b66b
Merge pull request #14006 from hqhq/hq_add_kmem_limit
...
Add support for kernel memory limit
2015-08-21 14:34:27 -07:00
ecff4badcd
Merge pull request #15125 from WeiZhang555/golint-stdcopy-system
...
fix golint warnings/errors on pkg/system and pkg/stdcopy
2015-08-21 14:27:59 -07:00
008a8ffdd2
Merge pull request #15218 from calavera/gender_unbiased_names
...
Add more amazing women to the names generator.
2015-08-21 14:24:49 -07:00
19f7bfcda9
Merge pull request #15507 from clintonskitson/patch_issue_15467
...
added check for bind on create to determine local volume driver
2015-08-21 14:23:44 -07:00
9b8cfb6c79
Merge pull request #15709 from Mashimiao/state-separate-part-of-SetRestarting
...
daemon/state: separate part of SetRestarting to setRestarting
2015-08-21 14:21:10 -07:00
9d22c7a2d5
Merge pull request #15596 from jfrazelle/hack-dind-its-been-fun
...
docker 1.8+ no longer needs dind
2015-08-21 13:51:41 -07:00
616950b030
Merge pull request #15687 from coolljt0725/add_blk_dev_throttling_to_check_config
...
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
2015-08-21 13:48:28 -07:00
a456f20b44
Windows: Graphdriver should reject create of layer w/o parent
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-08-21 13:23:04 -07:00
e6be51a0f9
Merge pull request #15758 from jfrazelle/EOL-fedora-20
...
fedora 20 is EOL remove from rpm builder
2015-08-21 13:15:58 -07:00
1425b185db
Merge pull request #15746 from Microsoft/libcontainer-spec-location
...
Updated spec location for libcontainer
2015-08-21 11:15:28 -07:00
c48ac77840
update hack/dind for 1.8 mounting of cgroups
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-21 11:13:33 -07:00
ee1304a35e
fedora 20 is EOL remove from rpm builder
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-21 11:01:18 -07:00
0c08913d52
Remove nil contexts
...
Causes daemon panic because loggers can’t be found.
Fixes #15724
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-21 10:31:27 -07:00
fcf9daad91
fix a panic when the exec fails to start
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-08-22 00:01:44 +08:00
eb7b2ed6bb
Merge pull request #15748 from coolljt0725/fix_daemon_start_with_old_running_container
...
Fix docker daemon start with old running container which use thirdparty volume plugin
2015-08-21 11:07:02 -04:00
85bef48bf5
Merge pull request #15754 from mountkin/fix-return
...
modify a return value in graph/tags.go to increase readability
2015-08-21 10:55:50 -04:00
10c97a310a
Merge pull request #15751 from nf/bcw
...
Use a slice instead of a map of io.WriteClosers in broadcastwriter
2015-08-21 10:51:07 -04:00
f11b7acc73
modify a return value in graph/tags.go to increase readability
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-08-21 21:36:30 +08:00
31cbf76d0c
Use a slice instead of a map of io.WriteClosers in broadcastwriter
...
Maps rely on the keys being comparable.
Using an interface type as the map key is dangerous,
because some interface types are not comparable.
I talked about this in my "Stupid Gopher Tricks" talk:
https://talks.golang.org/2015/tricks.slide
In this case, if the user-provided writer is backed by a slice
(such as io.MultiWriter) then the code will panic at run time.
Signed-off-by: Andrew Gerrand <adg@golang.org >
2015-08-21 14:08:04 +01:00
5ceff3f191
Merge pull request #15718 from ZJU-SEL/rm-volume-action
...
specify `docker run --rm` action when it comes to volume
2015-08-21 08:50:18 +02:00
2d1158790d
Make graph.Register take in io.Reader
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-20 20:37:11 -07:00
c8a46cb0b2
Fix docker daemon start with old running container which user volume plugin. Fixes #15720
...
Signed-off-by: Lei Jitang <leijitang@huawei>
2015-08-21 11:29:53 +08:00
011b4ca256
Updated spec location for libcontainer
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-08-20 20:04:04 -07:00
faf9e34067
Update readme
...
Signed-off-by: John Howard <John.Howard@microsoft.com >
2015-08-20 19:55:32 -07:00
98f60aef13
Add Microsoft Azure
...
Signed-off-by: John Howard <john.howard@microsoft.com >
2015-08-20 18:35:21 -07:00
76a559ccb2
specify the docker run --rm action
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
2015-08-21 08:52:06 +08:00
d760947b2e
Merge pull request #15716 from calavera/release_checklist_docs
...
Corrections in the release checklist.
2015-08-20 22:29:42 +01:00
9ed5cf08a3
Merge pull request #15732 from moxiegirl/15731-fixes
...
Examples index has broken links
2015-08-20 22:56:45 +02:00
15c24db9a5
Examples index has broken links
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-20 13:40:03 -07:00
ec43113662
Merge pull request #15697 from sallyom/man-commit-fix
...
fix format man-commit
2015-08-20 21:33:46 +02:00
ba9496ae48
Merge pull request #15688 from Evalle/15564-fix-windows-doc
...
Fix a windows doc issue
2015-08-20 20:39:16 +02:00
3c61ede074
Fix a windows doc issue
...
Signed-off-by: evalle <shmarnev@gmail.com >
2015-08-20 14:14:48 +02:00
272a3eef94
Merge pull request #15696 from sallyom/man-history-fixup
...
add -H to SYNOPSIS man-history
2015-08-20 22:11:50 +10:00
44465098cb
Merge pull request #15661 from coolljt0725/fix_docker_stats_show_read_blkio
...
Fix docker stats show blkio when there are multiple block device
2015-08-20 07:53:38 -04:00
1d0ee18d6b
Corrections in the release checklist.
...
- Add a note about creating the release in GitHub.
- Fix docs release process.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-20 11:52:56 +01:00
d959739125
Merge pull request #15715 from aanand/fix-compose-1.2-changelog-link
...
Fix Compose 1.2 changelog link
2015-08-20 11:42:14 +01:00
90ebc3b455
Merge pull request #14928 from brahmaroutu/lint_daemon_graphdriver
...
daemon/graphdriver fix lint errors/warnings
2015-08-20 03:25:00 -07:00
23d3e4bb03
Fix Compose 1.2 changelog link
...
Hardcode the release tag, so that:
- it goes straight to the changes for 1.2, not whatever the current
version is
- it still works now that we've renamed CHANGES.md to CHANGELOG.md
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com >
2015-08-20 11:09:10 +01:00
6b8129d1fe
added check for bind on create to determine local volume driver
...
Signed-off-by: Clinton Kitson <clintonskitson@gmail.com >
2015-08-20 01:40:04 -07:00
211449a1ca
Fix docker stats show blkio when there are multiple block devices.
...
Signed-off-by: Lei Jiang <leijitang@huawei.com >
2015-08-20 11:46:21 +08:00
a6ed990593
daemon/state: separate part of SetRestarting to setRestarting
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-08-20 11:14:28 +08:00
8acd006fd9
Merge pull request #15707 from icaroseara/fix_typo
...
Fix typo, "fil" -> "fill"
2015-08-19 21:25:43 -04:00
997ba4b0da
Fix typo, "fil" -> "fill"
...
Signed-off-by: Icaro Seara <icaro.seara@gmail.com >
2015-08-19 21:50:54 -03:00
6bf2440650
Allow branch name in vendor-helper script
...
With this, you can specify a branch name in the
vendor script instead of a commit ID. This makes it easier
to quickly test changes in dep'd repos outside of the DIND
environment.
Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com >
2015-08-19 17:56:04 -05:00
41ca7c0f13
Merge pull request #15675 from thaJeztah/carry-14625
...
[Carry #14625 ] run.md: --expose does NOT override Dockerfile EXPOSE
2015-08-20 00:49:16 +02:00
35cbcc2fc1
Add gists provided by Mary
...
This adds the example gists, provided by Mary Anthony,
also fixes a link to the old /terms/
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-08-20 00:30:39 +02:00
6dd84ba2ab
run.md: --expose does NOT override Dockerfile EXPOSE
...
run.md states that the operator can override all defaults set in the Dockerfile, and explicitly says that `--expose` overrides the `EXPOSE` instruction. Neither of these are true. An `EXPOSE` instruction cannot be overridden, `--expose` can only add additional exposed ports.
This change fixes the instructions, and also takes the liberty of crisping up the grammar and phrasing in a place or two.
Signed-off-by: Spencer Brown <spencer@spencerbrown.org >
2015-08-19 23:57:35 +02:00
286afb9a77
Merge pull request #15682 from MHBauer/cliorder
...
add weight to daemon page so it renders in order
2015-08-19 14:24:51 -07:00
2a84157352
add weight to daemon page so it renders in order
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-08-19 10:26:19 -07:00
f848f34da2
Merge pull request #15694 from liubin/fixtypo
...
add missing instruction
2015-08-19 19:05:41 +02:00
7f46dc03d5
Merge pull request #15684 from ibuildthecloud/dont-sync
...
Don't globally lock on driver initialization
2015-08-19 12:48:14 -04:00
457aeaa2e1
Modify test to include /dev/shm sharing
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-08-19 12:36:57 -04:00
d88fe447df
Add support for sharing /dev/shm/ and /dev/mqueue between containers
...
This changeset creates /dev/shm and /dev/mqueue mounts for each container under
/var/lib/containers/<id>/ and bind mounts them into the container. When --ipc:container<id/name>
is used, then the /dev/shm and /dev/mqueue of the ipc container are used instead of creating
new ones for the container.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-08-19 12:36:52 -04:00
ca79576585
Merge pull request #15664 from skatsuta/fix-parse-null
...
builder: avoid parsing null- string to nil slice (issue #15634 )
2015-08-19 09:06:20 -07:00
b6f1b4ad35
Add support for kernel memory limit
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-19 23:56:55 +08:00
87959dbfac
Add CheckKernelVersion so we can check any specific version
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-19 23:49:52 +08:00
7ec7173b76
Merge pull request #15482 from hqhq/hq_fix_run_doc
...
Add format description in run doc
2015-08-19 17:13:00 +02:00
09cdd0524e
Merge pull request #15691 from skatsuta/fix-printf-wrong-type
...
integration-cli: fix printf verbs of wrong types
2015-08-19 08:12:45 -07:00
70c4b6e619
Merge pull request #15695 from lmesz/deviceset_warn_fix
...
deviceset.go: fixed link in warning about udex sync is not supported
2015-08-19 08:05:27 -07:00
59e49e1db0
Merge pull request #12927 from lindenlab/custom-host-port-ranges
...
Proposal: Change --publish=SPEC to allow binding to custom host port ranges
2015-08-19 17:04:23 +02:00
43763805fb
Merge pull request #15690 from hacfi/docs-status-fix
...
Small fix in dev env docs
2015-08-19 07:12:39 -07:00
b8c319996f
Merge pull request #15683 from skatsuta/cli-exec-test-printf-int
...
integration-cli: modify %s to %d in formatting an int
2015-08-19 10:10:17 -04:00
ab9e71b616
fix format man-commit
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-08-19 10:07:32 -04:00
898114a6d0
add -H to SYNOPSIS man-history
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-08-19 09:35:52 -04:00
78676f19c1
deviceset.go: fixed link in warning about udex sync is not supported
...
Signed-off-by: Laszlo Meszaros <lacienator@gmail.com >
2015-08-19 14:16:40 +02:00
1988064ef2
add missing instruction
...
Signed-off-by: bin liu <liubin0329@gmail.com >
2015-08-19 18:43:19 +08:00
fbc0ea32e8
Small fix in dev env docs
...
Signed-off-by: Philipp Wahala <philipp.wahala@gmail.com >
2015-08-19 10:53:55 +02:00
5759b95e7e
integration-cli: fix printf verbs of wrong types
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
2015-08-19 17:47:33 +09:00
cbb69531a8
Add CONFIG_BLK_DEV_THROTTLING to check-config.sh
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-19 15:11:04 +08:00
a41f431d11
integration-cli: use c.Assert(err, check.IsNil) instead of if err != nil
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
2015-08-19 15:23:11 +09:00
164208fde5
Don't globally lock on driver initialization
...
This patch makes it such that plugin initialization is synchronized
based on the plugin name and not globally
Signed-off-by: Darren Shepherd <darren@rancher.com >
2015-08-18 22:25:30 -07:00
3dc30d47e1
Merge pull request #15417 from icecrime/update_windows_registry_endpoint
...
Update Windows TP3 registry endpoints
2015-08-18 20:35:02 -07:00
5b870d7fa6
integration-cli: modify %s to %d in formatting an int
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
2015-08-19 12:06:05 +09:00
d45fcc6c80
integration-cli: add a integration test to avoid parsing null string in ADD, COPY and VOLUME to nil slice
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
2015-08-19 11:11:46 +09:00
2a468ed7e4
Add format description in run doc
...
And only set false to --oom-kill-disable, we just need the default
value to show.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-19 10:11:08 +08:00
aacb47d628
Merge pull request #15671 from tonistiigi/fix-volume-userguide
...
Update volumes userguide
2015-08-18 18:57:24 -07:00
5fccbd1243
Merge pull request #15676 from thaJeztah/fix-anchor-link
...
docs: fix anchor link on Ubuntu installation page Merging for @thaJeztah ....da ddadad dadada 🎼
2015-08-18 18:55:56 -07:00
9f1e324b53
Merge pull request #15660 from sallyom/man-create-typo
...
fix SYNOPSIS alphabetical order man-create
2015-08-18 18:40:39 -07:00
d997351e97
Merge pull request #15677 from moxiegirl/carry-14714-changes
...
remove references to 'source repository'
2015-08-19 00:56:41 +02:00
b143c05d64
remove references to 'source repository'
...
- rewrite intro to Dockerfile reference usage section to remove
references to 'source repository'
- Closes #14714
- Fixes: #8648
- Updating with Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-18 15:50:42 -07:00
5dd28c1f9d
docs: fix anchor link on Ubuntu installation page
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-08-18 23:41:00 +02:00
7e3088c43b
Merge pull request #15672 from moxiegirl/cli-reference-cleanup
...
Updating hashcode links to commands
2015-08-18 21:45:06 +02:00
85c2c77188
Updating hashcode links to commands
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-18 12:25:59 -07:00
cc2aab7816
Update volumes userguide
...
Fixes #15644
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-18 12:17:45 -07:00
215a1136f7
Merge pull request #15662 from cpuguy83/noisy_blkio_warning
...
Quiet sysinfo warnings on container create/start
2015-08-18 11:47:17 -07:00
10305dc5e8
Add unless-stopped restart policy
...
Fixes #11008
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-18 11:39:06 -07:00
799d9605d6
Remove/Comment time.Sleep in integration tests
...
Remove what seems unnecessary time.Sleep (1 second even) and comment the
ones that seemed necessary.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-18 20:36:08 +02:00
8aa520b8c0
Merge pull request #15649 from LK4D4/syslog_validation
...
Syslog validation
2015-08-18 11:14:31 -07:00
bba2551847
Merge pull request #15510 from kblin/issue-14795
...
reference/run: Clarify the use of numeric UIDs
2015-08-18 09:43:16 -07:00
7ae6a505f2
Merge pull request #15337 from phemmer/doc-builder-volume
...
add documentation clarifying behavior of VOLUME instruction
2015-08-18 09:42:00 -07:00
8eeafa058c
Fix pull on client disconnect
...
Fixes #15589
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-18 09:41:37 -07:00
135f5324b1
Merge pull request #15653 from albers/completion-log-opt-fix
...
[Fix 15246] bash completion fails on systems with bash 3.2
2015-08-18 12:37:56 -04:00
9f1e8eea8f
Merge pull request #15316 from icecrime/release_process
...
Documenting Docker release process
2015-08-18 09:33:44 -07:00
d7ac3fa863
Merge pull request #15605 from dharmit/15530-remove-the-terms-folder
...
Fixing docs to remove references to links under terms/
2015-08-18 18:27:28 +02:00
3ce11c1587
Merge pull request #15656 from SvenDowideit/rename-public-hub
...
use the Docker Hub as the product name
2015-08-18 17:59:34 +02:00
6947fbc2b0
Merge pull request #15657 from sallyom/man-inspect-typo
...
typo man-inspect
2015-08-18 17:37:58 +02:00
9f8881b810
Merge pull request #15230 from azurezk/fix--rm-when-create-failure
...
--rm delete container when create failed
2015-08-18 11:32:33 -04:00
df11b10680
typo man-inspect
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-08-18 11:19:57 -04:00
e9d8e38c47
Quiet sysinfo warnings on container create/start
...
This was making logrus warn on each container create and start.
These warnings are not needed as the code below already warns when these
various cgroup settings aren't supported but have been set.
Warnings were originally introduced by #15381 , which appear to be a
side-effect of that change and not the intention.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-18 10:01:52 -04:00
8b8413266c
fix SYNOPSIS alphabetical order man-create
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-08-18 08:16:57 -04:00
2d6952e8a5
builder: avoid decoding "null" string in ADD, COPY and VOLUME step to nil slice
...
Signed-off-by: Soshi Katsuta <katsuta_soshi@cyberagent.co.jp >
2015-08-18 21:15:57 +09:00
30cde97e5c
use the Docker Hub as the product name
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-08-18 21:13:57 +10:00
18381faee6
Fix bash completion for log driver options
...
This option was incorrectly ported to the new `daemon` subcommand
structure.
Beside the obvious effect that completion of `docker daemon --log-opt`
did not work, this also caused completion of `docker` and `docker xxx`
to fail on macs with
> bash: words: bad array subscript
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-18 09:17:29 +02:00
ba29d31c9c
reference/run: Some editorial changes
...
Based on the suggestions from @moxiegirl, some changes to make the wording more clear.
Signed-off-by: Kai Blin <kai@samba.org >
2015-08-18 08:56:56 +02:00
770daa15f3
Fix build with resource limit which system is not support.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-18 11:54:00 +08:00
1ed15550f5
fix in daemon side
...
Signed-off-by: Zhang Kun <zkazure@gmail.com >
goformat
Signed-off-by: Zhang Kun <zkazure@gmail.com >
fix small
Signed-off-by: Zhang Kun <zkazure@gmail.com >
change to rm
Signed-off-by: Zhang Kun <zkazure@gmail.com >
handler other error
Signed-off-by: Zhang Kun <zkazure@gmail.com >
unique ERR
Signed-off-by: Zhang Kun <zkazure@gmail.com >
setHostConfig_fail_test
Signed-off-by: Zhang Kun <zkazure@gmail.com >
format
Signed-off-by: Zhang Kun <zkazure@gmail.com >
err handle and modify test
Signed-off-by: Zhang Kun <zkazure@gmail.com >
golint error
Signed-off-by: Zhang Kun <zkazure@gmail.com >
2015-08-18 10:06:36 +08:00
66112a7ae5
Merge pull request #15613 from mgrauer/update_docs_installation_mac_docker_machine_name
...
Update dev machine name to default in mac installation docs
2015-08-17 19:05:34 -07:00
f1da5edc8b
Merge pull request #15380 from calavera/remove_sys_info_pointers
...
Remove pointers from the SysInfo struct.
2015-08-17 18:40:54 -07:00
5ab6883b92
Merge pull request #15430 from charleswhchan/patch-2
...
Cleanup "Working with containers" page.
2015-08-17 17:46:05 -07:00
fd2e945d15
Merge pull request #15650 from LK4D4/fix_max_file_error
...
Fix error message in max-file validation
2015-08-17 20:27:12 -04:00
1c916dbd83
Merge pull request #15632 from mountkin/fix-15626
...
a quick fix to #15626
2015-08-17 20:26:47 -04:00
29ced5d0c4
Merge pull request #15599 from calavera/ps_format_q
...
Fix ignore `-q` flag in `docker ps` when there is a default format.
2015-08-17 15:44:28 -07:00
cde607108b
Fix error message in max-file validation
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-17 15:34:39 -07:00
3f61002b05
Fix LogConfig.Config in inspect
...
Also add test for daemon-wide log-opt.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-17 15:27:44 -07:00
960791ba60
Check syslog config on daemon start
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-17 14:29:45 -07:00
5c88a6fdca
Merge pull request #15292 from mountkin/fix-exec-test
...
move the assertions outside of the goroutine
2015-08-17 17:24:58 -04:00
b7a6d14bdc
Do not allow corrupted syslog-address
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-17 14:19:06 -07:00
aef15ffc5d
Merge pull request #15611 from mariussturm/master
...
Initialize LogConfig in daemon mode
2015-08-17 14:17:54 -07:00
436fca704f
Merge pull request #15356 from Microsoft/10662-uncpathonbuild
...
Windows: Allow UNC paths on build
2015-08-17 13:34:27 -07:00
9e1a41aae5
daemon/graphdriver fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-17 19:27:36 +00:00
df7ab6f3db
Windows: Allow UNC paths on build
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-08-17 11:03:54 -07:00
5aeb48af77
Merge pull request #15635 from cpuguy83/15633_allow_logconfig_empty_driver
...
Fix `inspect` output when no log driver specified
2015-08-17 11:03:37 -07:00
df46bfdd4d
Fix ignore -q flag in docker ps when there is a default format.
...
Docker ps default format should not take precedence over cli flags.
This happens effectively for other flags except `-q`.
We need to let the cli to set the format as table to print the
expected output with `-q`.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-17 10:48:04 -07:00
2e7b088164
Merge pull request #15579 from Microsoft/10662-graph
...
Windows: Graph remove custom interface, add central store
2015-08-17 10:45:48 -07:00
2f2779b6a5
Fix inspect output when no log driver specified
...
Config options were being ignored in the inspect output when no driver
was specified.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-17 11:35:34 -04:00
3977f30869
a quick fix to #15626
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-08-17 21:35:57 +08:00
bba762b192
Merge pull request #15237 from charleswhchan/patch-3
...
Reformat /containers/(id)/resize to make it consistent with other sections.
2015-08-16 10:59:16 +02:00
6cd2d89469
Reformat /containers/(id)/resize to make it consistent with "Exec Resize" section.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-15 19:47:01 -07:00
e1f3a5ad0a
Merge pull request #14113 from dit4c/10348-exec-privileged
...
Remerge of `docker exec --privileged` with better tests
2015-08-16 00:20:41 +02:00
f26045a534
Update dev machine name to default in mac installation docs
...
Signed-off-by: Michael Grauer <michael.grauer@kitware.com >
2015-08-15 15:56:41 -04:00
e904cbec03
Initialize LogConfig in daemon mode
...
Signed-off-by: Marius Sturm <marius@graylog.com >
2015-08-15 18:06:03 +02:00
2fcae333e8
Cleanup "Working with containers" page.
...
* Cleanup introduction
* Update output of `docker version`
* Cleanup explaination of `docker inspect`
* Change 'deleting' to 'removing' for consistency
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-15 08:44:56 -07:00
0a925d07a8
Fixing docs to remove references to links under terms/
...
Removed terms/ directory
Signed-off-by: Dharmit Shah <shahdharmit@gmail.com >
2015-08-15 13:09:29 +05:30
dfbb5520e3
Windows: Graph remove custom interface and add central store
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
Windows: add support for images stored in alternate location.
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-08-14 23:45:53 -07:00
a6e0a6852d
Merge pull request #15602 from Microsoft/10662-blockfromscratch
...
Windows: Block 'FROM scratch'
2015-08-14 21:12:15 -07:00
167783eb13
Merge pull request #15601 from mrjana/vendor18
...
Vendoring in vishvananda/netlink
2015-08-14 20:22:54 -07:00
bd9cc788d0
Merge pull request #15598 from cpuguy83/15570_fix_exec_tty
...
Fix issue with exec TTY caused by 15446
2015-08-14 19:43:04 -07:00
47272f9cc5
Adding support to publish on custom host port ranges
...
Signed-off-by: Don Kjer <don.kjer@gmail.com >
Changing vendor/src/github.com/docker/libnetwork to match lindenlab/libnetwork custom-host-port-ranges-1.7 branch
2015-08-15 02:41:29 +00:00
6df6e2e405
Windows: Block 'FROM scratch'
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-14 18:17:19 -07:00
7948b755c7
Vendoring in vishvananda/netlink
...
Updating netlink package to 4b5dce31de6d42af5bb9811c6d265472199e0fec
to fix certain wierd netlink issues seen.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
2015-08-14 18:02:58 -07:00
837a66e79b
Merge pull request #15595 from estesp/build-experimental
...
Add info on how to build experimental binaries
2015-08-15 01:32:10 +02:00
5ffcecf130
Fix issue with exec TTY caused by 15446
...
The bool logic around setting up the TTY ended up getting flipped
accidentally.
Also added a test for exec with TTY.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-14 14:55:26 -07:00
aedd45346a
Merge pull request #15428 from charleswhchan/patch-1
...
Improve/fix "Dockerizing Applications" page.
2015-08-14 14:03:11 -07:00
313b37129a
Merge pull request #15525 from albers/completion-option-updates
...
Updates to bash completion for docker run and docker daemon.
2015-08-14 13:55:11 -07:00
3f8d60ac2f
Add info on how to build experimental binaries
...
..also update the text that says "TO.BE.DETERMINED" to the actual URL
where the experimental nightlies are published.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
2015-08-14 16:45:38 -04:00
424fa59859
Merge pull request #15568 from Microsoft/10662-commitrunning
...
Windows: Stop commit on running container
2015-08-14 13:13:42 -07:00
3e523ae015
Merge pull request #14530 from Microsoft/10662-serversidevalidation
...
Windows: [TP3] Move netmode validation to server
2015-08-14 16:05:59 -04:00
f6ed590596
Move netmode validation to server
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-14 12:17:41 -07:00
53b1f993ab
Merge pull request #15580 from hqhq/hq_fix_NETPRIO_check
...
Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
2015-08-14 12:03:03 -07:00
d1fada4bf7
Merge pull request #15584 from mavenugo/ln-vendor-in
...
Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3
2015-08-14 11:56:47 -07:00
f39323c1e3
Merge pull request #15519 from albers/changelog-dangling
...
[Fix 15518] wrong feature description in changelog
2015-08-14 20:48:48 +02:00
575a104b3f
Merge pull request #15524 from veggiemonk/patch-README
...
update README.md
2015-08-14 20:45:40 +02:00
d1585f1d66
Merge pull request #15542 from MHBauer/rundoclink
...
fix link
2015-08-14 20:35:51 +02:00
424702b91a
Merge pull request #15574 from diogomonica/fixing-race-on-key-backup
...
Fixing race condition on private key backup how-to
2015-08-14 11:26:56 -07:00
ff155ce6ee
Merge pull request #15576 from estesp/hows-about-a-minor-typo
...
Correct readability of --userland-proxy para.
2015-08-14 11:26:21 -07:00
28a17c8a03
Merge pull request #15491 from Microsoft/10662-fixtar
...
Windows: [TP3] Fixing Tar functions to support long paths.
2015-08-14 09:41:42 -07:00
703e2264ba
Vendoring in libnetwork 22dc04d06067b40a9e7ef575aee6d1bb69d4dcc3
...
Notable changes include :
- #285 : Fix required for https://github.com/docker/docker/pull/12927
- #283 : Code re-architecture/tech-debt in bridge driver
- Upgraded to latest Netlink library
- Fixed certain race-conditions
Signed-off-by: Madhu Venugopal <madhu@docker.com >
2015-08-14 05:57:47 -07:00
60d97a4a63
Make run and rmi bash completions configurable
...
Allow the user to configure how Docker's bash completion works for the
"events", "history", "inspect", "run", "rmi" and "save" commands through the
following environment variables:
DOCKER_COMPLETION_SHOW_IMAGE_IDS
"none" - Show names only (default)
"non-intermediate" - Show names and ids, but omit intermediate image IDs
"all" - Show names and ids, including intermediate image IDs
DOCKER_COMPLETION_SHOW_TAGS
"yes" - include tags in completion options (default)
"no" - don't include tags in completion options
Fixes #9474 .
Signed-off-by: Rory Hunter <roryhunter2@gmail.com >
2015-08-14 11:29:29 +01:00
6c4d4c70c6
Adapt CONFIG_NETPRIO_CGROUP in check-config.sh
...
Fixes : #15572
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-14 14:38:48 +08:00
693ff58cd2
Merge pull request #14758 from Microsoft/10662-pipestohcs
...
Windows: [TP3] new hcsshim stdin/out/err handling
2015-08-13 22:52:48 -07:00
4b933dd2ea
Windows: Stop commit on running container
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-13 22:17:03 -07:00
4e53e80934
Correct readability of --userland-proxy para
...
Was reading this to explain it to someone and noticed the missing "s"
which makes it not so great for nice English readability..
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com >
2015-08-13 23:56:42 -04:00
fbb268c12a
Fixing race condition on private key backup how-to
...
Signed-off-by: Diogo Monica <diogo@docker.com >
2015-08-13 19:16:00 -07:00
54b50479af
Merge pull request #15065 from calavera/new_release_branch_workflow
...
Make the release process more atomic between major releases.
2015-08-13 16:10:11 -07:00
b93d99b25d
Merge pull request #15545 from LK4D4/refactor_pullv2
...
Refactoring of pullV2Tag
2015-08-13 15:52:14 -07:00
46d9fd6a11
Merge pull request #15367 from hqhq/hq_update_rpm_deb_desc
...
Tiny fix for rpm and deb descriptions
2015-08-13 15:04:50 -07:00
ec5a73d18e
Windows: new hcsshim stdin/out/err handling
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-13 13:09:42 -07:00
4ce24eb73a
vendor: update tar-split to v0.9.6
...
Fixes rare edge case of handling GNU LongLink and LongName entries.
Perf improvements. /dev/null writes were taking CPU time during docker
push. Thanks @LK4D4
Various cleanup too.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-08-13 15:42:01 -04:00
7342d59114
AppArmor: Deny w to /proc/* files
...
Introduce a write denial for files at the root of /proc.
This prohibits root users from performing a chmod of those
files. The rules for denials in proc are also cleaned up,
making the rules better match their targets.
Locally tested on:
- Ubuntu precise (12.04) with AppArmor 2.7
- Ubuntu trusty (14.04) with AppArmor 2.8.95
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-08-13 15:39:25 -04:00
c6c195a465
Merge pull request #13501 from vdemeester/8048-image-repository-tag
...
Fix #8048 : make `docker images repository:tag` work
2015-08-13 21:36:21 +02:00
9b2426c606
Refactoring of pullV2Tag
...
* use downloadInfo pointers everywhere
* use downloads slice only for things that we really download
* cleanup tmp files in all cases
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-13 11:50:19 -07:00
599b76000d
Merge pull request #15560 from docker/patch-bad-formatting
...
Fixing bad formatting reported by David via email
2015-08-13 20:26:05 +02:00
355f640d4d
Merge pull request #15559 from liusdu/liusdu-type
...
fix a typo in graph/graph.go
2015-08-13 09:33:00 -07:00
53812e51f4
Merge pull request #15563 from ankushagarwal/changelog
...
Add 1.8.1 CHANGELOG
2015-08-13 09:28:31 -07:00
4ac8fd98b3
Add 1.8.1 CHANGELOG
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-08-13 09:02:04 -07:00
6b1b1ad31c
Merge pull request #15451 from liubin/liubin/fix-broken-link
...
fix broken link to wiki
2015-08-13 17:03:41 +02:00
68a4beeba4
Merge pull request #15554 from HuKeping/docs-notary
...
Docs: some fix about notarysandbox
2015-08-13 07:47:35 -07:00
f6753cd963
fix broken link to glossary page.
...
Signed-off-by: bin liu <liubin0329@gmail.com >
2015-08-13 22:40:20 +08:00
ef453f7118
Fixing bad formatting reported by David via email
...
Fixed and tested
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-13 06:42:26 -07:00
883fcfe425
fix a typo in graph/graph.go
...
Signed-off-by: Liu Hua <sdu.liu@huawei.com >
2015-08-13 20:01:43 +08:00
7e420ad850
fix golint warnings/errors on pkg/system and pkg/stdcopy
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-08-13 18:47:13 +08:00
79aac6584d
Docs: some fix about notarysandbox
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-08-13 16:53:05 +08:00
4fb88d2e11
Fix #8048 : make docker images repository:tag work
...
Make command like "docker images ubuntu:14.04" work and filter out the
image with the given tag.
Closes #8048 .
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-13 08:50:09 +02:00
90326939c8
Updated test to check for exec --privileged side-effects
...
Also improving documentation for same feature as part of
docker/docker#14113 docs review.
Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au >
2015-08-13 16:37:20 +10:00
03f65b3d0d
Revert "Revert "Add docker exec run a command in privileged mode""
...
This reverts commit 40b71adee372a500e9e5leijitang@huawei.com >.
Signed-off-by: Tim Dettrick <t.dettrick@uq.edu.au >
2015-08-13 16:36:44 +10:00
8a61e2b151
reference/run: Add some articles
...
Signed-off-by: Kai Blin <kai@samba.org >
2015-08-13 06:35:48 +02:00
4d89910820
reference/run: Add a paragraph break
...
Signed-off-by: Kai Blin <kai@samba.org >
2015-08-13 06:34:57 +02:00
650feb29f1
Merge pull request #15541 from thaJeztah/hashtag-space
...
docs: fix fedora prerequisites heading
2015-08-12 19:33:38 -07:00
30cf473f26
Merge pull request #15543 from icecrime/15536_partial_manifest
...
Fix partial manifest push
2015-08-12 19:19:07 -07:00
72e55cb0ec
Merge pull request #15399 from Microsoft/10662-portmapping
...
Windows: [TP3] Enable NAT port mapping
2015-08-12 19:07:14 -07:00
697cdb8e2f
Update regression test
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-08-12 18:46:55 -07:00
4f3b0d0f4a
Revert #14884
...
This reverts commit 810d3b2642arnaud.porterie@docker.com >
2015-08-12 18:46:48 -07:00
c50e78e799
fix link
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-08-12 17:20:20 -07:00
e26ee9a317
Merge pull request #15521 from albers/changelog-rollover
...
[Fix 15520] wrong feature description (rollover) in changelog
2015-08-13 02:17:42 +02:00
d50881e446
Merge pull request #15449 from albers/completion-help
...
Remove -h flag from completion and daemon reference
2015-08-12 17:09:51 -07:00
2c18e1cd05
docs: fix fedora prerequisites heading
...
Fixes the prerequisites heading not being
rendered properly, because of a missing space.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2015-08-13 01:29:10 +02:00
4393be7100
Windows: Enable NAT port mapping
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-12 13:17:27 -07:00
d50d56b352
Merge pull request #15531 from Microsoft/10662-buildercommands
...
Windows: Error on unsupported builder command
2015-08-12 13:13:03 -07:00
d8ff9ef2b5
Merge pull request #15504 from kolyshkin/zfs-nitpicks
...
zfs nitpicks
2015-08-12 11:54:35 -07:00
d3198fa8c4
Merge pull request #15446 from cpuguy83/better_err_on_exec_err
...
Return better errors from exec
2015-08-12 11:13:29 -07:00
394ccfac07
Windows: Error on unsupported builder command
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-12 10:02:23 -07:00
8a0efadee1
Merge pull request #15450 from liubin/liubin/change-port-number-through-example
...
change port number through example context
2015-08-12 09:49:50 -07:00
e82358586d
Merge pull request #15183 from jfrazelle/test-install-script
...
add file to test install script
2015-08-12 09:49:35 -07:00
e4d8a8e1ca
Add storage options to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 06:13:24 -07:00
c7ab9b4a5c
update README.md
...
Add Awesome-docker list to docker resources.
Signed-off-by: Julien Bisconti <julien.bisconti@gmail.com >
2015-08-12 15:10:29 +02:00
5c1ad6f90c
Add options for the json-file logging driver to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 04:39:29 -07:00
644c158837
Update bash completion for docker run
...
Also fixed sort order of options using `sort -d`
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 04:38:55 -07:00
967c50cfe9
Fix wrong feature description (rollover) in changelog
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 04:20:16 -07:00
b4a89489ae
Fix wrong feature description in changelog
...
See https://github.com/docker/docker/issues/15518
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-12 03:25:37 -07:00
dc945f5559
Merge pull request #15512 from moxiegirl/fix-links-checker
...
Fixes after release
2015-08-11 23:15:04 -07:00
8b09f8a302
Fixes after release
...
Adding in a link about the deprecated material
Fixing bad link to staging
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-11 23:13:14 -07:00
a7cfb098d4
reference/run: Clarify the use of numeric UIDs
...
it is possible to pass an UID that has not been created inside the container, clarify this in the docs.
This should fix issue #14795
Signed-off-by: Kai Blin <kai@samba.org >
2015-08-12 06:34:37 +02:00
15a232fd06
graphdriver/zfs: fix GetMetadata() comment
...
Commit e27c904407a626kir@openvz.org >
2015-08-11 18:16:11 -07:00
f5f7fee2ec
graphdriver/zfs: privatize mountPath and zfsPath
...
These functions are not part of the graphdriver.Driver
interface and should therefore be private.
Also, remove comments added by commit e27c904kir@openvz.org >
2015-08-11 18:16:08 -07:00
f5e2c6f14b
Merge pull request #15502 from mrunalp/fixup_comment
...
Fix incorrect comment
2015-08-11 16:53:23 -07:00
d626f77e36
Fix incorrect comment
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com >
2015-08-11 19:45:23 -04:00
13873e6841
Merge pull request #15377 from jfrazelle/do-not-keep-old-experimental-debs
...
do not keep old debs for experimental
2015-08-11 16:35:55 -07:00
0eade329dc
fix oracle linux install
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-11 16:33:14 -07:00
83416f68de
add file to test install script
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-11 16:31:58 -07:00
230cfc6ed2
Fixing Tar functions to support Windows long paths.
...
Signed-off-by: Stefan J. Wernli <swernli@microsoft.com >
2015-08-11 16:07:36 -07:00
9bde19e72a
skip checkOrigin during websocket handshake
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
2015-08-12 00:05:59 +02:00
0e3674d7d0
Merge pull request #15485 from calavera/merge_release_v1.8.0
...
Bump version to 1.8.0 in master
2015-08-11 13:38:57 -05:00
a09ba62d18
Bump dev version to 1.9.0-dev
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-11 10:21:12 -05:00
e873686017
Bump version to 1.8.0
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-11 10:20:47 -05:00
bca8159174
Make the release process more atomic between major releases.
...
Rather than keeping a branch named "release" where we merge every release,
we want to keep "disposable" release branches for each release.
This will make much easier to create new major releases, since we always
want to start these releases from what we have in master. We create a
disposable release branch from master that we'll only use during the lifecycle
of the major release.
Once the release branch is created, the release captain will use a "bump" branch
in her own fork to cherry pick changes that will need to be applied to this
release. We'll track those changes in a pull request between the disposable release
branch and the bump branch.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-11 10:09:25 -05:00
3e596da9ea
Merge pull request #15474 from tonistiigi/network-ui-endpoints-windows
...
Mark network ui endpoints unix-only
2015-08-11 09:32:09 -05:00
ceb11d9660
Remove -h flag from completion and daemon reference
...
All docker subcommands support `-h` as an alias for `--help`
unless they have `-h` aliased to something else like `docker run`,
which uses `-h` for `--hostname`.
`-h` is not included in the help messages of the commands, though.
It ist visible in
* reference: only in `docker daemon` reference,
see output of `grep -Rse --help=false docs`
* man pages: only in `docker` man page
see output of `grep -RF '**-h**' man`
For consistency reasons, this commit removes `-h` as an alias for
`--help` from the reference page, man page and the bash completion.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-11 07:30:58 -07:00
beab255cc0
Merge pull request #15473 from jfrazelle/minor-cosmetic-change
...
minor cosmetic change to client output on pull
2015-08-10 23:20:05 -07:00
8bd6322760
minor cosmetic change to client output on pull
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-10 21:54:03 -07:00
6e3740450d
Mark network ui endpoints unix-only
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
2015-08-10 21:49:27 -07:00
ca8f24679e
Merge pull request #15459 from jfrazelle/make-windows-cross-compile-static-daemon-work
...
make windows cross compile static daemon work
2015-08-10 17:53:09 -07:00
c4cb55b84f
Merge pull request #15458 from moxiegirl/remove-registry-v1-14616
...
Removing references to registry 1.0
2015-08-10 17:44:32 -07:00
d550d729e1
Initial work
...
Removing references to regsitry 1.0, pointing to distribution
Updating links and title
Adding in comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-10 17:43:41 -07:00
1eb1083066
Merge pull request #15396 from moxiegirl/my-trust-changes
...
Docker content trust documentation
2015-08-10 17:24:06 -07:00
753bf40f15
Docker content trust documentation
...
- started from Diogo's work
- updated after discussions with team
- Updating with new key names
- fixing weight
- adding in sandbox
- adding in gliffy for images
- backing out to old names for now
- Copy edit pass
- Entering comments from the content trust team
- Update name of branch and image name
- Removing the last diogo reference
- Updating with Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-10 17:22:11 -07:00
e62745922f
make windows cross compile static daemon work
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-10 16:16:58 -07:00
4bfbeb80a6
Merge pull request #15462 from moxiegirl/add-migrate-windows-15454
...
Updating new vm name, add migrate, and Windows 10 limitation
2015-08-10 15:13:08 -07:00
e5c160e1d6
Updating new vm and with migrate
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-10 13:29:08 -07:00
0bfad28b86
Merge pull request #15422 from kolyshkin/graphtest-fix
...
graphtest: filter out lost+found dir entry
2015-08-10 12:21:21 -07:00
4293861c1e
Merge pull request #15452 from albers/completion-storage-driver
...
Add missing storage drivers to bash completion
2015-08-10 13:25:45 -04:00
6f89a8ee1b
Merge pull request #15404 from vbatts/vbatts-dm-zero-sized-field
...
devicemapper: fix zero-sized field access
2015-08-10 09:16:11 -07:00
5cee7e8116
Add missing storage drivers to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-10 08:49:40 -07:00
b0a65f93a5
change port number through example context
...
Signed-off-by: bin liu <liubin0329@gmail.com >
2015-08-10 23:12:03 +08:00
f83d05c3be
devicemapper: fix zero-sized field access
...
Fixes : #15279
Due to
https://github.com/golang/go/commit/7904946eeb35faece61bbf6f5b3cc8be2f519c17
the devices field is dropped.
This solution works on go1.4 and go1.5
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-08-10 11:11:58 -04:00
51249a3aa0
Merge pull request #15445 from hqhq/hq_use_docker_daemon
...
Change all docker -d to docker daemon
2015-08-10 10:35:19 -04:00
2231c5161e
Merge pull request #15447 from albers/completion-ps-format
...
Add `docker ps --format` to bash completion
2015-08-10 10:31:49 -04:00
a7c00bc1a2
change exportImage to top-level func
...
Signed-off-by: Kun Zhang <zkazure@gmail.com >
remove useless FIXME
Signed-off-by: Kun Zhang <zkazure@gmail.com >
fix
Signed-off-by: Kun Zhang <zkazure@gmail.com >
2015-08-10 22:18:57 +08:00
f078f75bf2
Return better errors from exec
...
Also cleans up some of the API side of exec.
Was writing the header twice (two different headers).
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-10 09:53:19 -04:00
c465ba7bde
Add docker ps --format to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-10 06:51:14 -07:00
ba0eba6960
Merge pull request #15426 from BenHall/15425-set-e-install-script-fix
...
Fix install.sh to handle non-zero exit codes when checking lsb_release
2015-08-10 08:47:19 -05:00
650d5d5d7a
Merge pull request #15437 from calavera/remove_wrong_doc
...
Remove doc that doesn't apply to Journald.
2015-08-10 08:44:08 -05:00
5d54f50751
Merge pull request #15441 from summershrimp/master
...
fix typo mistake
2015-08-10 08:18:09 -05:00
81cc8ebc93
Change all docker -d to docker daemon
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-10 20:48:08 +08:00
fa9e54fbf1
fix typo mistake
...
Signed-off-by: Yibai Zhang <xm1994@gmail.com >
2015-08-10 16:30:48 +08:00
f1412f2942
Remove doc that doesn't apply to Journald.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-09 22:12:42 -05:00
ff97bc79cb
Tiny fix for rpm and deb descriptions
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-10 09:34:10 +08:00
b173314cca
Merge pull request #15400 from vincentbernat/doc/memory-cgroup-overhead
...
doc: add a notice about memory accounting overhead
2015-08-09 16:38:41 -07:00
8e05a3e30f
Merge pull request #15411 from moxiegirl/fix-links-15349
...
Fixes #15349 too many apis
2015-08-09 20:52:49 +02:00
158c536267
graphtest: filter out lost+found dir entry
...
Ploop graph driver provides its own ext4 filesystem to every
container. It so happens that ext4 root comes with lost+found
directory, causing failures from DriverTestCreateEmpty() and
DriverTestCreateBase() tests on ploop.
While I am not yet ready to submit ploop graph driver for review,
this change looks simple enough to push.
Note that filtering is done without any additional allocations,
as described in https://github.com/golang/go/wiki/SliceTricks .
[v2: added a comment about lost+found]
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
2015-08-09 10:23:36 -07:00
98ec623a8b
Merge pull request #15431 from charleswhchan/patch-4
...
Cleanup "Automatically start containers" page.
2015-08-09 10:10:42 -07:00
ad3df49958
Cleanup "Automatically start containers" page.
...
* Remove old information for Docker 1.2. (See PR #15408 )
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-08 17:28:21 -07:00
316eb2979e
Improve/fix "Dockerizing Applications" page.
...
* Try to update the wording for the notes.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-08 16:13:23 -07:00
34a17a5de1
Merge pull request #15427 from calavera/fix_overlay_typo
...
Fix typo in Overlay documentation.
2015-08-08 18:14:38 -04:00
f1f6738d97
Fix typo in Overlay documentation.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-08 15:11:09 -07:00
00843d18d8
Merge pull request #15312 from yyekhlef/fedora_22_doc
...
Fedora 22 manual network configuration and ip forwarding
2015-08-08 12:59:11 -07:00
030df72279
Merge pull request #15408 from ankushagarwal/env-var-docs
...
Make Environment replacement note less kludgy
2015-08-08 12:56:19 -07:00
22d539866c
Merge pull request #15409 from ankushagarwal/wgetcurl
...
Make official install instructions use curl instead of wget
2015-08-08 12:51:48 -07:00
cc73fc03e8
Merge pull request #15421 from maaquib/15418-ps-image-id-too-wide
...
Truncating image id is docker ps to a length of 12
2015-08-08 07:48:16 -04:00
764aa1a583
Merge pull request #15074 from coolljt0725/14756_enable_golint_2
...
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
2015-08-08 07:14:53 -04:00
3b28bada0a
Fix install.sh to handle non-zero exit codes when checking lsb_release
...
Signed-off-by: Ben Hall <ben@benhall.me.uk >
2015-08-08 11:44:52 +01:00
bf892dcfcc
Merge pull request #15420 from vlajos/typofixes-vlajos-20150807
...
typofix - https://github.com/vlajos/misspell_fixer
2015-08-08 01:08:49 -07:00
46f40c34d2
Merge pull request #15424 from coolljt0725/typo_remove_useless_period
...
Typo: remove unconsistent period in docker info
2015-08-08 01:04:38 -07:00
dc2a7ab750
Typo: remove unconsistent period in docker info
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-08 13:06:59 +08:00
03f969d0b3
Merge pull request #15423 from HuKeping/if-else
...
Remove useless if-else
2015-08-07 21:54:30 -07:00
c536cec5ea
Remove useless if-else
...
It is better to use simple form without else.
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-08-08 20:02:44 +08:00
5220f3b535
Enable golint in pkg/jsonlog and pkg/jsonmessage.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-08 11:28:22 +08:00
196aa6d62d
Merge pull request #14965 from stefanberger/nohidevols2
...
Have network files mounted read-only when -v parameter has 'ro' passed
2015-08-07 19:10:59 -07:00
1a2ccf59ee
Truncating image id to 12 in docker ps
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
2015-08-07 20:53:48 -04:00
5146232723
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com >
2015-08-07 23:25:49 +01:00
1e2765dabb
Merge pull request #15109 from kevishi/new-config-reader
...
Added support for creating a cliconfig.ConfigFile via io.Reader
2015-08-07 14:43:55 -07:00
4f349cdd4b
Merge pull request #14719 from icecrime/14662_update_issue_triage
...
Update issue triaging process
2015-08-07 14:37:31 -07:00
89ec5399af
Remove note from docker version 1.3 on Env variables
...
Fixes #14734
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-08-07 14:36:06 -07:00
7ac357c795
Merge pull request #15416 from vdemeester/lint-remove-pkgsystemd
...
Remove pkg/systemd from validate-lint
2015-08-07 14:31:12 -07:00
c7e1f91a9e
Update Windows TP3 registry endpoints
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-08-07 14:03:46 -07:00
34679e568a
Added support for creating a cliconfig.ConfigFile via io.Reader
...
Signed-off-by: Kevin Shi <kshi@andrew.cmu.edu >
2015-08-07 14:02:03 -07:00
b8559991dc
Remove pkg/systemd from validate-lint
...
Following #15330 , pkg/systemd doesn't exists anymore.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-07 22:26:45 +02:00
5110095310
Merge pull request #15014 from brahmaroutu/lint_daemon_graphdriver_overlay
...
daemon/graphdriver/overlay/ fix lint errors/warnings
2015-08-07 13:06:56 -07:00
0262d40ba7
Merge pull request #15370 from cpuguy83/better_error_on_client_connect
...
Better/more specific error messages on connect
2015-08-07 13:00:44 -07:00
1d5f479e01
Fixes #15349 too many apis
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-07 11:37:05 -07:00
de3944219f
daemon/graphdriver/overlay/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-07 18:34:59 +00:00
0a0e9701f7
Merge pull request #14897 from WeiZhang555/golint-api-types
...
fix golint warnings/errors on package api/types/
2015-08-07 10:51:27 -07:00
b1009d1fdd
Merge pull request #14828 from brahmaroutu/lint_graph_tags
...
/graph/tag fix lint errors/warnings
2015-08-07 10:49:26 -07:00
70cae97ee2
Merge pull request #14811 from devx/refactor-clientRequestAttemptLogin
...
Cleanup: Factor cmdAttempt out of cli.clientRequestAttemptLogin
2015-08-07 10:47:18 -07:00
510ecbf371
Merge pull request #15407 from calavera/daemon_supported_flag
...
Add platformSupported flag to enable daemon mode by platform.
2015-08-07 13:45:10 -04:00
c76fef1791
Make official install instructions use curl instead of wget
...
YOU GO CURL
Fixes #14650
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-08-07 10:16:09 -07:00
10d30c6457
Add platformSupported flag to enable daemon mode by platform.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-07 09:45:24 -07:00
38e5764132
Merge pull request #15371 from ankushagarwal/flags
...
Add test to check if subcommands are sorted
2015-08-07 12:21:00 -04:00
27fd64c67f
Merge pull request #15392 from Microsoft/js/vendor_ansiterm
...
Update vendored go-ansiterm for Windows console
2015-08-07 09:01:31 -07:00
a8026239fc
Merge pull request #15385 from jfrazelle/gpg-passphrase-rpm-sign-fix
...
Gpg passphrase rpm sign fix
2015-08-07 08:53:51 -07:00
81c679acae
Merge pull request #15405 from duglin/BFlagDoc
...
Just add some code doc around the use of AddXXX func to avoid any confusion
2015-08-07 11:47:18 -04:00
592908c0f5
Just add some code doc around the use of AddXXX func to avoid any confusion
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-08-07 08:07:27 -07:00
56b33e9f27
doc: add a notice about memory accounting overhead
...
The documentation for Debian and Ubuntu explains how to enable memory
and swap accounting but doesn't explain why it is disabled in the first
place. The problem with those subsystems is that they incurs a
performance hit even when not used at all. Add this explanation.
The provided figure are quite vague. The memory overhead is easily
verifiable. It is for example cited in [RedHat documentation][]. For the
performance hit, maybe the performance is better now, but a few years
ago, it was said to be [between 6 and 15%][].
The goal is that people don't just enable memory accounting if they
don't have a use for it.
[RedHat documentation]: https://access.redhat.com/documentation/en-US/Red_Hat_Enterprise_Linux/6/html/Resource_Management_Guide/sec-memory.html
[between 6 and 15%]: https://lwn.net/Articles/517562/
Signed-off-by: Vincent Bernat <vincent@bernat.im >
2015-08-07 14:31:33 +02:00
4d212f7853
Add test to check if subcommands are sorted
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-08-07 01:34:21 -07:00
ecf528fcb6
Update vendored go-ansiterm for Windows console
...
This update fixes Windows client console bugs and increases VT100
compatibility. With this change, nano and emacs become usable, and bash
works better.
Signed-off-by: John Starks <jostarks@microsoft.com >
2015-08-06 20:48:02 -07:00
b9094633f3
Merge pull request #15386 from jfrazelle/remove-docker-unconfined-profile
...
remove docker-unconfined profile we were not using it
2015-08-06 20:06:33 -07:00
3d6617ffe7
fix golint warnings/errors on package api/types/
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-08-07 09:43:43 +08:00
c016d2defd
Remove unnecessary func parameter, add mirror endpoint test
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
2015-08-07 02:25:41 +01:00
38295d4b48
Have network files mounted read-only when -v parameter has 'ro' passed
...
Have network files mounted read-only when mounted using the -v
open and -v parameter has 'ro' passed.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com >
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-06 20:37:28 -04:00
818190b1ff
Merge pull request #15351 from SvenDowideit/remove-hub-v1-documentation
...
Removing Hub v1 documentation, Hub v2 documentation will come from th…
2015-08-07 10:33:15 +10:00
04cd81401a
Merge pull request #15141 from Microsoft/10662-cp
...
Windows [TP3] - make docker cp functional
2015-08-06 17:15:09 -07:00
e542238f2a
remove docker-unconfined profile we were not using it and it breaks apparmor on wheezy
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-06 16:51:01 -07:00
6168a992c7
Merge pull request #15381 from calavera/carry_15275
...
[Carry 15275] Runtime sysinfo check
2015-08-06 16:48:22 -07:00
9f530aba7f
remove unused images
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-08-06 23:34:29 +00:00
203776a40c
fix rpm signing so it does not open a tty w question
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-06 16:18:40 -07:00
70092b3ee0
Removing Hub v1 documentation, Hub v2 documentation will come from that repository
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-08-06 23:00:49 +00:00
c2bc637a03
Remove pointers from the SysInfo struct.
...
Because they can just be values.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-06 15:57:21 -07:00
4177b0bae0
Add hostConfig check before starting a container
...
It may happen that host system settings are changed while the daemon is running.
This will cause errors at libcontainer level when starting a container with a
particular hostConfig (e.g. hostConfig with memory swappiness but the memory
cgroup was umounted).
This patch adds an hostConfig check on container start to prevent the daemon
from even calling libcontainer with the wrong configuration as we're already
doing on container's creation).
Signed-off-by: Antonio Murdaca <runcom@linux.com >
(cherry picked from commit 0d2628cdf19783106ae8723f51fae0a7c7f361c6)
2015-08-06 15:46:10 -07:00
b2d06b6fba
Move sysinfo out of daemon struct
...
sysinfo struct was initialized at daemon startup to make sure
kernel configs such as device cgroup are present and error out if not.
The struct was embedded in daemon struct making impossible to detect
if some system config is changed at daemon runtime (i.e. someone
umount the memory cgroup). This leads to container's starts failure if
some config is changed at daemon runtime.
This patch moves sysinfo out of daemon and initilize and check it when
needed (daemon startup, containers creation, contaienrs startup for
now).
Signed-off-by: Antonio Murdaca <runcom@linux.com >
(cherry picked from commit 472b6f66e03f9a85fe8d23098dac6f55a87456d8)
2015-08-06 15:46:09 -07:00
6b341f2b9d
Merge pull request #15378 from tiborvass/dont-push-to-mirror
...
registry: Do not push to mirrors
2015-08-06 15:30:06 -07:00
fe6c0e44be
Merge pull request #15376 from aboch/ep
...
Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
2015-08-06 15:14:01 -07:00
aadb3407d3
to not keep old debs for experimental
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-06 14:49:05 -07:00
b899977ee2
registry: Do not push to mirrors
...
This patch splits LookupEndpoints into LookupPullEndpoints and
LookupPushEndpoints so that mirrors added with --registry-mirror are
skipped in the list returned by LookupPushEndpoints.
Fixes https://github.com/docker/distribution/issues/823
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-08-06 17:41:59 -04:00
9ce0a20c01
Merge pull request #15320 from hqhq/hq_add_cgroup_check
...
Check sysinfo for Cpuset cpu.shares and blkio
2015-08-06 14:23:37 -07:00
e35a5ae463
Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-08-06 14:23:25 -07:00
287e8167f2
Merge pull request #15350 from jfrazelle/revert-apparmor-stuff
...
revert apparmor changes back to how it was in 1.7.1
2015-08-06 13:57:55 -07:00
9994a35b5d
Better/more specific error messages on connect
...
Closes #15309
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-06 16:41:37 -04:00
ed248207d7
revert apparmor changes back to how it was in 1.7.1, but keep tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-06 12:49:25 -07:00
612a1fb4ab
Documenting Docker release process
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-08-06 11:42:27 -07:00
2a237615c0
Windows - make docker cp functional
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Conflicts:
pkg/archive/copy.go
Make it compile
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-06 11:22:38 -07:00
c471b7aba5
Merge pull request #15361 from hqhq/hq_use_docker_daemon
...
Use docker daemon for intergation test daemon start
2015-08-06 10:40:49 -07:00
33ed76b0f7
Merge pull request #15369 from coolljt0725/adapt_container_settings_after_verify
...
Adapt container settings after verify platform container settings.
2015-08-06 10:16:54 -07:00
4640c4abe8
Merge pull request #15240 from vdemeester/cliconfig-test-coverage
...
Add unit test (coverage) to package cliconfig
2015-08-06 13:16:04 -04:00
f6106fc3ce
Merge pull request #15330 from runcom/refactor-pkg-systemd
...
Vendor go-systemd daemon and refactor pkg systemd
2015-08-06 10:02:04 -07:00
73ad1b2674
Add unit test to pkg cliconfig (and thus coverage)
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-06 18:02:25 +02:00
57c8f4244b
Merge pull request #15213 from Microsoft/10662-cliwindowsdaemon
...
Windows: Test infrastructure plumbing
2015-08-06 11:25:22 -04:00
931645c460
Remove pkg/systemd
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-08-06 14:35:00 +02:00
61c9f4db41
Vendor coreos/go-systemd/daemon
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-08-06 14:34:40 +02:00
08b3dc8d9f
Adapt container settings after verify platform container settings.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-06 19:56:51 +08:00
f8387f6904
Fix silent failure in RedHat sysvinit script
...
The docker script in contrib/init/sysvinit-redhat will fail silently on
a start if Docker is not installed in the default /usr/bin/ location.
While a non-zero exit code is returned the user will receive no visible
indication (i.e. error message) as to why Docker was not started.
This commit changes the logic so that in the case that the docker
executable is not found in the expected location or the user does not
have execute permissions on the executable appropriate error messages
are now shown to the user as well as exiting with a non-zero exit code
Signed-off-by: Rob Vesse <rvesse@dotnetrdf.org >
2015-08-06 12:07:38 +01:00
b8a8ac9b58
Use docker daemon for intergation test daemon start
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-06 16:20:57 +08:00
ad5355151c
Merge pull request #15335 from moxiegirl/boot2docker-remove-refs
...
Boot2Docker Cleanup
2015-08-06 08:48:57 +02:00
5b289cd1aa
Merge pull request #15313 from Microsoft/10662-fixcertdir
...
Windows: [TP3] Fix certificate directory for registry
2015-08-05 22:59:51 -04:00
cc375a1e48
- Remove references to sudo in basics.md; see sudo instructions top of file
...
- Removing references to Boot2Docker replacing with Docker Machine
- Removing sudo warnings in instances where appropriate (no sudo in file)
- Updating with comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-05 19:45:43 -07:00
3273209a9c
Merge pull request #15075 from hqhq/hq_move_cpushare_change
...
Cleanup: Merge adjustCpuShares to adoptContainerSettings
2015-08-05 21:53:58 -04:00
263220fa30
Merge pull request #15354 from coolljt0725/remove_redundant_ip_forward_check
...
Remove redundant ip_forward check
2015-08-05 18:52:44 -07:00
af9dc3050b
Merge pull request #15353 from jlhawn/fixing-concurrency-trust
...
[graph] Use a pipe for downloads to write progress
2015-08-05 18:52:27 -07:00
6805241fe2
Merge pull request #15352 from icecrime/fix_pause_tests
...
Use busybox in 'pause' tests
2015-08-06 03:14:44 +02:00
d80c4244d3
[graph] Use a pipe for downloads to write progress
...
The process of pulling an image spawns a new goroutine for each layer in the
image manifest. If any of these downloads fail we would stop everything and
return the error, even though other goroutines would still be running and
writing output through a progress reader which is attached to an http response
writer. Since the request handler had already returned from the first error,
the http server panics when one of these download goroutines makes a write to
the response writer buffer.
This patch prevents this crash in the daemon http server by waiting for all of
the download goroutines to complete, even if one of them fails. Only then does
it return, terminating the request handler.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-08-05 18:13:39 -07:00
6a0050d0f0
Remove redundant ip_forward check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-06 09:06:31 +08:00
efe4f0dfa9
Merge pull request #15119 from xnox/sdnotify
...
systemd: set service type to notify.
2015-08-05 17:42:58 -07:00
3529e3dac7
Use busybox in 'pause' tests
...
Don't assume that any random image will have 'top' and explicitely use
the busybox image for testing.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-08-05 17:35:20 -07:00
e0af23dc18
Cleanup: Merge adjustCPUShares to adoptContainerSettings
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-06 08:15:14 +08:00
044c4e00a0
Merge pull request #15334 from Mashimiao/change-name-check-for-image-delete
...
image_delete: move name check first
2015-08-06 02:07:34 +02:00
8534090476
Merge pull request #15252 from coolljt0725/14765_enable_golint_3
...
Enable golint in pkg/archive
2015-08-05 19:27:48 -04:00
d93eca2250
Merge pull request #15345 from calavera/fix_ps_format_error
...
Fail fail when the ps format template is invalid.
2015-08-05 19:19:33 -04:00
a8e67849b9
Merge pull request #15001 from fmoliveira/master
...
Adding support for elementary OS distro in install script.
2015-08-05 16:14:47 -07:00
da44d0fccb
Windows: Test infrastructure plumbing
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-05 14:34:32 -07:00
565535073f
Merge pull request #15346 from Microsoft/minortypo
...
Minor typo in test-and-docs.md
2015-08-05 22:27:18 +02:00
831b00303f
Windows: Fix certificate directory for registry
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-05 13:25:41 -07:00
b5eea8f33b
Minor typo in test-and-docs.md
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-05 13:22:39 -07:00
3d3db0d4af
Fail fail when the ps format template is invalid.
...
Fixes error continuing execution when the parsing fails.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-05 13:22:24 -07:00
aec46ac0b2
Merge pull request #15336 from Microsoft/fixwindowsci
...
Windows: Fix for CI
2015-08-05 13:11:59 -07:00
ac120567e8
Windows: Workaround for CI
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-05 11:20:30 -07:00
d9b261221a
/graph/tag fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-05 17:46:41 +00:00
08a867b82f
add documentation clarifying behavior of VOLUME instruction
...
Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com >
2015-08-05 12:34:31 -04:00
cb2def9f90
image_delete: move name check first
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
2015-08-06 00:27:45 +08:00
6206cbe193
Merge pull request #15305 from vdemeester/contribution-docs-updates
...
Update some contributions documentations
2015-08-05 08:46:53 -07:00
b7599d58cb
Check sysinfo for Cpuset cpu.shares and blkio
...
Carried: #14015
If kernel is compiled with CONFIG_FAIR_GROUP_SCHED disabled cpu.shares
doesn't exist.
If kernel is compiled with CONFIG_CFQ_GROUP_IOSCHED disabled blkio.weight
doesn't exist.
If kernel is compiled with CONFIG_CPUSETS disabled cpuset won't be
supported.
We need to handle these conditions by checking sysinfo and verifying them.
Signed-off-by: Zefan Li <lizefan@huawei.com >
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-05 22:35:18 +08:00
a15b676ee1
Merge pull request #15318 from Microsoft/10662-fixmasteragain
...
Windows: Fix docker/master daemon compile again
2015-08-05 08:32:12 -04:00
bb161b7789
move the assertions outside of the goroutine
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-08-05 13:59:31 +08:00
67e670b79f
Windows: Fix docker/master daemon compile again
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-04 19:32:05 -07:00
c9a28b4951
Update issue triaging process
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-08-04 19:27:25 -07:00
7374852be9
Merge pull request #14921 from aaronlehmann/int64
...
Fix uses of "int" where "int64" should be used instead
2015-08-04 19:16:13 -07:00
b985dca578
Merge pull request #15241 from vdemeester/api-test-coverage
...
Add more unit tests (coverage) to package api
2015-08-04 18:41:35 -07:00
2c3cd949c8
Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs
...
daemon/graphdriver/zfs fix lint errrors/warnings
2015-08-04 18:41:02 -07:00
7b077c16d6
Merge pull request #15302 from LK4D4/update_libcontainer
...
Update runc to v0.0.3
2015-08-04 18:40:32 -07:00
f618de1543
Adding support to forked distributions in installer script.
...
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br >
2015-08-04 21:33:48 -03:00
35aebdc803
Add fedora 22 install docs warning about systemd-network
...
With systemd in version 219 IP forwarding should be forced in the interface configuration file.
Signed-off-by: yyekhlef <yyekhlef@gmail.com >
2015-08-05 01:33:13 +02:00
f224a9f3d6
Add fedora 22 install docs warning about systemd-network
...
Following @cles commit #6bd15a68c for Arch
Signed-off-by: yyekhlef <yyekhlef@gmail.com >
2015-08-05 01:32:33 +02:00
58121c59ff
Merge pull request #15304 from jfrazelle/only-sign-files-changes-within-last-2-hours
...
only sign the files that were changed in the last 2 hours
2015-08-04 14:16:20 -07:00
63940145a4
Merge pull request #15303 from Microsoft/10662-fixdaemonbuild
...
Windows: Daemon compile was broken
2015-08-04 16:48:11 -04:00
efd47654dd
only sign the files that were changed in the last 2 hours
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-04 13:16:57 -07:00
d4d3504122
Merge pull request #15301 from jfrazelle/fix-systemd-docs
...
update systemd article to reference dropin file
2015-08-04 22:12:36 +02:00
b304920021
Update some contributions documentations
...
- Add a golint entry to coding-style.md
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-04 22:04:11 +02:00
fe8cfc5b39
Windows: Daemon compile was broken
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-08-04 12:42:41 -07:00
23dab01ed2
Merge pull request #14840 from HuKeping/golint-pkg-sysinfo
...
Fix golint warning on pkg/sysinfo
2015-08-04 20:57:39 +02:00
e27c904b99
daemon/graphdriver/zfs fix lint errrors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-04 18:30:55 +00:00
35e7a7c3e2
update systemd article to reference dropin file
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-08-04 11:03:43 -07:00
f7e43d45b3
Add more unit tests (thus coverage) to pkg api
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-04 19:51:02 +02:00
a4ddf0e362
Update runc to v0.0.3
...
This fixes criu behavior with mounted cgroups.
It includes also update of go-systemd dependecy.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-04 10:47:59 -07:00
0f49141150
Merge pull request #15300 from l0rd/test-and-docs-fix
...
Removed `docs-test` from Makefile rules list
2015-08-04 19:41:48 +02:00
c4b9884ab5
Merge pull request #15260 from albers/completion-config
...
Add `--config` to bash completion
2015-08-04 10:14:15 -07:00
2c6fa8375b
Merge pull request #15291 from duglin/FixInspectExecId
...
Another try to fix InspectExecID
2015-08-04 10:13:42 -07:00
fe6a7c8e57
Another try to fix InspectExecID
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-08-04 09:21:41 -07:00
c5e0ea02f7
Merge pull request #15297 from lerignoux/15296-updating-docs-README-new-md-file
...
Removing deprecated notice to update mkdocs.yml in docs README
2015-08-04 09:04:21 -07:00
5237670b5b
Removed docs-test from Makefile rules list
...
Signed-off-by: Mario Loriedo <mario.loriedo@gmail.com >
2015-08-04 15:57:42 +00:00
be07c53d2d
Merge pull request #15259 from sallyom/manFixes
...
make man/docker.1.md consistent with docker --help
2015-08-04 08:34:52 -07:00
ac1794d3e2
Removing deprecated notice to update mkdocs.yml in docs README
...
Signed-off-by: Laurent Erignoux <lerignoux@gmail.com >
2015-08-04 15:15:46 +02:00
bc12094251
Merge pull request #15236 from charleswhchan/patch-1
...
Fix #15212 : Add "Label" key to output of /containers/json
2015-08-04 21:48:39 +10:00
c26c1eb8ba
Merge pull request #15278 from campoy/14558-break-long-command
...
Break long command to avoid cropping
2015-08-04 08:27:55 +02:00
ba332b7d12
Enable golint in pkg/arcive
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-04 09:52:54 +08:00
16b5b6e49f
Break long command to avoid cropping
...
Fixes docker/docker#14558
Signed-off-by: Francesc Campoy <campoy@google.com >
2015-08-03 18:36:32 -07:00
b245bcd458
Fix #15212 : Add "Labels" key to output of /containers/json
...
Applied retroactively from API v1.18 - v1.21.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-03 18:11:33 -07:00
dff25c9e46
Merge pull request #15277 from calavera/check_apparmor_docker_contrib
...
Include apparmor/docker only when it exists.
2015-08-03 17:36:23 -07:00
408cffac94
Include apparmor/docker only when it exists.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-03 17:34:04 -07:00
d7c2fe0f20
Merge pull request #15276 from aboch/24
...
Fix preallocated bridge networks
2015-08-03 17:21:03 -07:00
85a0f56fe7
Add more amazing women to the names generator.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-03 17:19:36 -07:00
dab0447ae0
Fix preallocated bridge networks
...
- Because of a bug, all the statically preallocated
bridge networks have /24 as network mask.
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-08-03 16:37:01 -07:00
ff3adb135d
Merge pull request #15114 from hqhq/hq_exedriver_win_lint
...
Fix golint warnings for daemon/execdriver/windows
2015-08-03 16:28:47 -07:00
8d3bc4b98c
Merge pull request #15261 from LK4D4/fix_fluentd_vendor
...
Fix vendoring for fluent-logger-golang
2015-08-03 16:13:05 -07:00
40bd10dc95
Merge pull request #15273 from calavera/remove_new_key_path_on_error
...
Remove key file when migration fails.
2015-08-03 16:07:22 -07:00
dfb63b0425
Merge pull request #15255 from crosbymichael/lxc-dep
...
Add LXC built in support deprecation notice
2015-08-03 15:36:43 -07:00
07c45e499d
Remove key file when migration fails.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-08-03 15:29:54 -07:00
06f6c0c7e5
Add LXC built in support deprecation notice
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-08-03 14:54:42 -07:00
e84a938f2e
Merge pull request #15222 from jlhawn/error_on_v2pull_hash_mismatch
...
[Re]Enforce manifest/layer digest verification
2015-08-03 13:02:52 -07:00
f3bea61c80
make man/docker.1.md consistent with docker --help
...
"Options:" listed when you run "docker --help" and "docker daemon
--help" do not match the options listed in "man/docker.1.md". This PR
makes 'docker --help', 'docker daemon --help' and 'man docker' consistent.
Also 2 typo fixes.
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-08-03 15:12:33 -04:00
00c1874b8e
Merge pull request #15092 from brahmaroutu/lint_daemon_graphdriver_vfs
...
daemon/graphdriver/vfs fix lint errors/warnings
2015-08-03 11:50:05 -07:00
de52a3bcaa
[graph] Enforce manifest/layer digest verification
...
We noticed a regression since the 1.7.1 patch after some refactoring. This
patch corrects the behavior and adds integration tests for modified manifest
and rootfs layer blobs.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-08-03 11:41:23 -07:00
102724700b
Merge pull request #13698 from cpuguy83/split_api_routes_from_setup
...
Move api handlers to separate file
2015-08-03 14:03:15 -04:00
3e7f9c636a
daemon/graphdriver/vfs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-08-03 17:46:42 +00:00
ef7bb7242f
Fix vendoring for fluent-logger-golang
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-08-03 10:23:50 -07:00
b898111d3a
Add --config to bash completion
...
The custom configuration will also be used in docker invocations made
by the completion script itself, just like `-H`.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-03 19:03:43 +02:00
b9aaf8c758
Merge pull request #15257 from sallyom/manTypo
...
Typo fix: man/docker-tag.1.md
2015-08-03 12:53:04 -04:00
70ac38025c
Typo fix: man/docker-tag.1.md
...
Signed-off-by: Sally O'Malley <somalley@redhat.com >
2015-08-03 12:51:10 -04:00
637cf3a4b7
Merge pull request #15233 from srust/add_blockbridge_volume_plugin
...
Docs: Add Blockbridge volume plugin
2015-08-03 09:46:33 -07:00
137995cb94
Merge pull request #15229 from albers/completion-inspect-filter-by-type
...
Filter completions of `docker inspect` by `--type`
2015-08-03 09:45:21 -07:00
67bca8ab8a
Merge pull request #15215 from dmcgowan/notary-update
...
Notary updates
2015-08-03 09:06:09 -07:00
1367bb41fc
Merge pull request #15249 from Evalle/15198-fix-path-to-routing-menu
...
Fix wrong path to YaST's 'Routing' menu for openSUSE Tumbleweed
2015-08-03 09:04:10 -07:00
cc5cd65e6d
Merge pull request #15248 from vdemeester/userguide-fixes
...
Fix "Getting started" link in userguide
2015-08-03 09:00:18 -07:00
d136f5e027
Merge pull request #15102 from moxiegirl/fix-run-headings
...
Several fixes in formatting
2015-08-03 08:46:15 -07:00
70aa63b92a
Several fixes in formatting
...
- fixing headings in run.md
- creating a table for readability
- adding index for logging
- moving logging overview into logging
- Updating with Seb's comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-08-03 08:45:25 -07:00
69f3def58d
Merge pull request #15225 from runcom/add-restart-always-test-on-daemon-restart
...
test: daemon restart with containers running with restart always policy manually stopped
2015-08-03 08:40:44 -07:00
3f23ae663b
Merge pull request #15244 from hqhq/hq_remove_closeOnce
...
Remove unused variable
2015-08-03 08:39:43 -07:00
1a77580030
Split API handlers into domain specific files
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-03 11:12:44 -04:00
5f1593c7b8
Fix wrong path to YaST's 'Routing' menu for openSUSE Tumbleweed
...
Signed-off-by: evalle <shmarnev@gmail.com >
2015-08-03 12:01:25 +02:00
5d57f56362
Fix "Getting started" link in userguide
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-03 11:48:59 +02:00
dce1488ae5
Merge pull request #15013 from coolljt0725/14756_enbale_golint_1
...
Enable golint, part of #14756
2015-08-02 22:14:18 -04:00
f9b5eb0cac
Fix golint warnings for daemon/execdriver/windows
...
Addresses: #14756
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-03 09:54:02 +08:00
8b15b7958a
Docs: Add Blockbridge volume plugin
...
Signed-off-by: Stephen Rust <srust@blockbridge.com >
2015-08-02 21:48:46 -04:00
27a8f9937e
Enable golint part of #14756
...
pkg/broadcastwriter
pkg/graphdb
pkg/httputils
pkg/ioutils
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-08-03 09:45:05 +08:00
f5557f4f43
Remove unused variable
...
Introduced by #15209 unintentionally.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-08-03 09:14:52 +08:00
05529ab584
Merge pull request #15235 from charleswhchan/patch-1
...
Update docker_remote_api.md
2015-08-02 19:17:22 +02:00
084d464081
Update docker_remote_api.md
...
Minor fixes:
* v1.19: GET /containers/(id)/logs - add missing '/'
* v1.18: Break up POST /containers/create and POST /containers/(id)/start into separate lines.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-08-02 10:11:18 -07:00
ef24b8e485
Merge pull request #15181 from Microsoft/10662-registermountpoints
...
Windows: Tidy/godoc volume*.go
2015-08-02 13:04:48 -04:00
af59c80b4a
test: daemon restart with containers running with restart always policy
...
manually stopped
If a container is running with a restart policy of always and it's
manually stopped, then on daemon restart it will be running.
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-08-02 11:14:01 +02:00
bf384a3e4f
Merge pull request #15226 from vdemeester/3745-remote-TEST-env-test-from-daemon
...
Remove daemon check for TEST
2015-08-01 13:10:02 -04:00
7feb176233
Merge pull request #14539 from nhocki/improve-docs-for-execstart
...
Adding information about ExecStart configuration for systemd
2015-08-01 09:23:59 -07:00
d080d262b3
Merge pull request #15209 from cpuguy83/15199_fix_tailing_more_than_available
...
Ensure reader position is at the end after tailing
2015-08-01 09:02:44 -07:00
69cde5a302
Filter completions of docker inspect by --type
...
Completion now filters the images and containers by given
`--type`.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-08-01 08:36:00 -07:00
9af6b57a5d
Remove daemon check for TEST
...
Closes #3745
I think DEBUG is still used (might be wrong though) and according to
https://github.com/docker/docker/issues/3745#issuecomment-76035979 there
is now nothing in integration (all has been migrated to integration-cli)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-08-01 15:13:38 +02:00
f9a2b3650b
Merge pull request #15220 from maaquib/15217-skip-TestRunCapAddSYSTIME-on-lxc
...
Skipping test TestRunCapAddSYSTIME on lxc
2015-08-01 09:04:16 -04:00
c57faa91e2
Ensure reader position is at the end after tailing
...
After tailing a file, if the number of lines requested is > the number
of lines in the file, this would cause a json unmarshalling error to
occur when we later try to go follow the file.
So brute force set it to the end if any tailing occurred.
There is potential that there could be some missing log messages if logs
are being written very quickly, however I was not able to make this
happen even with `while true; do echo hello; done`, so this is probably
acceptable.
While testing this I also found a panic in LogWatcher.Close can be
called twice due to a race. Fix channel close to only close when there
has been no signal to the channel.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-08-01 08:00:28 -04:00
7390cc5300
Fix golint warning on pkg/sysinfo
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-08-01 18:24:49 +08:00
6b44c05205
Adding information about ExecStart configuration for systemsd
...
Closes #14491
Signed-off-by: Nicolás Hock Isaza <nhocki@gmail.com >
2015-07-31 21:28:30 -05:00
84c9a6684f
skipping test TestRunCapAddSYSTIME on lxc
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com >
2015-07-31 22:07:40 -04:00
6ce76cd9ed
Updated to use latest version of notary
...
Update UX to use aliases for root, snapshot, and target key
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-31 17:32:35 -07:00
d594c6fcd8
Vendor latest notary
...
Use updated notary to pick up updates from security review
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-31 17:32:35 -07:00
1f61084d83
Fix uses of "int" where "int64" should be used instead
...
Some structures use int for sizes and UNIX timestamps. On some
platforms, int is 32 bits, so this can lead to the year 2038 issues and
overflows when dealing with large containers or layers.
Consistently use int64 to store sizes and UNIX timestamps in
api/types/types.go. Update related to code accordingly (i.e.
strconv.FormatInt instead of strconv.Itoa).
Use int64 in progressreader package to avoid integer overflow when
dealing with large quantities. Update related code accordingly.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-31 16:31:40 -07:00
8f2dca5386
Merge pull request #15144 from aaronlehmann/graph-cleanup
...
Documentation improvements and code cleanups for graph package
2015-07-31 15:11:34 -07:00
bb2039c925
Merge pull request #14960 from MHBauer/faq-links
...
Fix FAQ links
2015-08-01 00:05:53 +02:00
3e0b0c59e6
Merge pull request #15207 from calavera/fix_index_locking
...
Remove read index that causes dead lock.
2015-07-31 14:55:00 -07:00
6fbacc6edb
Merge pull request #15005 from WeiZhang555/stats-block
...
Docker stats: display Block IO stats
2015-07-31 13:59:55 -07:00
5ed84009b3
Remove read index that causes dead lock.
...
Let the iterator to lock the index when it needs it.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-31 13:53:17 -07:00
72c04ab87c
Tidy volume*.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-31 13:13:40 -07:00
ce99a462f8
Merge pull request #15208 from albers/daemon-completion-fixes
...
Fixes to bash completion for docker daemon
2015-07-31 11:56:11 -07:00
aab82c5c22
Fix completion of commands after a global option with arg
...
Without this fix, `docker -l info ` would not complete the commands.
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-31 20:16:33 +02:00
e0dad9a153
Add completion of global options to docker daemon
...
It's a bit confusing: the "global options" are valid as "global options"
for all client commands (i.e. all but daemon).
Example: `docker --log-level info run`
For `docker daemon`, these "global options" are only valid as "command
options".
Example: `docker daemon --log-level info`
As command completion cannot tell which command the user is going to
type next, completion for the daemon command has to allow illegal
syntaxes like
`docker --log-level info daemon --log-level info`
Signed-off-by: Harald Albers <github@albersweb.de >
2015-07-31 20:06:45 +02:00
0659ceb0d0
Merge pull request #15201 from moul/names-generator-bin
...
pkg/namesgenerator: add a 'names-generator' binary
2015-07-31 13:09:02 -04:00
9e9f3aa36b
Merge pull request #15185 from aboch/vnd_lbn_1.8
...
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
2015-07-31 08:58:41 -07:00
5276655b69
Merge pull request #14463 from sunyuan3/TestRunCapAddSYSTIME
...
Add TestRunCapAddSYSTIME test case.
2015-07-31 09:40:12 -04:00
6a4ac63aaa
Docker stats: display Block IO stats
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-07-31 21:26:32 +08:00
1032202b88
Merge pull request #15193 from jfrazelle/fix-lxc
...
fix lxc test machine
2015-07-31 09:13:52 -04:00
468bc7d819
Merge pull request #15191 from duglin/TlsTest
...
Add a test to make sure that --tlsverify=false turns on tls in daemon
2015-07-31 08:54:35 -04:00
0800650665
pkg/namesgenerator: add a 'names-generator' binary
...
Signed-off-by: Manfred Touron <m@42.am >
2015-07-31 13:07:40 +02:00
a5e2fa2b2e
Add TestRunCapAddSYSTIME test case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-07-31 12:53:46 +08:00
f12e18d7ef
fix lxc test machine
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-07-30 21:30:47 -07:00
5ced3ab323
Add a test to make sure that --tlsverify=false turn on tls in daemon
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-30 21:21:24 -07:00
500a314713
Merge pull request #15179 from Microsoft/10662-yetmoretodos
...
Windows: Tidy verifyContainerSettings
2015-07-30 23:58:16 -04:00
b48d744b07
Merge pull request #15175 from MHBauer/cliconfig-lint
...
additional lint fix and enable linter for cliconfig package
2015-07-30 23:07:19 -04:00
ad96fc310b
Merge pull request #14970 from tiborvass/windows-registry-endpoint
...
registry: Change default endpoint on windows to a windows-specific one
2015-07-30 22:41:34 -04:00
9a9a12b351
Merge pull request #15123 from ewindisch/seed-pkgrand-cryptorand
...
Prefer crypto rand seed for pkg/rand
2015-07-30 22:41:17 -04:00
8d2739df98
Merge pull request #15146 from kolyshkin/mkdirall
...
Simplify and fix MkdirAll usage
2015-07-30 22:40:57 -04:00
0b089bc7d5
Merge pull request #15186 from brahmaroutu/btrfs_test_failure
...
fix unit test breakage due to lint changes
2015-07-30 22:39:40 -04:00
e49ab10556
Merge pull request #15190 from tiborvass/bump-distrib
...
Update distribution to fix uuid.Loggerf initialization logic
2015-07-30 19:19:36 -07:00
e496d40107
Merge pull request #15189 from jrabbit/fix-restart-policy-link
...
Docs: Actually link to restart policy information
2015-07-30 21:44:16 -04:00
3face3c521
Use default no-op uuid.Loggerf for client cli
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-30 21:19:51 -04:00
084af30f39
Add missing LICENSE files for docker/notary
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-30 21:19:18 -04:00
d2cd142ce1
Actually link to the information
...
Signed-off-by: jrabbit <jackjrabbit@gmail.com >
2015-07-30 21:16:45 -04:00
0cce1fb37f
Vendor docker/distribution to 7dc8d4a26b689bd4892f2f2322dbce0b7119d686
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-30 21:14:39 -04:00
4964ab0821
Add test code to cover issue #14859
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-07-30 17:37:11 -07:00
91274625ba
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
2015-07-30 17:28:40 -07:00
22873eae31
fix unit test breakage due to lint changes
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-31 00:22:28 +00:00
ffeec2bdd1
Merge pull request #15184 from jfrazelle/fix-install
...
fix regression
2015-07-30 16:59:13 -07:00
e2b2c2ae81
Merge pull request #15180 from tiborvass/fix-v1-mirror-fallback
...
registry: allow fallback on unknown errors
2015-07-30 19:54:48 -04:00
044b56e94f
Merge pull request #15174 from Microsoft/10662-top
...
Windows: Top (non-)implementation
2015-07-30 19:49:15 -04:00
b0af811272
fix regression
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-07-30 16:38:51 -07:00
f8f4deb0b2
Merge pull request #15154 from stefanberger/apparmor-engine
...
contrib: Extend engine apparmor profile for tools needed by devicemapper
2015-07-30 19:22:28 -04:00
5b65284649
Merge pull request #15103 from Djelibeybi/fix14924
...
Seperate lsb_dist detection from dist_version detection
2015-07-30 16:21:35 -07:00
a21ba12f4e
registry: allow fallback on unknown errors
...
This patch fixes a bug where a user specifies a v1 mirror for
--registry-mirror and pull an image from the Hub.
It used to not fallback because of an unexpected error returned when
trying to JSON marshal nginx output.
We now ensure that any unexpected error falls back to the next endpoint
in the list.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-30 19:03:38 -04:00
3fea79bfd8
Windows: Address more todos
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-30 15:28:11 -07:00
c1e2e4d9c6
Merge pull request #15176 from Microsoft/10662-removesometodos
...
Windows: Remove some TODOs
2015-07-30 15:26:06 -07:00
86a6e4914f
Merge pull request #14922 from rhatdan/netlabel
...
Label /etc/resolv.conf, /etc/hosts ... correctly in shared network co…
2015-07-30 15:03:49 -07:00
f50b916ca6
Windows: Remove some TODOs
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-30 14:46:51 -07:00
e809919e26
lint fix and enable linter for cliconfig package
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-07-30 14:37:37 -07:00
5c9e5bfb0f
Merge pull request #15106 from jgkamat/links
...
Fix a couple broken links
2015-07-30 17:28:11 -04:00
d4836cd7ec
Documentation improvements and code cleanups for graph package
...
Expand the godoc documentation for the graph package.
Centralize DefaultTag in the graphs/tag package instead of defining it
twice.
Remove some unnecessary "config" structs that are only used to pass
a few parameters to a function.
Simplify the GetParentsSize function - there's no reason for it to take
an accumulator argument.
Unexport some functions that aren't needed outside the package.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-30 14:27:10 -07:00
0a9ec21818
Windows: Top (non-)implementation
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-30 14:25:15 -07:00
41d9270a40
Merge pull request #15170 from runcom/i-like-cleaning
...
Remove HostConfig,SetHostConfig from daemon.container
2015-07-30 17:23:58 -04:00
8505183252
Merge pull request #14950 from ottok/master
...
Multiple fixes to 'docker stats' output
2015-07-30 14:02:35 -07:00
030f61df3d
Merge pull request #14885 from jlhawn/fix_cp_symlink
...
Fix copying of symlinks in containers
2015-07-30 13:42:40 -07:00
9431acbc0a
Merge pull request #15169 from Microsoft/10662-tidydiff
...
Tidy platform common bits in diff
2015-07-30 13:42:27 -07:00
f95333010e
Remove HostConfig,SetHostConfig from daemon.container
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-30 22:25:31 +02:00
5ab9654bc4
Tidy platform common bits in diff
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-30 13:04:49 -07:00
2f1a7c903f
Merge pull request #14844 from WeiZhang555/golint-api
...
fix golint errors/warnings of pkg api/
2015-07-30 16:02:06 -04:00
75c082c4b2
Merge pull request #15168 from Microsoft/10662-daemonconfiglocation
...
Windows: [TP3] Move daemon config directory
2015-07-30 12:56:52 -07:00
2d730c93b4
Merge pull request #15148 from hqhq/hq_golint_native
...
Add back golint for daemon/execdriver/native
2015-07-30 15:51:06 -04:00
9ed4400baf
Windows: Move daemon config directory
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-30 12:39:19 -07:00
75f6929b44
Fix docker cp Behavior With Symlinks
...
[pkg/archive] Update archive/copy path handling
- Remove unused TarOptions.Name field.
- Add new TarOptions.RebaseNames field.
- Update some of the logic around path dir/base splitting.
- Update some of the logic behind archive entry name rebasing.
[api/types] Add LinkTarget field to PathStat
[daemon] Fix stat, archive, extract of symlinks
These operations *should* resolve symlinks that are in the path but if the
resource itself is a symlink then it *should not* be resolved. This patch
puts this logic into a common function `resolvePath` which resolves symlinks
of the path's dir in scope of the container rootfs but does not resolve the
final element of the path. Now archive, extract, and stat operations will
return symlinks if the path is indeed a symlink.
[api/client] Update cp path hanling
[docs/reference/api] Update description of stat
Add the linkTarget field to the header of the archive endpoint.
Remove path field.
[integration-cli] Fix/Add cp symlink test cases
Copying a symlink should do just that: copy the symlink NOT
copy the target of the symlink. Also, the resulting file from
the copy should have the name of the symlink NOT the name of
the target file.
Copying to a symlink should copy to the symlink target and not
modify the symlink itself.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-30 12:14:28 -07:00
a687448c4d
Merge pull request #15163 from crosbymichael/proc-ro
...
Don't mount /proc as ro
2015-07-30 15:12:29 -04:00
5fa26e3df8
Merge pull request #15161 from ewindisch/fix-netns
...
Only explicitly deny ptrace for container-originated procs
2015-07-30 15:11:12 -04:00
b149d9d0d9
Merge pull request #15156 from duglin/AddErrTruncIndex
...
Add missing typed error in truncindex
2015-07-30 14:55:40 -04:00
4a92b8a0ef
registry: Change default endpoint on windows to a windows-specific one
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-30 14:52:41 -04:00
06668de15e
Merge pull request #15167 from tiborvass/better-tlsconf-error-msg
...
tlsconfig: better format for error message in tlsconfig
2015-07-30 14:51:35 -04:00
a83a769347
Simplify and fix os.MkdirAll() usage
...
TL;DR: check for IsExist(err) after a failed MkdirAll() is both
redundant and wrong -- so two reasons to remove it.
Quoting MkdirAll documentation:
> MkdirAll creates a directory named path, along with any necessary
> parents, and returns nil, or else returns an error. If path
> is already a directory, MkdirAll does nothing and returns nil.
This means two things:
1. If a directory to be created already exists, no error is returned.
2. If the error returned is IsExist (EEXIST), it means there exists
a non-directory with the same name as MkdirAll need to use for
directory. Example: we want to MkdirAll("a/b"), but file "a"
(or "a/b") already exists, so MkdirAll fails.
The above is a theory, based on quoted documentation and my UNIX
knowledge.
3. In practice, though, current MkdirAll implementation [1] returns
ENOTDIR in most of cases described in #2 , with the exception when
there is a race between MkdirAll and someone else creating the
last component of MkdirAll argument as a file. In this very case
MkdirAll() will indeed return EEXIST.
Because of #1 , IsExist check after MkdirAll is not needed.
Because of #2 and #3 , ignoring IsExist error is just plain wrong,
as directory we require is not created. It's cleaner to report
the error now.
Note this error is all over the tree, I guess due to copy-paste,
or trying to follow the same usage pattern as for Mkdir(),
or some not quite correct examples on the Internet.
[v2: a separate aufs commit is merged into this one]
[1] https://github.com/golang/go/blob/f9ed2f75/src/os/path.go
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
2015-07-30 11:48:08 -07:00
3754ad5737
Fix FAQ links
...
- don't use relative references '..'
- registry-index-spec became hub-registry-spec
- reference new 'glossary' instead of old 'terms'
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-07-30 11:46:39 -07:00
f5c388b35a
Only explicitly deny ptrace for container-originated procs
...
The 'deny ptrace' statement was supposed to only ignore
ptrace failures in the AUDIT log. However, ptrace was implicitly
allowed from unconfined processes (such as the docker daemon and
its integration tests) due to the abstractions/base include.
This rule narrows the definition such that it will only ignore
the failures originating inside of the container and will not
cause denials when the daemon or its tests ptrace inside processes.
Introduces positive and negative tests for ptrace /w apparmor.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-30 14:40:28 -04:00
868f85b271
Merge pull request #15166 from tiborvass/carry-13934
...
Carry 13934: Add `docker daemon` to bash completion
2015-07-30 11:30:31 -07:00
c7a04fda2a
tlsconfig: better format for error message in tlsconfig
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-30 14:15:41 -04:00
8cc8ee9254
Add docker daemon to bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de >
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-30 14:08:55 -04:00
bfc51cf660
Don't mount /proc as ro
...
This caused a regression with LSM labeling.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-07-30 10:57:50 -07:00
bfccd328be
Merge pull request #15100 from calavera/fix_reader_timeout
...
Fix reset timeout for buffer readers.
2015-07-30 13:18:06 -04:00
18b1381335
Add missing typed error in truncindex
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-30 07:52:34 -07:00
9dbc36b441
contrib: Extend engine apparmor profile for tools needed by devicemapper
...
Add tools to the apparmor profile that are needed when -s devicemapper is
in the docker daemon's command line.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com >
2015-07-30 06:45:57 -04:00
b619220ce1
Multiple fixes to 'docker stats' output:
...
* Add space between values in docker stats output for easier parsing
Old output could not be parsed easily because there were columns
that did not have any separator. Also values that are together
without any space is difficult to read even for humans.
* Update unit.HumanSize comment to match what the does actually does
Signed-off-by: Otto Kekäläinen <otto@seravo.fi >
2015-07-30 10:14:57 +03:00
f39987afe8
Merge pull request #15149 from Microsoft/10662-fixwindowscompile
...
[Blocking] Windows: Daemon build is currently broken
2015-07-29 22:46:11 -07:00
26ff3bd2e9
Merge pull request #15066 from dwcramer/fix-broken-link
...
[#15027 ] Fix broken link and edit link text to match section heads
2015-07-30 13:37:29 +10:00
cc45e027f1
Merge pull request #15071 from epc/epc-2015209
...
Docs: Copy edits for typos
2015-07-30 13:36:23 +10:00
b43dc0d93c
Windows: Daemon build is broken
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-29 20:08:51 -07:00
cfeab585c0
fix golint errors/warnings of pkg api/
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-07-30 09:46:25 +08:00
e34f562a77
Add back golint for daemon/execdriver/native
...
It's broken by #15099 Fix it.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-30 08:58:54 +08:00
4c7cf30260
Merge pull request #15126 from LK4D4/global_rand
...
Use global random *rand.Rand instance in pkg
2015-07-29 17:36:25 -07:00
b71cf69380
Merge pull request #15132 from LK4D4/improve_test
...
Fix message and add additional check to test
2015-07-29 17:36:11 -07:00
6adb64e113
Merge pull request #14773 from runcom/cleanup-links
...
Cleanup links top level pkg
2015-07-29 20:17:44 -04:00
d94aeb2876
Merge pull request #14980 from jlhawn/build_tag_resolved_digests
...
[api/client] Tag resolved digest from Dockerfile
2015-07-29 16:52:14 -07:00
887882c2b6
Merge pull request #15142 from calavera/add_field_comment_back
...
Add MemorySwappiness comment back.
2015-07-29 16:51:49 -07:00
8724e8953d
Merge pull request #15040 from vbatts/vbatts-double-decompress-fix
...
archive, graphdriver: double decompress fix
2015-07-29 16:48:02 -07:00
4a71323ec3
Merge pull request #15098 from calavera/backwards_compat_kill_error
...
Keep backwards compatibility in kill api.
2015-07-29 16:42:36 -07:00
3f5ea1bb80
Merge pull request #15090 from dmcgowan/fix-login-tls-config
...
Fix login and search TLS configuration
2015-07-29 16:42:13 -07:00
f41f62b6cc
Add MemorySwappiness comment back.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-29 16:41:46 -07:00
de50082000
Merge pull request #15134 from calavera/swappiness_big_int
...
Use pointer for MemorySwappiness.
2015-07-29 16:31:15 -07:00
2ae174e491
Merge pull request #15138 from ewindisch/apparmor-fix-test-plus-unconfined
...
Fix the proc integration test & include missing AA profile
2015-07-29 15:32:13 -07:00
28ac78c02f
Merge pull request #15139 from tiborvass/fix-uuid-loggerf
...
Set uuid.Loggerf to nop on client and to logrus.Warnf on daemon
2015-07-29 18:17:54 -04:00
75f8bdd970
Merge pull request #13542 from kvasdopil/freebsd-work
...
Make docker build on FreeBSD
2015-07-29 15:15:37 -07:00
6a274e48dc
Merge pull request #14843 from MHBauer/demonlogger-lint
...
golint fixes for daemon/logger/*
2015-07-29 18:09:46 -04:00
28b79e4a84
Merge pull request #14827 from brahmaroutu/lint_graph
...
/graph fix lint errors/warnings
2015-07-29 18:08:09 -04:00
7841d6ab9a
Set uuid.Loggerf to nop on client and to logrus.Warnf on daemon
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-07-29 17:49:59 -04:00
0f4e5f7149
Remove container AA profile from packaging
...
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-29 17:47:38 -04:00
0e0c7e521c
Cleanup links top level pkg
...
- Move top level pkg links under daemon
- Refactor code accordingly
- golint pkg
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-29 23:39:18 +02:00
5c6446f335
Fix for #14924 . Seperates lsb_dist detection from dist_version detection
...
so that the latter can be distro specific.
Signed-off-by: Avi Miller <avi.miller@oracle.com >
2015-07-30 07:30:51 +10:00
4e25d2982b
Use *int64 for MemorySwappiness.
...
So we marshal/unmarshal its value properly when it's empty.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-29 14:14:04 -07:00
5832715052
Fix the proc integration test & include missing AA profile
...
Integration tests were failing due to proc filter behavior
changes with new apparmor policies.
Also include the missing docker-unconfined policy resolving
potential startup errors. This policy is complain-only so
it should behave identically to the standard unconfined policy,
but will not apply system path-based policies within containers.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-29 17:08:51 -04:00
1d6e443119
/graph fix lin errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-29 20:59:36 +00:00
ccbe539e86
golint fixes for daemon/logger/*
...
- downcase and privatize exported variables that were unused
- make accurate an error message
- added package comments
- remove unused var ReadLogsNotSupported
- enable linter
- some spelling corrections
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-07-29 13:09:39 -07:00
0f85fadb4e
Merge pull request #15133 from dmcgowan/notary-fix-test-date
...
Skip notary tests which update system clock
2015-07-29 12:51:05 -07:00
bf3c1e6a3a
Skip notary tests which update system clock
...
Currently some notary tests change the system clock to check for expiration.
Skip these tests until the code can be refactored to not rely on updating the system clock.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-29 12:09:40 -07:00
0bab97fcba
Merge pull request #15076 from hqhq/hq_merge_daemon_test
...
Merge daemon_unit_test.go to daemon_test.go
2015-07-29 14:53:34 -04:00
c09c497c71
Merge pull request #15111 from Microsoft/fix-archive-copy-log
...
Fix log to logrus
2015-07-29 14:48:19 -04:00
0d09439ace
Fix message and add additional check to TestBuildContainerWithCgroupParent
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-29 11:46:33 -07:00
2a593bea12
Merge pull request #15116 from ibuildthecloud/devices
...
Revert change to make ParseDevice unexported
2015-07-29 14:42:30 -04:00
26c03d561a
make docker compile on freebsd
...
Signed-off-by: Alexey Guskov <lexag@mail.ru >
2015-07-29 21:25:56 +03:00
0a2ec227f8
Merge pull request #15128 from ankushagarwal/logging
...
Doc fixes in daemon/logger, update NewCopier method
2015-07-29 14:20:34 -04:00
e77ea5aa7a
Merge pull request #14784 from brahmaroutu/lint_api_client
...
fix golint errors/warnings
2015-07-29 14:04:45 -04:00
1cfae07a6e
Merge pull request #15015 from runcom/14911-fix-install-script-debian81
...
Fix install script to handle debian 8.1 apt repo string
2015-07-29 10:45:50 -07:00
dfcdde4d98
Merge pull request #14930 from brahmaroutu/lint_daemon_graphdriver_devmapper
...
daemon/graphdriver/devmapper/ fix lint errors/warnings
2015-07-29 13:29:57 -04:00
929f2c2f40
api/client fix golint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-29 17:20:54 +00:00
2cd058ce4f
Merge pull request #14785 from brahmaroutu/lint_api_server
...
fix golint errors/warnings
2015-07-29 13:09:31 -04:00
8a8de53d3d
Merge pull request #15129 from jfrazelle/golint
...
fix linnt
2015-07-29 10:07:25 -07:00
41d85c014d
Doc fixes in logger, update NewCopier method
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
2015-07-29 10:05:46 -07:00
c2c9e99d84
fix linnt
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
2015-07-29 10:05:30 -07:00
2bf73c4b1a
Fix log to logrus
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-29 09:58:07 -07:00
4742a3964f
Prefer crypto rand seed for pkg/rand
...
Crypto rand is a much better seed for math/rand than
time. In the event we use math/rand where we should not,
this will make it a safer source of random numbers.
Although potentially dangerous, this will still fallback
to time should crypto/rand for any reason fail.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-29 12:55:57 -04:00
90b8cebda6
Labels on network content need to be shared if shared network namespace
...
If I run two containers with the same network they share the same /etc/resolv.conf.
The current code changes the labels of the /etc/resolv.conf currently to the
private label which causes it to be unusable in the first container.
This patch changes the labels to a shared label if more then one container
will use the content.
Docker-DCO-1.1-Signed-off-by: Dan Walsh dwalsh@redhat.com (github: rhatdan)
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-07-29 12:42:28 -04:00
d7661cb48b
Merge pull request #15099 from ewindisch/apparmor-restore-en
...
Restore AppArmor generation + fixes
2015-07-29 09:36:59 -07:00
51cdcf3c9d
Use global random *rand.Rand instance in pkg
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-29 09:30:48 -07:00
9d3ad6d892
Merge pull request #15107 from LK4D4/unsafe_random
...
Use non-crypto version of random to generate ids.
2015-07-29 11:47:38 -04:00
0c330a7823
Merge pull request #15064 from jfrazelle/14590-fix-sudo
...
sh -c the cat repo for yum
2015-07-29 10:02:27 -04:00
d3e5179c29
systemd: set service type to notify.
...
Currently the service type is 'simple', the default, meaning that
docker.service is considered to be started straight after
spawning. This is incorrect as there is significant amount of time
between spawning and docker ready to accept connections on the passed
sockets. Docker does implement systemd socket activate and
notification protocol, and send the ready signal to systemd, once it
is ready. However for systemd to take those notifications into
account, the service file type should be set to notify.
Signed-off-by: Dimitri John Ledkov <dimitri.j.ledkov@intel.com >
2015-07-29 14:02:12 +01:00
60ed0a7f77
Merge pull request #15117 from ChanderG/master
...
Fix minor formatting error in security article docs
2015-07-29 13:41:19 +02:00
6cf0e27ee0
Fix minor formatting error in security article docs
...
Signed-off-by: Chander G <chandergovind@gmail.com >
2015-07-30 01:06:04 +05:30
421786e925
Make ParseDevice public
...
This reverts the change in 5170a2c096darren@rancher.com >
2015-07-29 02:12:35 -07:00
6bca8ec3c9
Replace GenerateRandomID with GenerateNonCryptoID
...
This allow us to avoid entropy usage in non-crypto critical places.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-28 22:31:01 -07:00
4553b6af4b
Add GenerateNonCryptoID function to avoid entropy exhaustion
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-28 22:31:01 -07:00
6963b9c716
Add global instance of *(math/rand).Rand and Reader
...
You can read random bytes from Reader without exhausting entropy.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-28 22:30:57 -07:00
93d134c61f
sh -c the cat repo for yum
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-28 20:25:26 -07:00
972a94b449
daemon/graphdriver/devmapper/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-29 01:43:34 +00:00
c19a00d4cb
Merge pull request #15060 from jlhawn/fix_build_renamed_dockerfile
...
[api/client] update check Dockerfile in Context
2015-07-28 21:30:19 -04:00
ed1d9d022d
Merge pull request #14565 from moxiegirl/14561-mac-rewrite
...
Docker Toolbox Updates fixes #14561
2015-07-28 18:20:26 -07:00
6ca22add18
Docker Toolbox Updates fixes #14561
...
- Tested Mac/iterated with Jeff on fixes
- Waiting on formal uninstall;manual now
- 4 hour work
- Fixe #14562 converting Windows to Mac
- Found errors in installer need fixes/another iteration
- Updated as far as possible with limited installation
- 3 Hours work
- Entering comments from PR review
- New screen captures and migration material
- Entering Sven's comment
- Testing with powershell, Seb's comments
- Fix link in upgrade
- Minor tweaks to http and typos
- Adding deprecation note
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-28 18:17:24 -07:00
bb2e6c72d2
[api/client] Tag resolved digest from Dockerfile
...
Builds where the base images have been resolved to trusted digest
references will now be tagged with the original tag reference from
the Dockerfile on a successful build.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-28 17:54:48 -07:00
cc6138d946
Merge pull request #15063 from jfrazelle/only-write-distributions-file-if-dne
...
only write distributions file if dne
2015-07-28 20:45:04 -04:00
4ca0aad855
Fix a couple broken links
...
Signed-off-by: Jay Kamat <github@jgkamat.33mail.com >
2015-07-28 16:37:52 -07:00
351f6b8ec0
api/server fix golint errors/warnings.
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-28 22:44:39 +00:00
6c887be769
Mark engine AA policy as complain-only
...
The engine policy will now only complain
as a temporary measure to ensure we do not
cause breakages while users exercise this
policy.
This is NOT the policy for containers, but
for the newly-introduced policy for the
daemon itself.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-28 17:45:53 -04:00
8b2fcddcd2
AA: Eliminate 'file' permission
...
Implements the policies for the remaining binaries
called by the Docker engine and eliminates the
giant whitelisted 'all files' permission in favor
of granular whitelisting and child-specific policies.
It should be possible now to remove the 'file' permission,
but for the sake of keeping Docker unbroken, we'll try
to gradually tighten the policy.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-28 17:45:53 -04:00
3edc88f76d
Restore AppArmor profile generation
...
Will attempt to load profiles automatically. If loading fails
but the profiles are already loaded, execution will continue.
A hard failure will only occur if Docker cannot load
the profiles *and* they have not already been loaded via
some other means.
Also introduces documentation for AppArmor.
Signed-off-by: Eric Windisch <eric@windisch.us >
2015-07-28 17:45:51 -04:00
40ea67a596
Fix reset timeout for buffer readers.
...
Use our goroutine-safe random source.
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-28 14:30:18 -07:00
f809037128
Merge pull request #14848 from hqhq/hq_golint_execdriver
...
Fix golint warnings for daemon/execdriver/*
2015-07-28 14:23:22 -07:00
2c162292b7
Merge pull request #14824 from fcantournet/lint_pkg_mflag
...
Fix golint for pkg/mflag
2015-07-28 13:51:09 -07:00
9cfc223cc0
Merge pull request #14818 from MHBauer/volume-lint
...
lint for volume/*
2015-07-28 13:42:18 -07:00
273f50c741
graphdriver/*: expect uncompressed tar for ApplyDiff
...
The `ApplyDiff` function takes a tar archive stream that is
automagically decompressed later. This was causing a double
decompression, and when the layer was empty, that causes an early EOF.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-07-28 16:36:39 -04:00
56bf275e32
archive, chrootarchive: split out decompression
...
In `ApplyLayer` and `Untar`, the stream is magically decompressed. Since
this is not able to be toggled, rather than break this ./pkg/ API, add
an `ApplyUncompressedLayer` and `UntarUncompressed` that does not
magically decompress the layer stream.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-07-28 16:36:38 -04:00
bfbac726c7
Merge pull request #15082 from ChanderG/master
...
Add link to Systemd article in Debian Jessie docs, fix typo
2015-07-28 22:35:48 +02:00
b9e6be25d1
Add link to Systemd article, fix typo
...
Signed-off-by: Chander G <chandergovind@gmail.com >
2015-07-29 01:54:44 +05:30
621e3d8587
Keep backwards compatibility in kill api.
...
Return an error when the container is stopped only in api versions
equal or greater than 1.20 (docker 1.8).
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-28 12:25:36 -07:00
e06df594f5
Merge pull request #14863 from brahmaroutu/lint_daemon_graphdriver_aufs
...
daemon/graphdriver/aufs fix lint errors/warnings
2015-07-28 11:46:40 -07:00
be60047b43
Merge pull request #14932 from brahmaroutu/lint_daemon_graphdriver_graphtest
...
daemon/graphdriver/graphtest/ fix lint errors/warnings
2015-07-28 11:20:33 -07:00
f989d68014
Merge pull request #15096 from kolyshkin/doc-fixes-2
...
daemon.md: do fix placement of exec driver heading
2015-07-28 20:10:11 +02:00
f52514a038
daemon.md: do 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.
Now, this is the second time I am fixing this. First time
it was commit 68efb279af7afbdavid.calavera@gmail.com >
Signed-off-by: Kir Kolyshkin <kir@openvz.org >
2015-07-28 10:58:17 -07:00
9af963aba0
lint fixes for volume/*
...
- comments on exported values
- constant string replaced by constant reference
- unexport implementation details of VolumeDriver 'local'
- add fixed packages to linter list
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-07-28 10:40:44 -07:00
e863a07b89
Fix login and search TLS configuration
...
Currently login and search do not load per registry certificates.
This is a regression caused by the last refactor since this was recently fixed.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-07-28 10:36:57 -07:00
c473ae14fd
Merge pull request #15094 from Microsoft/10662-fixvendorhelper
...
Windows: Fix vendor-helpers.sh
2015-07-28 10:17:30 -07:00
663d50464e
Windows: Fix vendor-helpers.sh
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-28 10:13:33 -07:00
8e6ad2171a
Fix golint for pkg/mflag
...
Signed-off-by: Félix Cantournet <felix.cantournet@cloudwatt.com >
2015-07-28 15:32:42 +02:00
3a7b4230b2
Merge pull request #14713 from moxiegirl/remove-boot2docker-14563
...
Remove references to boot2docker replace with docker-machine
2015-07-28 06:05:29 -07:00
fb396a71d5
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
2015-07-28 08:51:01 -04:00
ada852aa70
Merge daemon_unit_test.go to daemon_test.go
...
daemon_test.go supposted to be unit test for daemon, so
don't see reason why we need another daemon_unit_test.go.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-28 15:36:29 +08:00
55885daa56
daemon/graphdriver/aufs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-28 06:17:05 +00:00
12460f41a4
daemon/graphdriver/graphtest/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-28 06:01:00 +00:00
1825e06944
Remove references to boot2docker replace with docker-machine
...
- boot2docker is deprecated in the 1.8.0
- docker-machine replaces it
- this fixes #14563
- Updating with thaJetzah comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-27 18:25:50 -07:00
4ed3e3a5b2
Merge pull request #14694 from Microsoft/10662-apparmorprofile
...
Windows: Factoring out unused fields
2015-07-27 18:18:54 -07:00
fed85c3296
Add status string to State field for inspect
...
Fixes : #13579
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-28 08:48:27 +08:00
47c56e4353
Windows: Factoring out unused fields
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-27 17:44:18 -07:00
4862d723a4
Add daemon/execdriver/* to validate-lint
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-28 08:44:12 +08:00
3d17c3bb66
Fix golint warnings for daemon/execdriver/*
...
Addresses: #14756
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-28 08:43:22 +08:00
8ad1d3fec6
Merge pull request #15067 from aaronlehmann/term-windows-golint
...
Fix golint nit in term_windows.go
2015-07-27 20:43:18 -04:00
35e498beca
Fix golint nit in term_windows.go
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-27 17:40:49 -07:00
33358f80e5
Merge pull request #14838 from Microsoft/10662-ansirewrite
...
Windows: CLI Improvement (TP3)
2015-07-27 17:30:14 -07:00
f32cab874c
Merge pull request #15034 from aaronlehmann/update-vendored-distribution
...
Update vendored distribution repo to new version
2015-07-27 17:24:35 -07:00
f3c23fc463
Merge pull request #15062 from chrisseto/master
...
Skip DockerSuite.TestExecResizeImmediatelyAfterExecStart on lxc
2015-07-27 17:20:20 -07:00
00f7ced864
[ #15027 ] Fix broken link and edit link text to match section heads
...
Signed-off-by: David Cramer <davcrame@cisco.com >
2015-07-27 19:12:04 -05:00
2eee192366
only write distributions file if dne
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-27 16:26:35 -07:00
83cb288575
Skip DockerSuite.TestExecResizeImmediatelyAfterExecStart on lxc
...
Signed-off-by: Chris Seto <chriskseto@gmail.com >
2015-07-27 19:20:15 -04:00
af06d289e4
[api/client] update check Dockerfile in Context
...
Actually determine the relative path of the Dockerfile to the context
directory. Error out if the relative path starts with "../".
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-27 16:11:36 -07:00
7886056d74
Merge pull request #15059 from calavera/fix_overlay_comments_typo
...
Fix typo in overlay's create godoc.
2015-07-27 15:40:22 -07:00
5bac5302e5
Fix typo in overlay's create godoc.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-27 15:37:26 -07:00
25c42cc0d0
Merge pull request #14759 from vdemeester/pkg-golint
...
golint on some pkg/* packages
2015-07-27 15:19:46 -07:00
bdc55be9b4
Merge pull request #15039 from jlhawn/fix_build_context_is_symlink
...
[api/client] Fix build when context dir is symlink
2015-07-27 15:11:36 -07:00
72afd792fd
Merge pull request #15055 from calavera/log_release_steps
...
Log each release step.
2015-07-27 15:03:29 -07:00
0fe564cbb6
Merge pull request #15051 from LK4D4/32bit_const
...
Use math.MaxInt32 instead of math.MaxUint32
2015-07-27 15:02:40 -07:00
542de786c2
Merge pull request #14751 from vdemeester/runconfig-lint
...
golint fixes on runconfig
2015-07-27 15:01:08 -07:00
776600fabb
Log each release step.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-27 14:28:05 -07:00
e5af7a0e86
Merge pull request #14963 from MHBauer/plugins-links
...
Fix Plugins links
2015-07-27 23:25:48 +02:00
df75411b0f
Merge pull request #15050 from DieterReuter/fix-bash-completion
...
Fix file mode for docker bash completion
2015-07-27 14:24:49 -07:00
967bc13ae6
Merge pull request #15052 from MHBauer/ubuntu-docs
...
Fix interrupted numbering sequence in ubuntu installation docs
2015-07-27 22:45:51 +02:00
eb45602d2f
Use math.MaxInt32 instead of math.MaxUint32
...
I think it was original intention, because even half of a comment was about
MaxInt32.
Fix #15038
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-07-27 13:11:16 -07:00
289e0d244b
Fix interrupted numbering sequence in ubuntu installation docs
...
- increase indent of note to match surrounding text
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-07-27 13:10:29 -07:00
37169dadda
Fix file mode for docker bash completion
...
A bash completion file shouldn't have a executable bit set.
Just change file mode to 644 (instead of 755).
Signed-off-by: Dieter Reuter <dieter.reuter@me.com >
2015-07-27 22:07:04 +02:00
8c9cd0418d
Merge pull request #15045 from cpuguy83/fix_dockercmdwitherror
...
Don't pass check.C to dockerCmdWithError
2015-07-27 16:04:16 -04:00
8492e62306
Merge pull request #15041 from runcom/remove-saucy-from-installation-guide
...
Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
2015-07-27 21:39:55 +02:00
18c7c67308
Lint on pkg/* packages
...
- pkg/useragent
- pkg/units
- pkg/ulimit
- pkg/truncindex
- pkg/timeoutconn
- pkg/term
- pkg/tarsum
- pkg/tailfile
- pkg/systemd
- pkg/stringutils
- pkg/stringid
- pkg/streamformatter
- pkg/sockets
- pkg/signal
- pkg/proxy
- pkg/progressreader
- pkg/pools
- pkg/plugins
- pkg/pidfile
- pkg/parsers
- pkg/parsers/filters
- pkg/parsers/kernel
- pkg/parsers/operatingsystem
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-27 21:26:21 +02:00
5170a2c096
Lint fixes on runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-27 21:23:15 +02:00
0852170e8c
Merge pull request #14923 from Djelibeybi/fix14905
...
Switch to using only the RPM command to determine the distro version.
2015-07-27 12:01:57 -07:00
01d570ad30
[api/client] Fix build when context dir is symlink
...
Symbolic links in the context directory path are now evaluated.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-27 12:01:13 -07:00
d0215376f8
Merge pull request #15044 from jlhawn/fix_15042
...
[integration-cli] fix windows build test cases
2015-07-27 11:47:56 -07:00
693ba98cb9
Don't pass check.C to dockerCmdWithError
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-07-27 14:33:32 -04:00
d06ffd0a5f
[integration-cli] fix windows build test cases
...
Use the same IP as the DOCKER_HOST when making a remote file server.
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com > (github: jlhawn)
2015-07-27 11:30:38 -07:00
98f15cae89
Fix install script to handle debian 8.1 apt repo string
...
Fix #14911
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-27 20:21:29 +02:00
afac39d308
Merge pull request #15026 from duglin/Issue14837
...
Add a test for using -f w/git repo on build
2015-07-27 10:55:47 -07:00
1e43ce350d
Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-27 19:55:26 +02:00
db647c3b60
Merge pull request #15031 from liubin/typo/liubin-change-restart-command
...
Change restarting Docker daemon command in CentOS
2015-07-27 10:54:55 -07:00
4dbdd98b41
Merge pull request #14547 from duglin/ErrDeadExec
...
Return 404 on exec-inspect when container is dead but exec is still around
2015-07-27 10:46:32 -07:00
6e1d887722
Merge pull request #13834 from hqhq/hq_memswap_change
...
Set default MemorySwap on Docker side
2015-07-27 10:46:10 -07:00
33bd41df94
Merge pull request #14118 from mountkin/fix-rmi-force
...
raise an error if rmi -f with multiple tags and running container
2015-07-27 10:42:07 -07:00
a62dabe0b4
Merge pull request #14278 from squaremo/separate_overlay_docs
...
Put the network UI and overlay docs in separate files
2015-07-27 10:41:17 -07:00
fdb932fa17
Merge pull request #14560 from bkeyoumarsi/volume-plugin-doc-fix
...
Updated volume-driver plugin api docs
2015-07-27 10:39:15 -07:00
f3af9c8bdb
Merge pull request #14735 from charleswhchan/patch-1
...
Minor edits to Environment variables section
2015-07-27 10:37:39 -07:00
2f5dc43ca2
Merge pull request #14852 from rhatdan/relabel
...
Rename internal field Relabel to Mode
2015-07-27 10:31:08 -07:00
303345dc6a
Merge pull request #14875 from brahmaroutu/lint_daemon_graphdriver_btrfs
...
daemon/graphdriver/btrfs fix lint errors/warnings
2015-07-27 10:28:50 -07:00
70842ea942
Merge pull request #14899 from mountkin/fix-exec-resize-panic
...
fix the panic caused by resizing a starting exec
2015-07-27 10:27:29 -07:00
b48b6de623
Merge pull request #14959 from runcom/remove-pkg-systemd-booted-go
...
Remove pkg/systemd/booted.go
2015-07-27 10:22:58 -07:00
5329d28536
Merge pull request #14971 from moxiegirl/man-page-carry-14637
...
Carry man page for the load command
2015-07-27 10:18:44 -07:00
912bafcf36
Merge pull request #14981 from calavera/bump_api_version
...
Bump api version to 1.21.
2015-07-27 10:17:24 -07:00
35250b685c
Merge pull request #15009 from larchunix/devel
...
Fix docker-rm man page formatting
2015-07-27 10:16:57 -07:00
c451d597f2
Merge pull request #15028 from vbatts/typo
...
api/client/build: typo in error
2015-07-27 10:13:05 -07:00
e89aec0dfb
Merge pull request #15010 from runcom/14947-fix-inspect-time-RFC3339Nano
...
Format times in inspect command with a template as RFC3339Nano
2015-07-27 10:08:21 -07:00
f0f753d70a
Merge pull request #14988 from ChanderG/master
...
Fix minor typo in Debian installation docs
2015-07-27 09:51:58 -07:00
0eb88a0751
Bump api version to 1.21.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-27 09:48:47 -07:00
b2930933c9
Merge pull request #14974 from duglin/BetterTrustErr
...
Show exact file being parsed on error.
2015-07-27 09:39:48 -07:00
ec8173b517
Merge pull request #14917 from srust/14915-empty-hostconfig-on-create
...
Check for nil before using HostConfig to adjustCpuShares
2015-07-27 09:38:32 -07:00
091dbc1034
Update vendored distribution repo to new version
...
This version includes a fix that avoids checking against specific HTTP
status codes. The previous behavior violated the registry API spec.
Fixes #14975
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
2015-07-27 09:37:38 -07:00
ae5c8e3b69
Merge pull request #14786 from brahmaroutu/lint_image
...
image fix lint errors/warnings
2015-07-27 09:25:30 -07:00
6c0c6b120a
Merge pull request #15007 from cles/arch-systemd-network-issue
...
Add arch install docs warning about systemd-network
2015-07-27 09:22:01 -07:00
a65f7acbbf
Merge pull request #14987 from vdemeester/fix-cli-import-docs
...
Add missing documentation to cli/import.md
2015-07-27 09:19:57 -07:00
aa5fc634f1
Change restarting Docker daemon command in CentOS
...
Signed-off-by: bin liu <liubin0329@gmail.com >
2015-07-27 23:30:06 +08:00
7b4e6fc47b
*: s/direcotry/directory/g typo
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-07-27 11:29:28 -04:00
0e697ebe6e
api/client/build: typo in error
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-07-27 11:01:26 -04:00
d883540440
Adda test for using -f w/git repo on build
...
https://github.com/docker/docker/pull/14546 actually fixed issue #14837
but I don't see a new test to ensure we don't regress. So this PR adds
a test and then we can close #14837 .
Closes #14837
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-27 07:49:42 -07:00
b061572916
/image - fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-27 05:40:57 +00:00
cc997a7f44
Updated volume-driver plugin api docs
...
There was a mistake in the plugin_volume.md file regarding the /VolumeDriver.Remove call.
Added fix and a better explanation.
Signed-off-by: Bardia Keyoumarsi <b.keyoumarsi@gmail.com >
2015-07-26 21:02:42 -07:00
39999edcc9
Merge pull request #14992 from runcom/remove-unused-funcs
...
Remove unused functions
2015-07-26 18:36:37 -07:00
c2cf349bcd
Fix Plugins links
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
2015-07-26 18:28:25 -07:00
23b0fdc896
Merge pull request #14998 from jfrazelle/fix-systemd-debs
...
fix deb packaging systemd files
2015-07-26 17:49:19 -07:00
c358a4cd35
Check for nil before using HostConfig to adjustCpuShares
...
Fix #14915 . Add unit test for #14915 .
Thanks @runcom for the test case: when the client calls 1.18 api
version w/o hostconfig it results in a nil pointer dereference.
Signed-off-by: Stephen Rust <srust@blockbridge.com >
2015-07-26 20:33:04 -04:00
26fa9b0d0d
much improved wording for manual network config setup on arch install docs by @moxiegirl
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
2015-07-26 19:11:27 +02:00
3101941120
Add missing documentation to cli/import.md
...
PR #11907 added support for import using file (path), but it missed
the update of cli/import.md. This fixes that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-26 18:39:42 +02:00
77adf6abf1
Merge pull request #15012 from johnktims/patch-3
...
Fix typo
2015-07-26 11:04:17 -04:00
7b552c7a37
Fix typo
...
Signed-off-by: John Tims <john.k.tims@gmail.com >
2015-07-26 10:53:07 -04:00
c9207bc0aa
Format times in inspect command with a template as RFC3339Nano
...
In 1.6.2 we were decoding inspect API response into interface{}.
time.Time fields were JSON encoded as RFC3339Nano in the response
and when decoded into interface{} they were just strings so the inspect
template treated them as just strings.
From 1.7 we are decoding into types.ContainerJSON and when the template
gets executed it now gets a time.Time and it's formatted as
2015-07-22 05:02:38.091530369 +0000 UTC.
This patch brings back the old behavior by typing time.Time fields
as string so they gets formatted as they were encoded in JSON -- RCF3339Nano
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-26 15:25:08 +02:00
e1b57b2a87
Change of wording, rearrange section ordering
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
2015-07-26 13:27:35 +02:00
6bd15a68cf
Add arch install docs warning about systemd-network
...
Signed-off-by: Oriol Francès <oriolfa@gmail.com >
2015-07-26 13:27:07 +02:00
5297a25b4e
Merge pull request #15004 from charleswhchan/patch-2
...
Update faq.md
2015-07-26 13:03:45 +02:00
a059701fa5
Merge pull request #15006 from czerasz/patch-1
...
Fix typo in JSON config example, in the CLI documetation
2015-07-26 12:56:38 +02:00
09a9958e22
Fix typo in JSON config example, in the CLI documetation
...
Signed-off-by: Michał Czeraszkiewicz <czerasz.hosting@gmail.com >
2015-07-26 12:09:31 +02:00
c6816dfc67
Update faq.md
...
Fix case for PostgreSQL.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-25 22:03:20 -07:00
b04dd6b7bc
Merge pull request #14996 from chrisseto/master
...
Fix go vet errors
2015-07-25 19:20:48 -07:00
9356049680
Fix docker-rm man page formatting
...
Signed-off-by: Denis Ollier <larchunix@users.noreply.github.com >
2015-07-26 04:18:48 +02:00
ceeb22dc6e
Fix minor typo in Debian installation docs
...
Signed-off-by: Chander G <chandergovind@gmail.com >
2015-07-26 03:49:18 +05:30
6b2b6cb3fc
Merge pull request #14940 from coolljt0725/add_vxfs_magic_number
...
Add VxFS magic number, fixes #14847
2015-07-25 23:25:48 +02:00
a2ea8f2ad8
fix deb packaging systemd files
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-25 14:04:39 -07:00
04f76b67c9
Fix go vet errors
...
Signed-off-by: Chris Seto <chriskseto@gmail.com >
2015-07-25 17:00:10 -04:00
2d61de4625
Merge pull request #14245 from gs11/master
...
Clarifications in usage
2015-07-25 22:48:48 +02:00
0e69318b27
Remove unused functions
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-25 19:54:05 +02:00
547d6c6656
Clarify error message when container name is already in use. Signed-off-by: Gustav Sinder <gustav.sinder@gmail.com>
...
Signed-off-by: gs11 <gustav.sinder@gmail.com >
2015-07-25 14:08:38 +02:00
c051ed7953
Merge pull request #14720 from icecrime/14662_document_branches_tags
...
Document branches and tags
2015-07-25 13:12:47 +02:00
6b12d37ced
Merge pull request #14941 from hqhq/hq_cli_remove_cleanup
...
Remove unnecessary container cleanup in integration-cli
2015-07-24 20:38:15 -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
e4c77b047d
Document branches and tags
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-07-24 16:56:30 -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
76106b494b
Show exact file being parsed on error.
...
When there's more than on json file in there we don't tell the user
which one was an issue.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-24 15:08:24 -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
ae45ffc1fe
Carry man page for 14637
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-07-24 13:39:29 -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
f29dcfd215
Remove pkg/systemd/booted.go
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
2015-07-24 18:09:27 +02: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
42263dafcf
Minor edits to Environment variables section
...
* Clarify the list of supported instructions.
* Clarify behavior of ONBUILD, based on comments by @SvenDowideit, @theJeztah in PR #14735 .
* Reorder list of instructions in alphabetical order.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
2015-07-24 06:38:55 -07:00
9f7698a637
raise an error if rmi -f with multiple tags and running container
...
Fixes https://github.com/docker/docker/issues/14116
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-07-24 20:44:13 +08:00
ba5e098052
fix the panic caused by resizing a starting exec
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-07-24 20:43:07 +08:00
4cb9479ce4
Rename internel field Relabel to Mode
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-07-24 07:14:37 -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
e1c5e9b561
Add VxFS magic number, fixes #14847
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-24 16:37:56 +08: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
bcc0968a2c
Remove unnecessary container cleanup in integration-cli
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-24 14:48:26 +08: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
17c19f395f
daemon/graphdriver/btrfs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-23 22:48:45 +00: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
59e48b3468
Fix typo.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
2015-07-24 08:14:06 +10:00
a43199f143
Switch to using only the RPM command to determine the distro version.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
2015-07-24 07:38:28 +10: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
323259ec4e
explain how to make it work on awazon ec2.
...
Signed-off-by: Klein Florian <florian.klein@free.fr >
2015-07-23 08:47:05 +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
b442db9935
Put the network UI and overlay docs in separate files
...
.. and link to them separately. They are different features.
Signed-off-by: Michael Bridgen <mikeb@squaremobius.net >
2015-07-23 00:36:34 +01: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
6f8fdb8aa8
Allow RHEL init script to detect daemon start pid failure
...
If you have some kind of bogus `other_args` in `/etc/sysconfig/docker` the start script will report "started" but it's full of lies. This enhances the flow so that if the pidfile never shows up (failure to start) you get a proper failure message.
I also added dots for fun.
Signed-off-by: Jeff Minard <jeff.minard@creditkarma.com >
2015-07-22 11:36:34 -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
c923774c41
Windows: CLI Improvement
...
The Ansi parser and their associated actions have been decoupled. Now
parsing results in call backs to an interface which performs the
appropriate actions depending on the environment.
This improvement provides a functional Vi experience and the vttest no
longer panics.
This PR replaces docker/docker #13224 with the latest console updates.
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-21 16:38:44 -07: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
d821426fa0
Cleanup: factor anonymous function out of cli.clientRequestAttemptLogin
...
Signed-off-by: Victor Palma <palma.victor@gmail.com >
2015-07-21 16:28:41 -05: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
7e0dfbf4cd
Set default MemorySwap on Docker side
...
As discussed in docker/libcontainer#616 ,
we should move this behavior to Docker side.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-13 15:17:43 +08:00
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
d841b779fd
Return 404 on exec-inspect when container is dead but exec is still around
...
When a container is removed but it had an exec, that still hasn't been
GC'd per PR #14476 , and someone tries to inspect the exec we should
return a 404, not a 500+container not running. Returning "..not running" is
not only misleading because it could lead people to think the container is
actually still around, but after 5 minutes the error will change to a 404
after the GC. This means that we're externalizing our internall soft-deletion/GC
logic which shouldn't be any of the end user's concern. They should get the
same results immediate or after 5 minutes.
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-07-10 20:19:42 -07: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
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
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
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
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
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
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
9c65862cd6
Updating with the created state
...
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-25 07:33:01 -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
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
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
fba44a7ccf
Windows: Pass temp environment through
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-22 15:14:22 -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
48f1cb4ebe
Windows: refactor stats
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-20 09:08:45 -07:00
62f648b061
Windows: chrootarchive refactor
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-20 08:56:42 -07:00
010e3e046b
Windows: Fixup builder\internals.go
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-05-20 08:55:13 -07: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
a2787469ac
Using dockerCmd when possible
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
2015-05-19 20:33:59 +02: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
9a09664b51
Fix automatically publish ports without --publish-all
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-18 02:57:17 +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
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
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
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
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
Antonio Murdaca