docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-11 04:02:07 +03:00
Code Activity
47,845 Commits 116 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan van Stijn
029cbc1004 Merge pull request #12574 from ahmetalpbalkan/docs/systemd-dir 
docs: Add more places docker.service can be at
 2015-04-29 19:07:58 -04:00
Daniel Nephin
878d90febf Merge pull request #1374 from aanand/close-before-attaching 
Close connection after building or pulling
 2015-04-29 18:56:03 -04:00
Ahmet Alp Balkan
c0a1b2d6e9 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>
 2015-04-29 22:39:48 +00:00
Phil Estes
2c4fe2aba3 Merge pull request #12439 from Mashimiao/add-err-check-before-getting-term 
Add error check before getting term
 2015-04-29 17:57:01 -04:00
Jeffrey Morgan
4c2e2e95de Merge pull request #456 from TeckniX/master 
Added support for env shell called via settings
 2015-04-29 17:51:18 -04:00
Aaron Davidson
c271c61fee Do our best not to invoke iptables concurrently if --wait is unsupported 
We encountered a situation where concurrent invocations of the docker daemon on a machine with an older version of iptables led to nondeterministic errors related to simultaenous invocations of iptables.

While this is best resolved by upgrading iptables itself, the particular situation would have been avoided if the docker daemon simply took care not to concurrently invoke iptables. Of course, external processes could also cause iptables to fail in this way, but invoking docker in parallel seems like a pretty common case.

Signed-off-by: Aaron Davidson <aaron@databricks.com>
 2015-04-29 14:40:25 -07:00
TeckniX
165d463c69 Added support for env shell called via settings 
Signed-off-by: TeckniX <lokitek@gmail.com>
 2015-04-29 17:26:09 -04:00
Stephen Day
5556cd1ba1 Merge pull request #260 from dmcgowan/short-digests 
Add short digest implementation
 2015-04-29 14:05:41 -07:00
Dan Walsh
d0a4f310ef Merge branch 'master' of github.com:docker/docker into kill 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-04-29 15:06:47 -04:00
Madhu Venugopal
1c073ec176 Moved explicit cleanups into defered action 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 11:41:13 -07:00
David Lawrence
7f5250b604 more init fixes 2015-04-29 11:27:16 -07:00
David Lawrence
7bce36a2c5 godep update for repo init 2015-04-29 11:19:49 -07:00
David Lawrence
3147c13f73 init fixes 2015-04-29 11:18:08 -07:00
Evan Hazlett
03c1fbadc5 Merge pull request #1073 from ehazlett/vbox-use-single-core 
vbox: use single cpu by default
 2015-04-29 14:07:17 -04:00
Evan Hazlett
aa5cda2e0b Merge pull request #1072 from ehazlett/gce-fix-instance-refresh 
gce: fix for instance not being refreshed on create
 2015-04-29 14:06:41 -04:00
Evan Hazlett
f96e93dd00 Merge pull request #1075 from ehazlett/vbox-dns-pass-through 
vbox: use dns pass through
 2015-04-29 14:05:37 -04:00
Jessie Frazelle
d716f22aad Merge pull request #12875 from runcom/remove-cfatal-in-goroutine-integration-cli 
c.Fatal won't fail and exit test inside a goroutine
 2015-04-29 10:47:17 -07:00
Aanand Prasad
1a77feea3f Close connection before attaching on 'up' and 'run' 
This ensures that the connection is not recycled, which can cause the
Docker daemon to complain if we've already performed another streaming
call such as doing a build.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 18:42:03 +01:00
Alexander Morozov
6c46c9c839 Merge pull request #11526 from mizzy/append-drop-rule-not-insert 
Append DROP rule with --icc=false, not insert
 2015-04-29 10:28:11 -07:00
Madhu Venugopal
dd0666e64f Integration Tests for --icc=false & container Linking using --expose 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 10:16:31 -07:00
Jessie Frazelle
53bef64804 Merge pull request #10427 from jfrazelle/option-to-disable-systemd-cgroups 
Option to configure cgroup manager (adds --exec-opt)
 2015-04-29 10:00:41 -07:00
Madhu Venugopal
ba11929ebd Integration tests for --ip daemon option 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:49 -07:00
Madhu Venugopal
0e254411b1 Integration tests for --fixed-cidr daemon config 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:42 -07:00
Madhu Venugopal
9c325c3f54 Integration tests for --bip daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:34 -07:00
Madhu Venugopal
f3f5ff9d83 Integration tests for --bridge daemon flag 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-04-29 09:55:25 -07:00
Evan Hazlett
9e1185e06e vbox: use dns pass through 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 12:33:10 -04:00
Aanand Prasad
7e0ab0714f Merge pull request #1344 from dnephin/fix_pull_with_sha 
Support image with ids instead of names
 2015-04-29 16:46:34 +01:00
Aanand Prasad
2e6bc078fb Implement 'labels' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 16:45:18 +01:00
Doug Davis
44f8c44e5f Merge pull request #12840 from vdemeester/11598-pkg-fileutils-tests 
Add coverage on pkg/fileutils
 2015-04-29 11:15:57 -04:00
Antonio Murdaca
4203230cbb 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>
 2015-04-29 17:02:22 +02:00
Vincent Demeester
8454e1a3b2 Add coverage on pkg/fileutils 
Should fix #11598

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-04-29 16:27:12 +02:00
Daniel Nephin
3dd860f0ba Fix #923, support image with ids instead of names. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-04-29 10:13:18 -04:00
Daniel Nephin
de800dea0f Merge pull request #1370 from aanand/update-docker-version 
Update Docker version to 1.6 stable
 2015-04-29 10:03:13 -04:00
Evan Hazlett
31b1eb0875 gce: fix for instance not being refreshed on create 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:54:08 -04:00
Evan Hazlett
e8704b14f1 vbox: use single cpu by default 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:45:33 -04:00
Evan Hazlett
9aa861ea55 update usage hint for powershell 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett
92f6b45de2 env-shell: fixed tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett
6b735677a0 do not hard code machine binary name in env command 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett
33d8058d38 shell selection: fix tests and add powershell test 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett
e13e2b61c6 use template for shell config; more powershell and cmd fixes 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett
7585680668 add export and clear env for powershell 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:35 -04:00
Evan Hazlett
cba15e843f powershell support 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-29 09:28:34 -04:00
Evan Hazlett
56ec00b3d2 Merge pull request #1048 from nathanleclaire/fix_windows_binary 
Fix Windows binary path being broken and add -L to remaining commands
 2015-04-29 09:26:37 -04:00
Evan Hazlett
4358113b41 Merge pull request #1025 from jfieber/vboxnat 
Virtualbox: move NAT port allocation to machine boot
 2015-04-29 09:25:38 -04:00
Aanand Prasad
fed4377ef6 Merge pull request #1351 from mchasal/1301-alphabetize_usage 
Fix for #1301, Alphabetize Commands
 2015-04-29 14:21:46 +01:00
Evan Hazlett
193357a1ba Merge pull request #1067 from zchee/update-gce-image 
Update GCE imageName to v20150316
 2015-04-29 09:21:27 -04:00
Evan Hazlett
13e1b1e867 Merge pull request #1058 from hairyhenderson/rm-report-success-on-multi-machines-1053 
Reporting success of each machine when removing multiples
 2015-04-29 09:21:06 -04:00
Doug Davis
534ed8c2d4 Remove use of "DEBUG" env var from CLI and decouple DEBUG from --log-level 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-04-29 06:20:33 -07:00
Brian Goff
f2f8e4c5c9 Merge pull request #12870 from coolljt0725/fix_rename_help 
Fix docker rename help not consistent with other commands
 2015-04-29 09:14:03 -04:00
Aanand Prasad
021bf46557 Update Docker version to 1.6 stable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 13:58:32 +01:00