0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
14198 commits 14 branches 412 tags 338 MiB
Commit graph

426 commits

Author SHA1 Message Date
Xinzi Zhou
ed7907a988 Add missing newline for bash code example 
Signed-off-by: Zhou Xinzi <imdreamrunner@gmail.com>
 2015-03-26 01:24:00 +08:00
moxiegirl
0926a023d6 Merge pull request #11550 from moxiegirl/adjust-mac-install 
Clarifying structure in light of Kitematic
 2015-03-22 19:13:38 -07:00
Casey Bisson
a71d89d041 Merge branch 'master' of github.com:docker/docker into joyentinstall 
Reolved conflict in:
	docs/mkdocs.yml

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
 2015-03-22 18:19:27 -07:00
Mary Anthony
f3b7bf9682 Clarifying structure in light of Kitematic 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-21 18:20:25 -07:00
Casey Bisson
19e3db3503 updated text 
per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
 2015-03-20 14:44:24 -07:00
Casey Bisson
cb2280c98e Merge branch 'master' of github.com:docker/docker into joyentinstall 
Resolved conflict in the following file:
	docs/sources/installation/MAINTAINERS

File was deleted upstream and changed in this branch. Deleting the file in this branch as well.

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
 2015-03-20 14:37:17 -07:00
Ahmet Alp Balkan
72fa3fcaea docs: Add Azure installation instructions 
Adding instructions that refers to the Microsoft Azure
documentation on creating Docker-ready Linux VMs on Azure
platform.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
 2015-03-19 21:28:29 -07:00
Jeffrey Morgan
3ddf5d7517 Adding Kitematic link to Mac OS X install instructions 
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com>
 2015-03-18 16:32:59 -07:00
Mary Anthony
f60ed98e79 # This is a combination of 2 commits. 
# The first commit's message is:

Updating Ubuntu installation to use wget; eliminating elo

Signed-off-by: Mary Anthony <mary.anthony@docker.com>

# This is the 2nd commit message:

Adding in James comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-17 10:15:46 -07:00
Tianon Gravi
200123b317 Add "eval" to every invocation of "boot2docker shellinit" 
See http://unix.stackexchange.com/a/181581 for the rationale behind this change.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
 2015-03-16 18:27:59 -06:00
sapphiredev
4b0744b119 Fix minor typo 
Signed-off-by: sapphiredev <se.imas.kr@gmail.com>
 2015-03-16 19:50:52 +09:00
Sabin Basyal
dba4651760 Update Centos links 
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
 2015-03-13 11:48:09 -07:00
moxiegirl
254b6f8946 Merge pull request #11248 from Finkes/patch-1 
improve Debian installation instructions
 2015-03-11 15:36:01 -07:00
Dominik Finkbeiner
cddb443da4 improve Debian installation instructions 
Signed-off-by: Dominik Finkbeiner <finkes93@gmail.com>
 2015-03-11 20:14:32 +01:00
Arnaud Porterie
89bdaa35e0 Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-06 18:21:51 -08:00
Casey Bisson
c8abc52736 installation on Joyent 
Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
 2015-03-05 12:47:02 -08:00
Sebastiaan van Stijn
1d4b2524ec Fix incorrect https example in mac.md (carry of 11063) 
The document referenced https but was using the http port. I changed the
examples from https to http.

Also, fyi, when I tried accessing https using the correct 443 port, it
did not work. I have not investigated why. Port 80 worked fine.

For me:
jay-mac:.ssh jay$ docker port web
80/tcp -> 0.0.0.0:49153
443/tcp -> 0.0.0.0:49154
jay-mac:.ssh jay$ boot2docker ip
192.168.59.103

works: http://192.168.59.103:49153/
fails: https://192.168.59.103:49154/

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-02-28 22:13:03 +01:00
Sven Dowideit
e500c00d7c Merge pull request #10929 from thaJeztah/docs-optimize-images 
docs: optimize and consolidate images, remove duplicates
 2015-02-24 15:31:00 +10:00
Andrew Kuklewicz
f9bb0afc6c Have docker command use $HOME instead of 'mary' 
Signed-off-by: Andrew Kuklewicz <andrew@beginsinwonder.com>
 2015-02-23 12:37:11 -05:00
Sebastiaan van Stijn
743f0bcc83 docs: optimize and consolidate images, remove duplicates 
This optimizes a number of images and removes a duplicate image.
Also consolidated images in the 'docker-hub' section.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-02-23 12:10:54 +01:00
James Turnbull
74394f03ac Merge pull request #10930 from caryhartline/patch-1 
Fix three spelling mistakes
 2015-02-22 20:28:42 -05:00
sdreyesg
f37351f9e8 Update mac.md 
I just tried this guide. I had to use "docker run hello-world" instead of "docker run"

Signed-off-by: Dario Galvis <sdreyesg@gmail.com>
 2015-02-22 14:51:32 -08:00
Cary
4c7d41ac18 Fix three spelling mistakes 
There are three instances of "boo2docker" that should be changed to "boot2docker".

Signed-off-by: Cary Hartline <varmateo@icloud.com>
 2015-02-22 14:47:39 -06:00
Jessie Frazelle
aa057fd3b3 Merge pull request #10838 from moxiegirl/mac-update 
Adding in updates for Mac for upcoming events
 2015-02-20 13:10:29 -08:00
Mary Anthony
112aa1e341 Fixing spacing after period 2015-02-17 16:10:32 -08:00
Mary Anthony
1b36272dc3 Adding in Fred's comments. 2015-02-17 15:59:29 -08:00
Mary Anthony
abc6896984 Tweaking language 2015-02-17 11:02:25 -08:00
Mary Anthony
0581e8652d Updating per Sven's request for localhost definition 2015-02-17 10:55:19 -08:00
Mary Anthony
d03ce18b0b Adding in updates for Mac for birthday. 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
 2015-02-17 09:58:58 -08:00
Ferenc Szabo
112829434d fix source command for tab-completion 
source /etc/bash_completion.d/docker.io was not working for me, since the file is called docker, not docker.io.

There might be versions with 'io' ending; star is general enough.

Signed-off-by: Ferenc Szabo <pragmaticfrank@gmail.com>
 2015-02-17 16:53:18 +01:00
Arnaud Porterie
f058e9c43c Use gpg keyserver pool 
Make the install script independent from the ubuntu keyserver by using
the sks-keyservers pool instead.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-02-13 09:13:29 -08:00
Sven Dowideit
32c6179f47 updates from review 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-10 11:02:05 +10:00
unclejack
b4089114ef update kernel reqs doc; recommend updates on RHEL 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-02-10 11:02:05 +10:00
Sven Dowideit
c28ea14bbb Merge pull request #10624 from stevekochscience/master 
Add link to user guide to end of 14.04 section
 2015-02-09 14:05:33 +10:00
Steve Koch
823cb12810 Add link to user guide to end of 14.04 section 
Adding instructions to exit the test shell and a link to the user guide (as is done in the following sections for 12.04 and 13.04/10

Signed-off-by: Steven Koch <sjkoch@unm.edu>
 2015-02-06 15:50:51 -07:00
Sven Dowideit
eb814e4e70 Do some major rearranging of the fedora/centos/rhel installation docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-06 19:48:19 +10:00
Lokesh Mandvekar
66839cf3a6 update fedora docs to reflect latest rpm changes 
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
 2015-02-06 19:48:19 +10:00
Sven Dowideit
d5df948829 Add a note that remote and Boot2Docker users should not type sudo 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2015-01-13 21:40:14 -05:00
Sven Dowideit
e23d07a110 Centos project does not support custom kernels - see #9696 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>

Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2015-01-06 23:30:03 -05:00
Sven Dowideit
7a3efc9aa5 Merge pull request #9783 from SvenDowideit/pr_out_debian_wheezy_backports_kernel_updated_to_3_16 
Debian Wheezy backports kernel updated to 3.16
 2014-12-23 11:19:26 +10:00
panticz
973c3c768b Debian Wheezy backports kernel updated to 3.16 
Replaces #9723

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-23 11:14:14 +10:00
Sven Dowideit
197281f585 Merge pull request #9740 from SvenDowideit/pr_out_fixes_as_requested 
Login with PUTTY instead of using the CMD
 2014-12-23 11:11:53 +10:00
Sven Dowideit
db165f7d2c fixes as requested 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
 2014-12-23 11:06:45 +10:00
Krasimir Georgiev
948f33263e Changing the windows installation doc to include instructions how to login 
using putty instead of CMD

Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk>

Docker-DCO-1.1-Signed-off-by: Krasimir Georgiev <support@vip-consult.co.uk> (github: SvenDowideit)
 2014-12-23 11:06:44 +10:00
panticz
491ff81a0b Update Debian version to 7.7 
Replaces #9724

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2014-12-23 10:53:36 +10:00
Fred Lifton
5df189a1b0 Merge pull request #9682 from SvenDowideit/scottstamp-stale-links-pr-carry 
Scottstamp stale links pr carry
 2014-12-17 16:03:55 -08:00
Fred Lifton
d79bc04e7b Merge pull request #9601 from dchen1107/master 
Using container-vm image alias instead of specific name with version.
 2014-12-16 11:01:15 -08:00
Sven Dowideit
fbb9223b1a add Scott's link checker script, and fix what it finds 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2014-12-16 14:46:25 +10:00
Scott Stamp
4e7fb6b1f0 Update debian.md 
Fixed anchor links for Jessie/Wheezy (broken on docs.docker.com)

Update debian.md

Signed-off-by: Scott Stamp <scott@hypermine.com>
 2014-12-16 12:49:53 +10:00
Dawn Chen
0b3caf1f78 Using container-vm image alias instead of specific name with version. 
Signed-off-by: Dawn Chen <dawnchen@google.com>
 2014-12-12 11:28:54 -08:00