1
0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Commit Graph

47845 Commits

Author SHA1 Message Date
Nathan LeClaire
2ecc55937c Fix RC version mismatch bug
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-07 15:49:03 -07:00
David Calavera
47afe6bd0a Remove reference package dependency from the api.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-04-07 15:01:23 -07:00
Riyaz Faizullabhoy
77bf588830 Merge pull request #670 from cyli/stop-installing-go-vet
Do not install go vet on the Dockerfile
2016-04-07 15:00:54 -07:00
Anusha Ragunathan
c7076d2670 Add non-experimental daemon as a test requirement.
For test that should be exclusively run only in regular daemon builds
and not in the experimental version, add a requirement.

Verified using TestCleanupMountsAfterDaemonKill.
- On regular daemon, the test ran.
- On experimental daemon, the test skipped.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-04-07 14:46:32 -07:00
Dongluo Chen
34d4cae503 Merge pull request #2050 from abronan/fix_session_consul_leader_failure
Fix Consul Leader Election Failure on multi-server and leader soft-restart
2016-04-07 14:18:52 -07:00
Victor Vieux
aaa10d16b7 fix restart docker in tests
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-07 14:14:25 -07:00
Ying Li
4301c3f402 Pin the version of oscross, similarly to docker/docker
Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-07 14:09:57 -07:00
Ying Li
55436e6348 Do not install go vet on the Dockerfile, as it should already be in the image, and godeps no longer necessary
Signed-off-by: Ying Li <ying.li@docker.com>
2016-04-07 14:09:27 -07:00
Sebastiaan van Stijn
14015eedb1 Merge pull request #21750 from LK4D4/flaky_format_test
integration-cli: try to make TestEventsTimestampFormats less flaky
2016-04-07 13:42:17 -07:00
Vincent Demeester
14aa019d2d Merge pull request #21859 from tonistiigi/vendor-net-fork
vendor: patch template init in trace pkg for performance
2016-04-07 22:39:23 +02:00
Victor Vieux
69eabdc81f fix possible data race with failure count
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-07 13:35:27 -07:00
Alexander Morozov
9b2c3aa894 pkg/archive: use more narrow interface for CompressStream
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-04-07 13:21:05 -07:00
Vincent Demeester
07f5804899 Merge pull request #21806 from Microsoft/RemoveSymlinkTests
Stop running symlink-volume tests on Windows
2016-04-07 22:03:44 +02:00
Alexandre Beslic
ac6341066d Fix Consul Leader Election Failure on multi-server
This fixes an error with Consul which fails to see a new
swarm leader after a consul leader soft restart because
of session renewal and missing status update.

Signed-off-by: Alexandre Beslic <alexandre.beslic@gmail.com>
2016-04-07 12:23:47 -07:00
Tonis Tiigi
07fe6947a4 vendor: patch template init in trace pkg for performance
Temporarily include a fork of golang/net package
that includes a performance patch. Measured performance
gain is ~60ms for every `docker run` command.

Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-07 11:02:14 -07:00
Tony Witherspoon
f5b80640fe Merge branch '3191_2_help_cli_feature' of https://github.com/twitherspoon/compose into 3191_2_help_cli_feature 2016-04-07 12:46:27 -04:00
twitherspoon
9f47e43b5c Merge branch 'master' into 3191_2_help_cli_feature 2016-04-07 12:43:34 -04:00
Tony Witherspoon
5d0aab4a8e updated cli_test.py to no longer expect raised SystemExit exceptions
Signed-off-by: Tony Witherspoon <tony.witherspoon@gmail.com>
2016-04-07 12:42:14 -04:00
Jess Frazelle
1fbdd354c2 Merge pull request #21855 from vdemeester/makefile-typo
Fixing a typo in Makefile
2016-04-07 16:41:25 +00:00
Tibor Vass
e82830ecde Merge pull request #21628 from clnperez/systemd-tasksmax-workaround
Build-deb hack for systemd tasksmax
2016-04-07 12:30:45 -04:00
Christy Perez
2b849e0263 Build-deb hack for systemd tasksmax
Since we can't use the TasksMax value in the docker.service
file by default, we can uncomment it at buildtime.

See docker/docker/pull/21491 for some background.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
2016-04-07 11:08:30 -05:00
Eric A. Zarko
6c47f4d8e2 Adding Oracle Enterprise Linux provisioner
Fixes #1361
Fixes #3164
Corrected copy/paste typo in libmachine/provision/fedora_test.go
Preserve environment when performing yum update for proxy settings.

Signed-off-by: Eric A. Zarko <eric.zarko@oracle.com>
2016-04-07 09:04:23 -07:00
Brian Goff
4f8a6f3e02 Merge pull request #21840 from tonistiigi/fix-closing-attach-streams
Fix closing attach streams on lost tcp connection
2016-04-07 12:02:33 -04:00
Vincent Demeester
3785844c5b Fixing a typo in Makefile
A typo is present in the new awesome `make help`, fixing that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-04-07 16:10:09 +02:00
Vincent Demeester
d5dfc4e526 Merge pull request #21820 from estesp/lazy-init-useradd
Lazy init useradd and remove init()
2016-04-07 10:09:02 +02:00
Vincent Demeester
2e236d0255 Merge pull request #21828 from dmcgowan/fix-overlay-on-overlay-test
Fix overlay test running on overlay
2016-04-07 10:07:25 +02:00
Vincent Demeester
334f73f5b4 Merge pull request #21842 from tonistiigi/fix-flaky-testsaveloadparents
Fix flaky TestSaveLoadParents
2016-04-07 10:01:28 +02:00
Vincent Demeester
36bc01c0cb Merge pull request #21835 from HackToday/fixsecurity
Fix deprecated format for security-opt
2016-04-07 09:28:58 +02:00
Vincent Demeester
8785952282 Merge pull request #21830 from anusha-ragunathan/auplink
Be more lenient on auplink errors.
2016-04-07 09:19:38 +02:00
Vincent Demeester
d7a04c7416 Merge pull request #21841 from WeiZhang555/error-typo
Fix typo
2016-04-07 08:56:43 +02:00
Tonis Tiigi
0c0198a5e6 Fix flaky TestSaveLoadParents
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-06 21:58:47 -07:00
Zhang Wei
5fdbce3185 Fix typo
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-04-07 12:46:55 +08:00
Tonis Tiigi
a47cd63915 Fix closing attach streams on lost tcp connection
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-04-06 21:27:47 -07:00
Derek McGowan
824c72f472 Fix overlay test running on overlay
Overlay tests were failing when /var/tmp was an overlay mount with a misleading message.
Now overlay tests will be skipped when attempting to be run on overlay.
Tests will now use the TMPDIR environment variable instead of only /var/tmp

Fixes #21686

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2016-04-06 21:06:42 -07:00
Jess Frazelle
da0985fd16 Merge pull request #21821 from vieux/make_help
add `make help`
2016-04-07 02:51:27 +00:00
Kai Qiang Wu(Kennan)
0b207e7558 Fix deprecated format for security-opt
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-04-07 02:09:18 +00:00
Victor Vieux
75b3569594 Merge pull request #1995 from allencloud/validate-overcommitRatio-not-to-be-negative
validate swarm.overcommit and add integration test for cluster options
2016-04-06 18:26:19 -07:00
Anusha Ragunathan
dbd9b7e121 Be more lenient on auplink errors.
On aufs, auplink is run before the Unmount. Irrespective of the
result, we proceed to issue a Unmount syscall. In which case,
demote erros on auplink to warning.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-04-06 18:24:19 -07:00
Sun Hongliang
d403254ed2 1.validate cluster option swarm.overcommit
2.change swarm.createretry's error info and add its integration test
Signed-off-by: Sun Hongliang <allen.sun@daocloud.io>
2016-04-07 09:00:41 +08:00
Dongluo Chen
335b2edda3 Merge pull request #2093 from vieux/do_not_go_get_vet
do not go get vet in travis
2016-04-06 17:58:25 -07:00
Victor Vieux
6d2a411818 do not go get vet in travis
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-06 17:48:17 -07:00
Victor Vieux
ee30452059 Merge pull request #2080 from allencloud/log-warn-when-getting-engine-label-named-node
send warn message if got an engine with label "node"
2016-04-06 17:20:09 -07:00
Victor Vieux
b967e381aa remove docker info warnings (if any) from Makefile
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-06 16:57:33 -07:00
Victor Vieux
c72b51b09c add make help
Signed-off-by: Victor Vieux <vieux@docker.com>
2016-04-06 16:57:28 -07:00
John Howard
9d7f6bb921 Merge pull request #21733 from Microsoft/sjw/updatepending
Adding postRunProcessing infrastructure for hanlding Windows Update.
2016-04-06 15:36:39 -07:00
French Ben
fb0445af7c Merge pull request #1606 from docker/remove-localstorage
Remove localstorage
2016-04-06 15:16:53 -07:00
Phil Estes
c6f45fd2ee Lazy init useradd and remove init()
This should not have been in init() as it causes these lookups to happen
in all reexecs of the Docker binary. The only time it needs to be
resolved is when a user is added, which is extremely rare.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
2016-04-06 17:53:45 -04:00
Richard Scothern
55f1b7651f Merge pull request #1590 from RichardScothern/s3-permission-scopes
Document required IAM permissions for S3 storage driver.
2016-04-06 14:46:12 -07:00
French Ben
ff06972d1f Removed all localstorage checks
Signed-off-by: French Ben <me+git@frenchben.com>
2016-04-06 14:44:46 -07:00
French Ben
be6d9864ea Merge pull request #1603 from docker/1591-update-terminal
Updated path to work properly on linux - Fixes #1591
2016-04-06 14:36:30 -07:00