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
Sven Dowideit
0c5a7ad577 Merge pull request #8008 from dwgebler/master
fixes incorrect environment variable labeling in container linking guide
2014-09-15 10:51:38 +10:00
Jeffrey Morgan
3a56f18899 Merge pull request #79 from kitematic/rc0.2.3
v0.2.3
2014-09-14 15:05:59 -07:00
Jeffrey Morgan
725d146ec4 Merge pull request #79 from kitematic/rc0.2.3
v0.2.3
2014-09-14 15:05:59 -07:00
Sean Li
6c04630928 Fixed installer bug. 2014-09-14 15:02:52 -07:00
Sean Li
a70f23d194 Fixed installer bug. 2014-09-14 15:02:52 -07:00
Sean Li
b82ffd383e Fixed image rebuild bug and bumped version. 2014-09-14 14:33:53 -07:00
Sean Li
eddf8d4b9e Fixed image rebuild bug and bumped version. 2014-09-14 14:33:53 -07:00
Daniel Nephin
192fce9153 Resolves #43 - sort containers in ps output by name, so services are grouped together.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2014-09-14 16:06:23 -04:00
Nicholas E. Rabenau
81357e12e7 Append instead of replace file contents
I think the `DOCKER_OPTS` should be appended to `/etc/default/docker` and not replace the entire contents.
2014-09-13 22:26:40 +02:00
Erik Hollensbe
09b700288e Allow /etc/hosts and /etc/resolv.conf to be updated both outside and
inside the container.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-13 11:27:34 -07:00
Jeff Morgan
0a8c95e832 adding upload script to deploy new zip file 2014-09-13 00:01:59 -07:00
Jeff Morgan
82efdc71c7 adding upload script to deploy new zip file 2014-09-13 00:01:59 -07:00
Sean Li
8e91ce11fc Added a feature to recover Kitematic setup. 2014-09-12 22:44:04 -07:00
Sean Li
09423e402e Added a feature to recover Kitematic setup. 2014-09-12 22:44:04 -07:00
Sean Li
aff459f1d3 Fixed space in path problem. 2014-09-12 15:09:10 -07:00
Sean Li
a004453ba0 Fixed space in path problem. 2014-09-12 15:09:10 -07:00
Sean Li
e3464c9e30 Merge branch 'master' into rc0.2.3 2014-09-12 14:39:28 -07:00
Sean Li
66c40a8787 Merge branch 'master' into rc0.2.3 2014-09-12 14:39:28 -07:00
Sean Li
60dec383a8 Lowered the wait time. 2014-09-12 14:30:54 -07:00
Sean Li
35f84a871b Lowered the wait time. 2014-09-12 14:30:54 -07:00
Sean Li
7669b3c08b Hack to prevent blank screen from appearing when starting the app. 2014-09-12 14:25:53 -07:00
Sean Li
05af0612b7 Hack to prevent blank screen from appearing when starting the app. 2014-09-12 14:25:53 -07:00
Tibor Vass
23f490427f Merge pull request #7983 from vbatts/vbatts-tarsum_switch_names
tarsum: TarSum should be the interface
2014-09-12 17:01:35 -04:00
Jeff Morgan
aeb542adec Merge branch 'master' of github.com:kitematic/kitematic 2014-09-12 13:50:59 -07:00
Jeff Morgan
dd4bbc77fc Merge branch 'master' of github.com:kitematic/kitematic 2014-09-12 13:50:59 -07:00
Sean Li
3f7f693112 Merge branch 'master' into rc0.2.3 2014-09-12 13:15:49 -07:00
Sean Li
a323d9bb00 Merge branch 'master' into rc0.2.3 2014-09-12 13:15:49 -07:00
Sean Li
65713bcdb0 Addded bootstrap Javascript files. 2014-09-12 13:15:36 -07:00
Sean Li
bb2996457c Addded bootstrap Javascript files. 2014-09-12 13:15:36 -07:00
unclejack
da4dba2e8c Merge pull request #8014 from jfrazelle/8012-prevent-container-names-starting-dash
Ensure container names start with a-zA-Z0-9
2014-09-12 23:15:16 +03:00
Sean Li
1147225bcd Merge branch 'master' into rc0.2.3 2014-09-12 13:09:58 -07:00
Sean Li
b51fbf1ab6 Merge branch 'master' into rc0.2.3 2014-09-12 13:09:58 -07:00
Sean Li
c280a7aece Fixing path escaping issues. 2014-09-12 13:09:40 -07:00
Sean Li
73b10b1637 Fixing path escaping issues. 2014-09-12 13:09:40 -07:00
Sean Li
66b1e06cb2 Manually packaged bootstrap. 2014-09-12 13:05:31 -07:00
Sean Li
714e559e05 Manually packaged bootstrap. 2014-09-12 13:05:31 -07:00
Jeffrey Morgan
0e677be1ea Merge pull request #73 from bensheldon/patch-1
Correction of typo in installer text
2014-09-12 13:04:35 -07:00
Jeffrey Morgan
9518dabb44 Merge pull request #73 from bensheldon/patch-1
Correction of typo in installer text
2014-09-12 13:04:35 -07:00
Ben Sheldon
46466e1158 Correct typo in installer text 2014-09-12 12:57:09 -07:00
Ben Sheldon
a29b126ef5 Correct typo in installer text 2014-09-12 12:57:09 -07:00
Sean Li
98bacf3d1a Meteor 0.9 packaging. 2014-09-12 12:43:27 -07:00
Sean Li
68918b48c3 Meteor 0.9 packaging. 2014-09-12 12:43:27 -07:00
Michael Crosby
63a1548688 Merge pull request #8004 from duglin/Issue6447
Fix parsing of proto/port - issue 6447
2014-09-12 12:00:57 -07:00
Doug Davis
658a9d0f47 Fix parsing of proto/port
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-12 11:39:14 -07:00
Michael Crosby
a96811272a Merge pull request #7934 from LK4D4/fix_double_allocation
Fix error propagation from userland-proxy
2014-09-12 11:39:10 -07:00
Jessica Frazelle
aa2af817be Ensure container names start with a-zA-Z0-9
Closes #8012.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-12 10:45:07 -07:00
Fred Lifton
64ecef59af Merge pull request #7986 from abh1nav/master
Update remote_api_client_libraries.md
2014-09-12 10:37:00 -07:00
Fred Lifton
1501adad29 Merge pull request #7987 from SvenDowideit/stop-hurting-blackrosezys-eyes
Yep, its been hurting my eyes too - and you've finally inspired me to fi...
2014-09-12 10:35:30 -07:00
James Turnbull
127f72d3ba Merge pull request #8011 from fsouza/fix-typo-remote-api
docs/reference/api: fix typo in docs
2014-09-12 13:26:24 -04:00
Francisco Souza
fe5b72e7bb docs/reference/api: fix typo in docs
Signed-off-by: Francisco Souza <f@souza.cc>
2014-09-12 13:57:43 -03:00