5b60c778bd
Merge pull request #12837 from mavenugo/integ
...
A few more Integration tests to test Networking related daemon flags
Upstream-commit: 1eb4e96f2125764a38114c7cdcdf2b336b6173f7
Component: engine
2015-04-30 11:12:43 -04:00
71aca0e198
Merge pull request #12574 from ahmetalpbalkan/docs/systemd-dir
...
docs: Add more places docker.service can be at
Upstream-commit: 029cbc10040ab9ee336663889454e5b08d1ef785
Component: engine
2015-04-29 19:07:58 -04:00
24deb92a52
docs: Add more places docker.service can be at
...
More systemd goodness. Documenting where `docker.service` lives under Ubuntu 15.
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: c0a1b2d6e99d5c6e29a016da39c1313a54c1cb34
Component: engine
2015-04-29 22:39:48 +00:00
99358033cc
Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term
...
Add error check before getting term
Upstream-commit: 2c4fe2aba3adc4416d09e76e669341e2217ae894
Component: engine
2015-04-29 17:57:01 -04:00
9d5c96c875
Moved explicit cleanups into defered action
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 1c073ec1766e0f3cfe28d8f9c2e9a9a37154ece6
Component: engine
2015-04-29 11:41:13 -07:00
4a236a1d62
Merge pull request #12875 from runcom/remove-cfatal-in-goroutine-integration-cli
...
c.Fatal won't fail and exit test inside a goroutine
Upstream-commit: d716f22aadc738a1d086e7713defc1e933b983e1
Component: engine
2015-04-29 10:47:17 -07:00
031175bb41
Merge pull request #11526 from mizzy/append-drop-rule-not-insert
...
Append DROP rule with --icc=false, not insert
Upstream-commit: 6c46c9c83936689937701b3259d969255bcf4ca6
Component: engine
2015-04-29 10:28:11 -07:00
0976611d84
Integration Tests for --icc=false & container Linking using --expose
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: dd0666e64f17329355c77aae1a2ac0fe2fe43402
Component: engine
2015-04-29 10:16:31 -07:00
ce3a344378
Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups
...
Option to configure cgroup manager (adds --exec-opt)
Upstream-commit: 53bef64804c6dae6662a7d55c3bb3e48b3e5dfdf
Component: engine
2015-04-29 10:00:41 -07:00
febe54901d
Integration tests for --ip daemon option
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: ba11929ebdf4cf7798cddc98c4dcfc000b154264
Component: engine
2015-04-29 09:55:49 -07:00
73bcda784f
Integration tests for --fixed-cidr daemon config
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 0e254411b1fe0b5024d4a8e5ade7ce12f4545d8e
Component: engine
2015-04-29 09:55:42 -07:00
e04b055914
Integration tests for --bip daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: 9c325c3f54b24621b76dee530a855b37cb22abcc
Component: engine
2015-04-29 09:55:34 -07:00
2a71cc5aaf
Integration tests for --bridge daemon flag
...
Signed-off-by: Madhu Venugopal <madhu@docker.com >
Upstream-commit: f3f5ff9d837eecb97eeeb878f0bd416b6ab57cf2
Component: engine
2015-04-29 09:55:25 -07:00
5222cb71a4
Merge pull request #12840 from vdemeester/11598-pkg-fileutils-tests
...
Add coverage on pkg/fileutils
Upstream-commit: 44f8c44e5f99dc3c39d9ab109ac88a058b222df6
Component: engine
2015-04-29 11:15:57 -04:00
6982f607b4
c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 4203230cbbf46238e38099c9073bdcad5f69a63f
Component: engine
2015-04-29 17:02:22 +02:00
f9039974fb
Add coverage on pkg/fileutils
...
Should fix #11598
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8454e1a3b24e2e076bb08a2a6b1fcb56efe2924e
Component: engine
2015-04-29 16:27:12 +02:00
93d4e49319
Merge pull request #12870 from coolljt0725/fix_rename_help
...
Fix docker rename help not consistent with other commands
Upstream-commit: f2f8e4c5c9c89e3df59cb3123fa30a0eb6592ddb
Component: engine
2015-04-29 09:14:03 -04:00
b38b865566
Fix docker rename help not consistent with other commands
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 0e752adf550ef4891e40889ea92e12ec3d775a00
Component: engine
2015-04-29 19:37:20 +08:00
12da32d151
Merge pull request #11190 from cyphar/expose-path-sanitisation-wrappers
...
Expose the getResourcePath and getRootResourcePath wrappers.
Upstream-commit: d2f0b9ed976987576483387bc919cb7ffbfa38e8
Component: engine
2015-04-28 18:45:36 -04:00
d550f6b9ae
Merge pull request #12789 from LK4D4/daemon_suite
...
Implement daemon suite for integration-cli
Upstream-commit: f80300e9cf150f9770c8ffce94a4d57acac6aadc
Component: engine
2015-04-28 15:30:36 -07:00
f4e54f0df1
Merge pull request #12820 from runcom/yet-another-sockRequest-refactor
...
Expose whole Response struct in sockRequestRaw
Upstream-commit: cfa3a080c646878414585a8931416538a703a3e0
Component: engine
2015-04-28 13:26:30 -07:00
9af361f6e2
Merge pull request #12245 from buddhamagnet/dockerignore-ignores
...
Add support for exclusion rules in dockerignore
Upstream-commit: 4676ff3fd72f92fc26c3a1d9d588ed544fb46b55
Component: engine
2015-04-28 11:28:46 -07:00
bc3d7f1531
add support for exclusion rules in dockerignore
...
Signed-off-by: Dave Goodchild <buddhamagnet@gmail.com >
Upstream-commit: 6fd8e485c85c4f8ca62578d0840bdeddc4cba151
Component: engine
2015-04-28 18:56:45 +01:00
d9d6af7cf9
Merge pull request #12644 from psftw/official-repos-rewrite
...
Rewrite Official Repos page.
Upstream-commit: dde5ff2872bb76ccbc279f4cd52d7c75565a3b75
Component: engine
2015-04-28 08:57:29 -07:00
65ecb50b1e
Merge pull request #12814 from vbatts/vbatts-rhel_updates
...
RHEL updates
Upstream-commit: 6113eab1740a0cfe8d6f504cc270027c211ae864
Component: engine
2015-04-28 08:51:35 -07:00
95218301ea
Merge pull request #12844 from hqhq/hq_fix_inspect_format
...
fix a minor inspect format issue
Upstream-commit: 868d5dca74eda72a9de2ab4baf6ff1ce10607d1c
Component: engine
2015-04-28 08:50:52 -07:00
24c022aa2a
rhel.md: adding link to most recent issue
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 9b365e0845bf8e74cef23db2233e721b90ae4339
Component: engine
2015-04-28 11:28:33 -04:00
237e42e47c
rhel.md: bump the kernel version for RHEL6
...
Closes #9856
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 179b6ddc353fd766125df19bf61b00a39a13cd04
Component: engine
2015-04-28 11:28:33 -04:00
112a3bf0ea
rhel.md: update RHEL6 from 6.5 to 6.6
...
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: ed40c0a9a48e54dbe341ad718d9362a268467378
Component: engine
2015-04-28 11:28:23 -04: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
d6802adb29
fix a minor inspect format issue
...
Before, inspect cont1 cont2 shows:
[{
xxx
}
,{
xxx
}
]
After, it shows:
[
{
xxx
}
,{
xxx
}
]
Because `func (*Encoder) Encode` always followed by a newline character,
so it's difficult to put '}' and ']' one the same line.
To get symmetry, above is our choice.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: c7812f01c7269c713c2243fe8a69b55cdb77b72a
Component: engine
2015-04-28 18:51:04 +08:00
00b8817331
Rewrite Official Repositories page.
...
The existing page is focused on listing a set of requirements for
proposing a new repository. This information has become outdated and is
duplicated in the `docker-library/official-images` and
`docker-library/docs` GitHub repositories. This PR rewrites the
Official Repositories page to describe what they actually are, and
defers to GitHub/IRC for the subset of users that are interested in
contributing. I also removed the requirement to contact
partners@docker.com and made it optional to reduce the barrier to entry.
Signed-off-by: Peter Salvatore <peter@psftw.com >
Upstream-commit: 8f52eb7b827d658d6974056460afd722a5cb040f
Component: engine
2015-04-28 00:37:17 -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
1a116000d5
option to configure cgroups
...
Signed-off-by: Jessica Frazelle <jess@docker.com >
Upstream-commit: 2afcd10202283478cbafb21e8c5f90f1236acccc
Component: engine
2015-04-27 17:50:39 -07: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
7b559d4a5f
Add docs for --exec-opt and setting native.cgroupdriver.
...
update man pages.
update bash completion.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: d4bbbe58ddd5916c5f7d253a90fd97e3a4fd59bf
Component: engine
2015-04-27 17:04:28 -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
5f37bbe0bd
Implement daemon suite for integration-cli
...
For creating and stopping test daemons automatically.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 57464c32b99b36a2963fb37da86b9870c9a56145
Component: engine
2015-04-27 15:48:29 -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
