toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,591 Commits 3 Branches 295 Tags
eaeb1f3166a03379e80cfb3beb6f062888b305ce
Commit Graph
12591 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Arnaud Porterie 91a104f529 Merge pull request #6810 from phemmer/4442-hairpin-nat 
Support hairpin NAT
Upstream-commit: 0f21d9aea75ee48001fee1ce764514f943581254
Component: engine
 2014-11-10 08:53:01 -08:00
Thomas Orozco 507970cff9 Fix: Failed Start breaks VolumesFrom 
Running parseVolumesFromSpec on all VolumesFrom specs before initialize
any mounts endures that we don't leave container.Volumes in an
inconsistent (partially initialized) if one of out mount groups is not
available (e.g. the container we're trying to mount from does not
exist).

Keeping container.Volumes in a consistent state ensures that next time
we Start() the container, it'll run prepareVolumes() again.

The attached test demonstrates that when a container fails to start due
to a missing container specified in VolumesFrom, it "remembers" a Volume
that worked.

Fixes: #8726

Signed-off-by: Thomas Orozco <thomas@orozco.fr>
Upstream-commit: fb62e184412b6d2bf38975a7051738f05b1f413d
Component: engine
 2014-11-10 17:32:16 +01:00
unclejack b4519950ef pkg/symlink: avoid following out of scope 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 662ca4114de579e53e670296615ceb49b8c32d75
Component: engine
 2014-11-10 17:57:54 +02:00
shuai-z 207c89062c removed redundant Clean 
The doc (or src) says: The result is Cleaned.

http://golang.org/pkg/path/filepath/#Join

Signed-off-by: shuai-z <zs.broccoli@gmail.com>
Upstream-commit: 1d1b813d255512002b382b2d2db48984d9b03957
Component: engine
 2014-11-10 17:57:01 +02:00
tobe 49ecfd85ad Remove the redundant include_search in mkdocs.yml 
Upstream-commit: b92d7cd60db0a03b0ace62a2a6c11df9f64f4256
Component: engine
 2014-11-10 20:23:46 +08:00
James Turnbull 67f7f0aa89 Merge pull request #9052 from andreyst/master 
Fix typo in Docker Links chapter of User Guide
Upstream-commit: e4fe85fc9554c09c210bb441161906f34ebe90db
Component: engine
 2014-11-10 00:10:38 -05:00
James Turnbull 1089b95bed Merge pull request #9057 from andi5/typo-best-practices 
Fix mkdir typo in dockerfile_best-practices.md.
Upstream-commit: 1e75c9e8b40eea56e355f825b764d72ec5a89c19
Component: engine
 2014-11-10 00:10:20 -05:00
James Turnbull f233f91529 Merge pull request #9029 from ovh/fix/doc 
Fix Docker Hub tags list specification
Upstream-commit: 2d30473927b63788e61dfff686e63ae52fdb2687
Component: engine
 2014-11-10 00:05:34 -05:00
gautam, prasanna 2373a91d0b limiting to 80 chars 
Signed-off-by: Prasanna Gautam < prasannagautam@gmail.com >
Upstream-commit: 3600bcb53127c7d9f67d639c1f4e61c460b1d605
Component: engine
 2014-11-09 19:54:00 -05:00
Andreas Köhler dc90086a2e Fix mkdir typo in dockerfile_best-practices.md. 
Upstream-commit: b95f9c10ff2bd05fc2d30b30bebb8174883c683a
Component: engine
 2014-11-10 01:00:05 +01:00
Solomon Hykes e8e8b5b2cb Move 'hack' to the less confusing 'project' 
We might want to break it up into smaller pieces (eg. tools in one
place, documents in another) but let's worry about that later.

Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 32e61b8f5c3f855f5e204064be1aea6a877dda43
Component: engine
 2014-11-09 21:50:28 +00:00
Solomon Hykes a6ea5410ed Move GOVERNANCE.md to hack/ 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 4cf0aa711edf3692291766c1d84ec550431b79b2
Component: engine
 2014-11-09 21:41:13 +00:00
Solomon Hykes 4c63170cab In contribution docs, emphasize that bug reports are appreciated! 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 2d688b0a787d6f38de244ed1294b0ed91c3533ba
Component: engine
 2014-11-09 21:41:12 +00:00
Solomon Hykes aa28c320f1 Improve "security reports" section in contribution docs. 
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 543127e211ce60b53d554199fdbbd3fe7b85c1c6
Component: engine
 2014-11-09 21:41:08 +00:00
Andrey Stolbovsky 7b7fbcfc68 Fix typo in Docker Links chapter of User Guide 
Upstream-commit: 932cc230814ba642c493c77d05932f63c0ef3e7f
Component: engine
 2014-11-09 23:23:45 +03:00
Prasanna Gautam e20e8b0d30 Additional info for docker binary 
Signed-off-by: Prasanna Gautam <prasannagautam@gmail.com>

I found that certain docker installations do not handle binding to the source directory quite right. Just writing it based on help from backjlack and tibor in IRC.
Upstream-commit: 22afaa628f319c852c536824cdd18444ddf87665
Component: engine
 2014-11-09 10:28:45 -05:00
xuzhaokui 7a77c7a4b5 Remove the redundant stripComment. 
Signed-off-by: xuzhaokui <cynicholas@gmail.com>
Upstream-commit: 6c79ee7d1e38f7b2f408105db9af7fcf9942f7ca
Component: engine
 2014-11-09 23:07:44 +08:00
unclejack 351d4d1e0a pkg/namesgenerator: add Yeong-Sil Jang 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: ef150d023a4a2ea57dd2a8ebcb262a98c08feedf
Component: engine
 2014-11-08 16:36:41 +02:00
unclejack e5f96cb7c0 execdriver/lxc: add comment to MAINTAINERS 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 6f8e42ac748e0c7597aeedf31adf81451adcda94
Component: engine
 2014-11-08 16:27:25 +02:00
unclejack 201bdeb454 Merge pull request #9023 from cyphar/libcontainer-update-to-new-interface 
Update vendor'd `libcontainer` and update to use new `user` interface.
Upstream-commit: b18efeeb7affdd5b920f7aecef8eb83dd1c83d50
Component: engine
 2014-11-08 16:17:28 +02:00
Vishnu Kannan b1aa2c30f8 Address comments. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: 46f29449777b9fb67a02e13fe0f12fc10c99ab4b
Component: engine
 2014-11-08 00:14:08 +00:00
Vishnu Kannan 77c86e509b This patch adds ability in docker to detect out of memory conditions in containers. 
Since the containers can handle the out of memory kernel kills gracefully, docker
will only provide out of memory information as an additional metadata as part of
container status.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
Upstream-commit: f96e04ffc7973e290653044cc86dbc1efb18276d
Component: engine
 2014-11-08 00:14:08 +00:00
Aleksa Sarai 5ab5947fb6 *: transition to new libcontainer/user API 
This patch fixes the compilation errors in Docker due to changes in the
libcontainer/user API. There is no functionality change due to this
patch.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 3ac4aa0d6ba6cb10b9a46df40f18b81dba137840
Component: engine
 2014-11-08 10:03:12 +11:00
Aleksa Sarai da278331e0 vendor: update vendor'd libcontainer version 
This patch updates the vendor'd libcontainer version, so that Docker can
take advantage of the updates to the `user` API.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: a10cca257f678e5e3c866b3c35f77877fe4789d2
Component: engine
 2014-11-08 09:57:20 +11:00
Doug Davis 2f7c6a8c08 Use the HTTP Last-Modified http header as the mtime value for ADD cmd when present 
Closes #8331

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 2e482c86bc14ddd4cfa45281dcf8f9ca141c9f14
Component: engine
 2014-11-07 13:58:05 -08:00
Fred Lifton 6c40ac56b7 Revise Docs Maintainers list 
Removing Sonat from docs maintainers because he no longer has time to complete all the responsibilities. Many thanks to Sonat for his help.

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 480b5e9c62819da3c6bff47faaec16acb42a0185
Component: engine
 2014-11-07 13:13:01 -08:00
Alexandr Morozov 283e88e070 Merge pull request #8931 from vbatts/vbatts-mount_pid_mountinfo 
pkg/mount: mountinfo from specified pid
Upstream-commit: 349f67632f47a399a6a97a4a4c684b64ba8c6940
Component: engine
 2014-11-07 12:04:52 -08:00
Vincent Batts 56dd7dc6ae pkg/mount: mountinfo from specified pid 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 64e7a1722daa6508f38287c6b8eee72850f22a86
Component: engine
 2014-11-07 13:37:23 -05:00
Vincent Giersch 2531bb36a4 Fix Docker Hub tags list specification 
The current implementation of the Docker Hub returns a list of objects
containing the tag name and the layer id.

Docker-DCO-1.1-Signed-off-by: Vincent Giersch <vincent.giersch@ovh.net>
Upstream-commit: c30ccc62e447ed570ca283feedd872eb359d457b
Component: engine
 2014-11-07 17:16:42 +01:00
Alexandr Morozov c89d81761a Fix deadlock in ps exited filter 
Fixes #8909

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>

Conflicts:
	integration-cli/docker_cli_ps_test.go
		fixed merge issue caused by missing tests
Upstream-commit: fd9c2ae27dc08114ae1170503217da8d2cb778d6
Component: engine
 2014-11-07 16:35:50 +02:00
unclejack 9db4b04ff4 bump fpm to 1.3.2 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 09c38a8d43cb7fcb128861d0a7f32acaee92115c
Component: engine
 2014-11-07 16:18:53 +02:00
Yohei Ueda 6607e4fcbf Export envvars necessary for unit-test 
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
Upstream-commit: dad58737aea8ef4c6389cb118566fc06402fd635
Component: engine
 2014-11-07 16:54:25 +09:00
Sven Dowideit a14eceb8d8 makes the -s --size option documentation clearer #8950 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 6dc11cc992531a2cf75666e417af7730a7f0764b
Component: engine
 2014-11-07 11:56:56 +10:00
Alexandr Morozov 8f685d0d4a Not fail on updating parent links 
Fixes #8796

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: b83fc07d88175c32bb46368a07a9c9e277b22392
Component: engine
 2014-11-06 15:30:23 -08:00
Fred Lifton b3094dae92 Merge pull request #8970 from georgexsh/hyphen 
unify `–`(en dash) to `-` when specifying options
Upstream-commit: 3afe9dbd246982dd82f2c53b647be29ea89a6485
Component: engine
 2014-11-06 14:48:48 -08:00
Alexandr Morozov 951245c785 Merge pull request #8711 from duglin/Issue8160 
Add import/pull events to the stream
Upstream-commit: 734419e9c7541286e94f28c90d5ebea3a627aae5
Component: engine
 2014-11-06 14:29:02 -08:00
Vincent Batts 989fad7787 btrfs: information for the information gods 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 318b11f62fe0f16a190e85e3cfe5d01432bf92a9
Component: engine
 2014-11-06 16:17:10 -05:00
Vivek Goyal 65be102bc2 docker-remove-redundant-json-tags 
In previous patch I had introduce json:"-" tags to be on safer side to make
sure certain fields are not marshalled/unmarshalled. But struct fields
starting with small letter are not exported so they will not be marshalled
anyway. So remove json:"-" tags from there.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 0f57c902450b1d4f7a676dc693689debca002e98
Component: engine
 2014-11-06 15:59:25 -05:00
Doug Davis 7c60de6972 Add import/pull events to the stream 
Closes #8160

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ef7415258ba5195af7a890d1d52214b3a181a379
Component: engine
 2014-11-06 12:12:41 -08:00
Michael Crosby d0c1f63128 Merge pull request #8963 from blakery/master 
Cleanup: made GetDefaultNetworkMtu private
Upstream-commit: dd62d256cb1d43baa93befab8a9d264b1c418c76
Component: engine
 2014-11-06 12:02:18 -08:00
Michael Crosby 973d8d4d59 Merge pull request #8977 from LK4D4/vet_fixes 
Fix vet errors
Upstream-commit: 546884fd20b0a3e7692f1edf5415b48df65a2e7f
Component: engine
 2014-11-06 11:59:05 -08:00
Michael Crosby a17f18fb0b Merge pull request #8983 from LK4D4/consistent_hosts 
Consistent hosts
Upstream-commit: 6a6be5bd5afcd4192dfc5d7bc5163b318afb15cc
Component: engine
 2014-11-06 11:51:28 -08:00
Alexandr Morozov b57c92156c Test for etchosts consistency 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 048d0c4e84aa850f28f9f12735d274a887c79509
Component: engine
 2014-11-06 11:36:09 -08:00
Alexandr Morozov 8e42183a10 Make /etc/hosts records consistent 
Fixes #8972

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 6cbe1fa726fb88a1743c3a3da5e699c9bb3ae55a
Component: engine
 2014-11-06 11:36:00 -08:00
Michael Crosby fc5e4e5515 Merge pull request #9005 from vbatts/vbatts-devmapper_add_maintainer 
devmapper: add vbatts to MAINTAINERS
Upstream-commit: 55f9b0c874aeddb24e8af0e0026f39115d5440c4
Component: engine
 2014-11-06 11:26:40 -08:00
Vincent Batts b19230c3ba devmapper: add vbatts to MAINTAINERS 
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 2fbfa29318f66aac131bdddd9b32f28b7b7e508a
Component: engine
 2014-11-06 14:06:52 -05:00
Michael Crosby dc47107b5a Merge pull request #8988 from crosbymichael/update-libcontainer-nov1 
Update libcontainer to fd6df76562137aa3b18e44b790c
Upstream-commit: 68a25a5b74af10dd7d0af5f05556128540f9cedc
Component: engine
 2014-11-06 11:02:29 -08:00
Jessie Frazelle 8229b20bed Merge pull request #8990 from duglin/Issue8379a 
Make sure that if a container can't start we set the exitcode to non-zero value
Upstream-commit: a72f3c568bc2f73869dc57d9fce43b920ee8a9d7
Component: engine
 2014-11-06 10:44:10 -08:00
Yohei Ueda 9dda7ae520 Make test-unit runnable without parallel 
Signed-off-by: Yohei Ueda <yohei@jp.ibm.com>
Upstream-commit: 5bd5ef5a0accf24d4fd8f810e167a7717c9aa7ae
Component: engine
 2014-11-07 02:40:13 +09:00
Alexandr Morozov 7e5982b03e Merge pull request #8998 from yoheiueda/dont-remove-tmpdir 
Fix the unit test not to remove /tmp
Upstream-commit: ff911d5f34f20d34821f10ad158c6ddb0ade8a66
Component: engine
 2014-11-06 08:59:02 -08:00