Vincent Demeester
42a0fd7e92
Merge pull request #19627 from pandrew/fix_warning_on_build
...
Fix warning
2016-01-24 12:49:47 +01:00
Sebastiaan van Stijn
42f6e8d40d
Fix remove API order in menu
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-01-24 02:48:47 -08:00
Paul Liljenberg
0c7201ee73
Fixes #19614
...
Signed-off-by: Paul Liljenberg <liljenberg.paul@gmail.com>
2016-01-24 10:28:18 +01:00
Sebastiaan van Stijn
037d159981
Merge pull request #19622 from r4j4h/quick-doc-fix
...
Correcting `overlay` -> `bridge` driver in run.md
2016-01-24 00:42:36 -08:00
Jasmine Hegman
ae5fce9fe0
Correcting `overlay` -> `bridge` driver in run.md
...
Correcting `overlay` -> `bridge` driver in run.md to match the preceding paragraph.
Signed-off-by: Jasmine Hegman <jasmine@jhegman.com>
2016-01-24 01:34:04 -07:00
Zhang Wei
e151ad936a
Make test case name consistent
...
Replace `Tty` with `TTY` in all test case names so that we can run
a bundle of `TTY` related test cases with TESTFLAGS like
`-check.f TestExecTTY*`
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-01-24 16:32:52 +08:00
Sebastiaan van Stijn
a1c6642c45
Merge pull request #19610 from companycy/patch-1
...
docs: image layers' path in aufs-driver.md
2016-01-23 23:37:03 -08:00
Sebastiaan van Stijn
717ced8dd7
Merge pull request #19602 from Microsoft/jjh/testrunexitonstdinclose
...
Windows CI: Fix TestRunExitOnStdinClose flakiness
2016-01-23 18:53:28 -08:00
companycy
ac1eac21c9
Update aufs-driver.md
...
fix typo in file path for image layers
Signed-off-by: bjcheny <companycy@gmail.com>
2016-01-24 10:03:29 +08:00
John Howard
75d107451a
Windows CI: Address simple failures in TestPS*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-23 16:33:45 -08:00
Antonio Murdaca
011b4f01f4
integration-cli: add suite for testing registries with auth
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-24 01:02:49 +01:00
John Howard
2b0a742237
Windows CI: Fix api_containers_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-23 14:40:25 -08:00
Stefan Scherer
11a51649cf
Update registry version in Dockerfile.armhf
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-23 18:46:46 +01:00
John Howard
f21fb2162e
Windows CI: Fix TestRename*
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-23 09:25:10 -08:00
John Howard
80b0570671
Windows CI: Porting for docker_api_images_test.go
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-22 21:13:38 -08:00
Alexander Morozov
7be8f72644
Merge pull request #19600 from aaronlehmann/buildenvusage2
...
Slight TestBuildEnvUsage2 speedup
2016-01-22 20:38:45 -08:00
Brian Goff
f6c20d9b22
Add back compat for volume drivers `Get` and `Ls`
...
Use a back-compat struct to handle listing volumes for volumes we know
about (because, presumably, they are being used by a container) for
volume drivers which don't yet support `List`.
Adds a fall-back for the volume driver `Get` call, which will use
`Create` when the driver returns a `404` for `Get`. The old behavior was
to always use `Create` to get a volume reference.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-22 22:48:17 -05:00
Sebastiaan van Stijn
bf85a49509
Merge pull request #19592 from duglin/Issue15777
...
Add some helper text for magical ADD
2016-01-22 18:27:44 -08:00
John Howard
4bfc5d4606
Windows CI: Fix TestRunExitOnStdinClose
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-01-22 18:27:15 -08:00
Phil Estes
67d86d10d8
Merge pull request #19216 from scaleoutsean/master
...
Add GPFS filesystem IDs
2016-01-22 21:27:03 -05:00
Qiang Huang
5ce5a8e966
Verify cgroup-parent name for systemd cgroup
...
Fixes : #17126
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-01-22 21:17:23 -05:00
Sebastiaan van Stijn
b3af1d5242
Merge pull request #19598 from tianon/pkg-config
...
Add pkg-config to our Debian build environment
2016-01-22 17:33:43 -08:00
Sebastiaan van Stijn
2d30720c1e
Merge pull request #19596 from Djelibeybi/fix-oracle-install-docs
...
Updated Oracle Linux install documentation
2016-01-22 17:27:42 -08:00
Sebastiaan van Stijn
bf28c219c5
Merge pull request #19511 from moxiegirl/19473-fix-certificate
...
Fixing missing certs article; consolidating security material
2016-01-22 17:20:36 -08:00
Avi Miller
081bffc1e1
Updated Oracle Linux install documentation to be more accurate.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2016-01-23 12:18:41 +11:00
Aaron Lehmann
74fafa5dd2
Slight TestBuildEnvUsage2 speedup
...
TestBuildEnvUsage2 was flagged in https://github.com/docker/docker/issues/19425
as one of the slowest integration tests. It's slow because it has some
comprehensive builder test cases that end up creating a lot of layers.
Even with a busybox base image, this can be expensive. It's not possible
to build "FROM scratch" because the test cases need the shell to ensure
environment variables are set correctly.
Some of the ENV and RUN statements can be combined. This causes fewer
layers to get created. Doing this produces a marginal improvement in the
runtime.
Before:
PASS: docker_cli_build_test.go:3956: DockerSuite.TestBuildEnvUsage2 43.619s
After:
PASS: docker_cli_build_test.go:3956: DockerSuite.TestBuildEnvUsage2 31.286s
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-01-22 17:13:50 -08:00
Sebastiaan van Stijn
6d1455e74b
Merge pull request #19579 from cyphar/hotfix-vendor-libcontainer
...
Hotfix vendor libcontainer
2016-01-22 16:46:04 -08:00
Mary Anthony
4c76c665b7
Fixing missing certs article; consolidating security material
...
Entering comments from reviewers
Updating with Derek's comments
Fixing bad links reported by build
Signed-off-by: Mary Anthony <mary@docker.com>
2016-01-22 16:44:18 -08:00
Brian Goff
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
Jess Frazelle
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
Aidan Hobson Sayers
ada7920479
Permit OPTIONS request against any url, fixes #19398
...
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
2016-01-23 00:31:08 +00:00
David Calavera
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
Nalin Dahyabhai
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
Tianon Gravi
9ac671f79e
Add pkg-config to our Debian build environment
...
This is used in `hack/make.sh` for detecting various dependencies such as `libsystemd-journal` -- without this, our packages don't support pulling logs back out of journald. 😢
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2016-01-22 15:22:04 -08:00
Antonio Murdaca
504a8ad295
Merge pull request #19567 from Microsoft/jjh/testpsnotshowportsofstoppedcontainer
...
Windows: TestPsNotShowPortsOfStoppedContainer linux only
2016-01-22 21:53:31 +01:00
Brian Goff
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
Phil Estes
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
Tibor Vass
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
David Calavera
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
David Calavera
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
Doug Davis
8d94a85d62
Add some helper text for magical ADD
...
Closes : #15777
Signed-off-by: Doug Davis <dug@us.ibm.com>
2016-01-22 10:13:13 -08:00
David Calavera
ae8f7c69e3
Merge pull request #19549 from cpuguy83/bump_plugin_api_version
...
Bump plugin API version
2016-01-22 09:33:29 -08:00
Jess Frazelle
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
Tibor Vass
a9fc4939df
Merge pull request #19573 from sanimej/libn
...
Vendor in libnetwork v0.6.0-rc2
2016-01-22 12:07:40 -05:00
Jess Frazelle
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
Vincent Demeester
73ae424ed8
Merge pull request #19470 from Microsoft/jjh/confans
...
Windows: VirtualTerminalInput native console
2016-01-22 17:27:47 +01:00
Tibor Vass
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
Tianon Gravi
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
scaleoutsean
bdc8241da9
Add GPFS
...
Signed-off-by: Sean Lee <seanlee@tw.ibm.com>
2016-01-22 21:12:47 +08:00
Vincent Demeester
c91045a78b
Merge pull request #19558 from LK4D4/reduce_cgroup_parsing
...
Refactor sysinfo usage
2016-01-22 11:18:53 +01:00