feca36b379
Merge pull request #19519 from calavera/fix_event_channel_closing_race
...
Fix channel closing race in event tests.
2016-01-22 19:43:28 -05:00
789e887c73
Merge pull request #19599 from nalind/master-deb-pkg-config
...
Add pkg-config to our RPM build environment
2016-01-22 16:39:28 -08:00
422827fa92
Merge pull request #19527 from aboch/epc
...
Move Unsupp Network & IP check to the new updateNetworkConfig() func
2016-01-22 15:54:21 -08:00
7d4f52ec6b
Add pkg-config to our RPM build environment
...
While hack/make.sh checks for systemd headers using pkg-config, we
forgot to ensure that they were there in the images that we use for
building binaries for RPM-based distributions. Add the right packages
to the generate.sh that we use for them, and update the copies of the
generated files that we carry in the source tree.
Notes: Fedora, CentOS, and Oracle Linux put the pkg-config command in
the "pkgconfig" package, while OpenSUSE calls the package "pkg-config".
The systemd-devel package, like systemd, is not in Oracle Linux 6.
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-01-22 18:46:07 -05:00
504a8ad295
Merge pull request #19567 from Microsoft/jjh/testpsnotshowportsofstoppedcontainer
...
Windows: TestPsNotShowPortsOfStoppedContainer linux only
2016-01-22 21:53:31 +01:00
455a505749
Merge pull request #19190 from srust/volume_driver_parity_again
...
Allow external volume drivers to host anonymous volumes again
2016-01-22 15:53:06 -05:00
34a83f9f2c
Merge pull request #19517 from calavera/validate_config_keys
...
Verify that the configuration keys in the file are valid.
2016-01-22 15:01:29 -05:00
2731dbc797
Merge pull request #19509 from BrianBland/master
...
Fixes layer MediaTypes in manifests created from a cross-repository push
2016-01-22 14:27:47 -05:00
27b060492c
Fix channel closing race in event tests.
...
Divide event matching into two functions, a matcher and
a processor. That way, the error handling doesn't call
the channel closing logic at all.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-22 13:31:46 -05:00
5e80ac0dd1
Make TLSOptions and LogConfig embedded structs.
...
That way the configuration file becomes flag, without extra keys.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-22 13:20:17 -05:00
ae8f7c69e3
Merge pull request #19549 from cpuguy83/bump_plugin_api_version
...
Bump plugin API version
2016-01-22 09:33:29 -08:00
21ec6d3789
Merge pull request #19146 from mikedougherty/cs-105-download-script
...
Create a bundle for the install script to support other domains
2016-01-22 09:25:24 -08:00
a9fc4939df
Merge pull request #19573 from sanimej/libn
...
Vendor in libnetwork v0.6.0-rc2
2016-01-22 12:07:40 -05:00
05b2f342fd
Merge pull request #19588 from tianon/docker.default-systemd
...
Add a note to /etc/default/docker noting that it does not apply to systemd
2016-01-22 08:52:02 -08:00
73ae424ed8
Merge pull request #19470 from Microsoft/jjh/confans
...
Windows: VirtualTerminalInput native console
2016-01-22 17:27:47 +01:00
cba7ba25f4
Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm
...
Enable DockerTrustSuite for ARM again
2016-01-22 11:23:19 -05:00
90e33640b8
Add a note to /etc/default/docker noting that it does not apply to systemd
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-22 07:35:02 -08:00
c91045a78b
Merge pull request #19558 from LK4D4/reduce_cgroup_parsing
...
Refactor sysinfo usage
2016-01-22 11:18:53 +01:00
c3a9ecedba
Merge pull request #19574 from polonskiy/patch-2
...
fixed typo
2016-01-22 09:14:58 +01:00
b0873c2c50
fixed typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com>
2016-01-22 09:27:53 +02:00
da9eadb066
IT for service/network name with '.', corrected libnetwork flag for DNS
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-21 20:49:02 -08:00
02c9d48144
Vendor in libnetwork v0.6.0-rc2
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
2016-01-21 20:46:28 -08:00
51dad1185a
Create a bundle for the install script to support other domains
...
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.
This install script is used in to change the URLs instead of sed in
release.sh.
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
2016-01-21 20:42:20 -08:00
6f22d9ec4e
Merge pull request #19562 from MHBauer/nospace-checktheoutput
...
check the output, not the errcode
2016-01-21 22:09:41 -05:00
845dc1b24c
Windows: TestPsNotShowPortsOfStoppedContainer linux only
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 18:48:21 -08:00
3233f45609
Merge pull request #19263 from jfrazelle/update-aa-parser
...
refactor aaparser pkg, add unit tests
2016-01-21 19:40:53 -05:00
6e16ec2b9c
Merge pull request #19529 from Microsoft/jjh/dockerfile
...
Windows: Update dockerfile for Windows to Windows CI
2016-01-21 15:46:08 -08:00
bcb9adf49e
check the output, not the errcode
...
- errcode of 1 can be returned for cases other than the 'no space left' case
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2016-01-21 15:23:20 -08:00
9ae51b3e0f
Merge pull request #19383 from calavera/container_store
...
Extract container store from the daemon.
2016-01-21 17:20:47 -05:00
ed4038676f
Verify that the configuration keys in the file are valid.
...
- Return an error if any of the keys don't match valid flags.
- Fix an issue ignoring merged values as named values.
- Fix tlsverify configuration key.
- Fix bug in mflag to avoid panics when one of the flag set doesn't have any flag.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-01-21 16:56:12 -05:00
45db4fa70e
Merge pull request #19557 from tiborvass/karkhaz-add-dead-to-docker-ps-documentation
...
Carry 19305: Added `dead` to docs for docker ps -f status=...
2016-01-21 13:46:51 -08:00
859262a82a
Added `dead` to docs for docker ps -f status=...
...
It is possible to invoke `docker ps -f status=dead`, but the
documentation for docker-ps does not mention `dead` as a valid option.
This commit fixes that.
Signed-off-by: Kareem Khazem <karkhaz@karkhaz.com>
2016-01-21 16:44:33 -05:00
e287bef453
Merge pull request #19316 from Microsoft/jjh/incontainererror
...
Windows: In container build check
2016-01-21 13:44:19 -08:00
3ecba7089b
Merge pull request #19552 from aaronlehmann/vendor-distribution-3
...
Vendor updated distribution package
2016-01-21 16:21:59 -05:00
4dbd612d47
Windows: In container build check
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 13:15:23 -08:00
eacd2fd4da
Windows: Update dockerfile.windows
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 12:49:03 -08:00
0b7e9ef910
Merge pull request #19550 from Microsoft/jjh/testlinksmultiplewithsamename
...
Windows: Fix TestLinksMultipleWithSameName
2016-01-21 15:38:47 -05:00
26334b7a7d
Merge pull request #19551 from aaronlehmann/fix-retry-on-enospc
...
Don't retry downloads when disk is full
2016-01-21 15:37:50 -05:00
d2448a0c20
Merge pull request #19524 from LK4D4/iocopy_writeto
...
Use bufio.Reader in io.Copy source for overlay.copyRegular
2016-01-21 15:37:12 -05:00
16faf8f1fc
Merge pull request #19518 from dmcgowan/unwrap-url-error-on-retry
...
Unwrap URL errors on retry
2016-01-21 15:36:41 -05:00
921eae9d6d
Vendor updated distribution package
...
Another day, another revendor.
This revision of distribution is more tolerant of incorrect Content-Type
headers when fetching manifests.
Fixes #19526
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-21 11:01:14 -08:00
3b0d36dbc1
Move ErrUnsupportedNetwork* checks to updateNetworkConfig() func
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-01-21 10:56:01 -08:00
b7a68d0252
Merge pull request #19548 from WeiZhang555/remove-hard-coded
...
Remove hard coded 'docker' string from package
2016-01-21 13:06:22 -05:00
4f13ec5551
Don't retry downloads when disk is full
...
There was already a check that prevented protocol-level fallback in this
situation, but retries within a specific protocol will still happen.
This makes it take a long time for the pull to finally error out.
This fixes slowness in TestDaemonNoSpaceleftOnDeviceError, which used to
take a long time due to the backoff between retry attempts:
PASS: docker_cli_daemon_test.go:1868: DockerDaemonSuite.TestDaemonNoSpaceleftOnDeviceError 5.882s
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-21 10:01:51 -08:00
eacc9fc2c3
Merge pull request #19547 from tonistiigi/revert-aufs-hardlinks
...
Revert "Copy aufs hardlinks to top layer"
2016-01-21 09:56:26 -08:00
473a32ba8f
Windows: Fix TestLinksMultipleWithSameName
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-21 09:52:49 -08:00
5f9375cf39
Merge pull request #19349 from jfrazelle/add-link-to-wiki
...
add warning if upgrading via script to migrate
2016-01-21 12:51:25 -05:00
7aef311269
Merge pull request #19541 from albers/completion-events
...
Support new events in bash completion
2016-01-21 18:40:54 +01:00
7d19ca7c40
Merge pull request #19423 from jfrazelle/apparmor-no-install
...
disable install of docker-engine for 1.10, try to get ready for 1.11
2016-01-21 12:08:50 -05:00
3f5e1c69b3
Use pools.Copy instead of io.Copy for overlay.copyRegular
...
That function is pretty heavy used on container start. Autoallocating
buffer can be painful.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-01-21 08:53:37 -08:00
Brian Goff
Jess Frazelle
David Calavera
Nalin Dahyabhai
Antonio Murdaca
Phil Estes
Tibor Vass
Vincent Demeester
Tianon Gravi
Anton Polonskiy
Santhosh Manohar
Mike Dougherty
Doug Davis
John Howard
Morgan Bauer
Sebastiaan van Stijn
Kareem Khazem
Aaron Lehmann
Alessandro Boch
Arnaud Porterie
Alexander Morozov