d887efe03f
Add support for Dockerfile CMD options
...
This adds support for Dockerfile commands to have options - e.g:
COPY --user=john foo /tmp/
COPY --ignore-mtime foo /tmp/
Supports both booleans and strings.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: a8e871b0bbbb63310f372332176875ffcc01aaf6
Component: engine
2015-04-28 05:28:46 -07:00
14fa064d31
Merge pull request #12826 from cpuguy83/12825_fix_leftover_container_json
...
Fix undead containers
Upstream-commit: 67da055cebcaccd059daec88080a339b4c9e6b2c
Component: engine
2015-04-28 08:11:40 -04:00
1a5a13dff9
add initial docs for windows client testing
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
docs: crop and optimize images
Cropped and optimized images.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com > (github: jfrazelle)
Testing and updating the Windows material
Signed-off-by: Mary Anthony <mary@docker.com >
checkpoint
Signed-off-by: Mary Anthony <mary@docker.com >
Fitting the Windows specific material into the contributor guide
Signed-off-by: Mary Anthony <mary@docker.com >
Entering James comments
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: af8efab7561484debffa3f6782eaea199fa22506
Component: engine
2015-04-27 21:21:53 -07:00
e914ea7488
Merge pull request #12817 from WeiZhang555/man
...
improve docker man page
Upstream-commit: 779939e334ea33081d3ad7a4364be1b1b4801c3d
Component: engine
2015-04-27 22:59:11 -04:00
e6a94f3935
Merge pull request #12798 from dnephin/add_missing_docs_about_labels
...
Add missing API docs about filtering by label
Upstream-commit: aebeefa886ce18d4b0b75c83b9692d24f8eb2b5e
Component: engine
2015-04-27 17:37:10 -07:00
9f76c35812
Merge pull request #12796 from moxiegirl/add-to-docs-maintainers
...
Adding James and theJeztah to the list
Upstream-commit: 9018f873c8c20f49b33ea9b8b87f3b04bf7b94b2
Component: engine
2015-04-27 16:32:15 -07:00
fb5280aecd
Merge pull request #11882 from hqhq/hq_warn_device_cg
...
add devices cgroup check as hard requirement
Upstream-commit: a07e96352600fe69ff82aeb39725f142dac06ac7
Component: engine
2015-04-27 18:42:57 -04:00
8a023c75f2
Merge pull request #12801 from thewtex/doc-test-ubuntu
...
Do Debian installation verification with hello-world image.
Upstream-commit: 13895173eb407128e00c38f1b183ba42375452b6
Component: engine
2015-04-27 15:09:25 -07:00
0b5b481a6d
Merge pull request #12828 from tdmackey/trivial-spelling
...
trivial: typo cleanup
Upstream-commit: 0153edcda1527cd19f5952046b51c4e8358d01ed
Component: engine
2015-04-27 17:05:46 -04:00
72bf48b9df
Merge pull request #12794 from runcom/small-cleaning
...
Small if err cleaning
Upstream-commit: 62a85fe2026f3f5114f19638baf53d19a51d39c0
Component: engine
2015-04-27 17:02:27 -04:00
e4ed8d93e4
Fix undead containers
...
When a container has errors on removal, it gets flagged as dead.
If you `docker rm -f` a dead container the container is dereffed from
the daemon and doesn't show up on `docker ps` anymore... except that the
container JSON file may still be lingering around and becomes undead
when you restart the daemon.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: c3c08f76bec023218b632e4c688ff9fcda11fcef
Component: engine
2015-04-27 16:45:51 -04:00
ae74d9f34f
trivial: typo cleanup
...
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com >
Upstream-commit: 3941623fbc3fa724d61f53121513ffd87d03b61c
Component: engine
2015-04-27 13:35:08 -07:00
954f940156
Small if err cleaning
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 844538142d95c1b7dda1bb2903179510105fe9b5
Component: engine
2015-04-27 21:50:33 +02:00
6143f43f8d
Parallelize TestEventsLimit
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
Upstream-commit: 40779b28bb04dca6178ba17eaeb93265e2974ee1
Component: engine
2015-04-27 21:14:00 +02:00
7cb48fca64
Merge pull request #12532 from ankushagarwal/eliminate-json-marshal
...
Eliminate json.Marshal from graph/export.go and volumes/volume.go
Upstream-commit: 531ec3cac92d482ac0d45b0aea6727945f257507
Component: engine
2015-04-27 13:54:20 -05:00
6a2c490ba2
Merge pull request #12333 from Mashimiao/clean-up-viz
...
Clean up viz code
Upstream-commit: 572ba9cb407f3c383367c67b1a6d3da612ece4a7
Component: engine
2015-04-27 14:13:03 -04:00
602d598095
Do Debian installation verification with hello-world image.
...
The hello-world image is recommended as a verification image and it is smaller
than Ubuntu.
Signed-off-by: Matt McCormick <matt.mccormick@kitware.com >
Upstream-commit: b6cfe7ca07722cee22345602595fc8fb928dbe79
Component: engine
2015-04-27 13:53:30 -04:00
a8e7d51077
Merge pull request #12819 from Microsoft/10662-volumesrefactor
...
Windows: Refactor volumes
Upstream-commit: f9c27bda1ec9be667520900e1baa0e996f46f80e
Component: engine
2015-04-27 10:25:41 -07:00
b2c23588b8
Merge pull request #12793 from runcom/bye-unmarshal
...
Replace json.Unmarshal() with json.Decoder().Decode()
Upstream-commit: 4ddd448490ba2a98a158bd3339e958b568fdc804
Component: engine
2015-04-27 13:19:43 -04:00
ac15f3e4a0
Merge pull request #12818 from Microsoft/10662-nocontainercheckonwindows
...
Windows: Info no containerized check
Upstream-commit: 97b35bab8172408550397bef94cd618c7e9a120e
Component: engine
2015-04-27 12:56:28 -04:00
ca495f5d0d
Windows: Refactor volumes
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ba1725a94ee75603d3a21e0580be3954fc689137
Component: engine
2015-04-27 09:27:15 -07:00
b3b10cf345
Merge pull request #12807 from jmzwcn/patch-2
...
Remove dead code from daemon/daemon.go
Upstream-commit: 6856c69c41880946125357ae11be00ac07de08b8
Component: engine
2015-04-27 12:10:30 -04:00
563a5f77d4
Merge pull request #12809 from runcom/remove-cfatal-goroutine-attachws
...
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
Upstream-commit: 5305e675b554a7451433bbd64bca4d6f3070a45b
Component: engine
2015-04-27 08:59:47 -07:00
3458282944
Merge pull request #12714 from noxiouz/fix_race_stats_collector
...
statsCollector: fix data race in run()
Upstream-commit: 9f684c85926fd5280e0bc604507d5b5f80353d48
Component: engine
2015-04-27 10:57:56 -05:00
4342c93053
Merge pull request #12799 from aidanhs/aphs-fix-net-container-deadlock
...
Prevent deadlock on --net=container:<self>
Upstream-commit: 02d73d910fa56e89a2d999b95b0fa0738332fed7
Component: engine
2015-04-27 08:46:22 -07:00
513af8ec95
Windows: Info no containerized check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ab97303caed2a7be474e2c4ff7a55af9d6c8c3cc
Component: engine
2015-04-27 08:38:01 -07:00
32c7f6f272
Merge pull request #12803 from ZJU-SEL/remove_useless_export_httpcall
...
remove useless http call from export
Upstream-commit: 8ec22ae87dac85f8f06f560842a0d001977a8cda
Component: engine
2015-04-27 11:33:13 -04:00
25e6857dc9
improve docker man page
...
fix issue #12708 :
"docker man page is misleading about format of commands"
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 29f379ea6e2a68d8ac4bf41d3559a52066a275a0
Component: engine
2015-04-27 23:27:35 +08:00
5e258c2907
Merge pull request #12783 from duglin/Issue12763-LinkedEnvs
...
A fix for = in env values in linked containers
Upstream-commit: 8dc07af52f1822a1d337f005c6c4292611d3313d
Component: engine
2015-04-27 10:50:14 -04:00
55c6259a4a
Merge pull request #12616 from cpuguy83/remove_uneeded_sleeps
...
remove some uneeded sleeps in tests
Upstream-commit: 325c0404c84db11630cfcc24ac93cb82763de511
Component: engine
2015-04-27 10:42:40 -04:00
bb3c396980
remove some uneeded sleeps in tests
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9e0ffae864d6679084e84e2e27cbb9d350f6dbae
Component: engine
2015-04-27 10:14:29 -04:00
270e43ec62
Prevent deadlock on attempt to use own net
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net >
Upstream-commit: f30d1c1835618eadea5d0a68d1301dffd9f09b22
Component: engine
2015-04-27 14:57:37 +01:00
e570165119
Remove c.Fatal from goroutine in TestGetContainersAttachWebsocket
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c7b2632dc8550c8aa80ebd8b229809ac37fa53e1
Component: engine
2015-04-27 13:56:55 +02:00
ad85faa2ca
Remove dead code from daemon/daemon.go
...
fix #12492
Signed-off-by: Daniel Zhang <jmzwcn@gmail.com >
Upstream-commit: accbbfeae4c2f3ceb68060e08e46e382cdefc975
Component: engine
2015-04-27 15:50:47 +08:00
5d5dd54df9
remove useless http call from export
...
Signed-off-by: He Simei <hesimei@zju.edu.cn >
Upstream-commit: 6d9439c627e36349679249d991400da45eb75587
Component: engine
2015-04-27 12:41:03 +08:00
b5c5cd32f2
Add missing API docs about filtering by label.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: cfd0f53b03d26c370e37abf651d7f481ee8c6912
Component: engine
2015-04-26 15:36:01 -04:00
145f0ac265
Merge pull request #12787 from epc/copyedits
...
Copy edits for typos
Upstream-commit: 6cba3109c2a9c0c20d2541605a9aa7873225a224
Component: engine
2015-04-26 10:40:18 -07:00
520d5524c2
Adding James and theJeztah to the list
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: ba79f0ca1f389e3c87c19b2c326b3b6afbebc8ef
Component: engine
2015-04-26 10:32:43 -07:00
e5f7f8da6f
Replace json.Unmarshal with json.Decoder().Decode()
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 26543e03095eaa45d9afc12c029f07539323fee5
Component: engine
2015-04-26 15:02:01 +02:00
d5259f3ff9
Merge pull request #12734 from sergey-alekseev/sergey-alekseev-patch-1
...
Fix documentation typo in articles/basics.md
Upstream-commit: 92f4bd59ce941233b295ec2b2e5faa974105ad40
Component: engine
2015-04-25 20:33:55 -07:00
13d6b715bf
Merge pull request #12728 from HuKeping/addtest
...
Add test for REST API container rename
Upstream-commit: fefb8367663e5f97f8c85418691b10c6e9356134
Component: engine
2015-04-25 17:01:10 -07:00
d7a0961327
Copy edits for typos
...
Signed-off-by: Ed Costello <epc@epcostello.com >
Upstream-commit: fa9299f4c03cf097887db26dadcc63c711c925f1
Component: engine
2015-04-25 15:01:05 -04:00
478eada080
Fix race condition in API commit test
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: cd4f507b42e800d148b211ca2c780d01192a9041
Component: engine
2015-04-25 05:46:47 -07:00
1e118310a9
A fix for = in env values in linked containers
...
Closes : #12763
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: bc149be69c5ad22f82269427dd4b4aed9df4fa40
Component: engine
2015-04-25 04:42:43 -07:00
e384b42fa8
Add test for REST API container rename
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 8f752ffeafd2f8c08035a5e39220fe17c9309fd7
Component: engine
2015-04-25 17:19:57 +08:00
940ced577b
Fix documentation typo in articles/basics.md
...
Signed-off-by: Sergey Alekseev <sergey.alekseev.minsk@gmail.com >
Upstream-commit: 2188c8d2f41f4905411a40c30f4c703d7f4e0fcf
Component: engine
2015-04-25 11:32:17 +03:00
de733ff8fe
Merge pull request #12744 from vdemeester/11603-pkg-archive-test-coverage-2
...
Add coverage on pkg/archive (related to #11603 )
Upstream-commit: 272e612b657d787eb4d6844a032c9fda006de677
Component: engine
2015-04-24 22:12:01 -07:00
8d345fadf2
Merge pull request #12765 from LK4D4/registry_suite
...
Implement DockerRegistrySuite in integration-cli
Upstream-commit: 6e9a6f53963137e21ba790ab79501a7cd8ed5b96
Component: engine
2015-04-24 23:05:29 -04:00
76fb01ab2b
Merge pull request #12699 from vbatts/vbatts-init_mnt_ns
...
contrib/init: unshare mount namespace for inits
Upstream-commit: c3ef6df9c354f2df9eea2f4fce53b27637453367
Component: engine
2015-04-24 17:52:11 -07:00
aac3868541
Fixed typo 'configuring'
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: ae9905ef9c5e8fe793e6a6269bb720618f4fcaed
Component: engine
2015-04-24 16:52:32 -07:00
