docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-22 03:22:01 +03:00
Code Activity
14,222 Commits 12 Branches 297 Tags
e69b047ff4573adb4e68f296566a6fecf7007e21
Commit Graph

426 Commits

Author SHA1 Message Date
Xinzi Zhou
f7a30f1c84 Add missing newline for bash code example 
Signed-off-by: Zhou Xinzi <imdreamrunner@gmail.com>
Upstream-commit: ed7907a988fe336711603e38c8b79d673e87c902
Component: engine
 2015-03-26 01:24:00 +08:00
moxiegirl
0485dd2e93 Merge pull request #11550 from moxiegirl/adjust-mac-install 
Clarifying structure in light of Kitematic
Upstream-commit: 0926a023d65ae7d5cb528d205a4e1fe32b47c3e4
Component: engine
 2015-03-22 19:13:38 -07:00
Casey Bisson
7cd85af5c7 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>
Upstream-commit: a71d89d041d7853698c84ccf233f477383a9dcb3
Component: engine
 2015-03-22 18:19:27 -07:00
Mary Anthony
d2583ecaca Clarifying structure in light of Kitematic 
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: f3b7bf9682c10cdd6dfbdca79080790d7411c1b7
Component: engine
 2015-03-21 18:20:25 -07:00
Casey Bisson
7772935737 updated text 
per recommendations in https://github.com/docker/docker/pull/11062#issuecomment-82435939

Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: 19e3db35039ae80409623266906093b2314bd970
Component: engine
 2015-03-20 14:44:24 -07:00
Casey Bisson
f8785b1704 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>
Upstream-commit: cb2280c98e3a2aa389b64adcafb30a446e2b6d24
Component: engine
 2015-03-20 14:37:17 -07:00
Ahmet Alp Balkan
40e97918dc 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>
Upstream-commit: 72fa3fcaeacfcfebdad463d965ff1d6a3e95d516
Component: engine
 2015-03-19 21:28:29 -07:00
Jeffrey Morgan
545bbe667a Adding Kitematic link to Mac OS X install instructions 
Signed-off-by: Jeffrey Morgan <jeff@kitematic.com>
Upstream-commit: 3ddf5d75179f529356f19acb77e46e97388d4490
Component: engine
 2015-03-18 16:32:59 -07:00
Mary Anthony
cf394b41e4 # 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>
Upstream-commit: f60ed98e79fbc91e7aa280769c62c5a59c7eba00
Component: engine
 2015-03-17 10:15:46 -07:00
Tianon Gravi
1211b3d022 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>
Upstream-commit: 200123b317cd1bad052d3c503278d03d712e4812
Component: engine
 2015-03-16 18:27:59 -06:00
sapphiredev
914df48348 Fix minor typo 
Signed-off-by: sapphiredev <se.imas.kr@gmail.com>
Upstream-commit: 4b0744b1191622722c0cd24e9b4d46286e5e9c79
Component: engine
 2015-03-16 19:50:52 +09:00
Sabin Basyal
0d2843f030 Update Centos links 
Signed-off-by: Sabin Basyal <sabin.basyal@gmail.com>
Upstream-commit: dba4651760d3ba41ea94cb9ab55abcd91cce1229
Component: engine
 2015-03-13 11:48:09 -07:00
moxiegirl
69e2749ca8 Merge pull request #11248 from Finkes/patch-1 
improve Debian installation instructions
Upstream-commit: 254b6f8946dd7cceaa32d5e1da981287ace5f0f5
Component: engine
 2015-03-11 15:36:01 -07:00
Dominik Finkbeiner
1d54ba03b3 improve Debian installation instructions 
Signed-off-by: Dominik Finkbeiner <finkes93@gmail.com>
Upstream-commit: cddb443da428c0b9c9f4f5910a36f478110db224
Component: engine
 2015-03-11 20:14:32 +01:00
Arnaud Porterie
5506a9a27c Remove subdirectories MAINTAINERS files 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 89bdaa35e04b74b7c6528783e0f7b8154b2a3d31
Component: engine
 2015-03-06 18:21:51 -08:00
Casey Bisson
f60dda8d4d installation on Joyent 
Signed-off-by: Casey Bisson <casey.bisson@joyent.com>
Upstream-commit: c8abc52736ae1e3898b2512e4efe2553110eb481
Component: engine
 2015-03-05 12:47:02 -08:00
Sebastiaan van Stijn
b10d9ac0eb 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>
Upstream-commit: 1d4b2524ec080a19f47292020a7fb6a9a00c8932
Component: engine
 2015-02-28 22:13:03 +01:00
Sven Dowideit
61ee3dd26f Merge pull request #10929 from thaJeztah/docs-optimize-images 
docs: optimize and consolidate images, remove duplicates
Upstream-commit: e500c00d7cd855c02f390d1f9d55b668cc191854
Component: engine
 2015-02-24 15:31:00 +10:00
Andrew Kuklewicz
27d91a55a2 Have docker command use $HOME instead of 'mary' 
Signed-off-by: Andrew Kuklewicz <andrew@beginsinwonder.com>
Upstream-commit: f9bb0afc6c37ea5b6f2d413474c5dcbdd84259f1
Component: engine
 2015-02-23 12:37:11 -05:00
Sebastiaan van Stijn
b907fd6bb4 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>
Upstream-commit: 743f0bcc83b0b1b8ccc1980300e96a9003b5cd0f
Component: engine
 2015-02-23 12:10:54 +01:00
James Turnbull
cd135d371f Merge pull request #10930 from caryhartline/patch-1 
Fix three spelling mistakes
Upstream-commit: 74394f03ac422fe79c049f37c469fdceac078ff7
Component: engine
 2015-02-22 20:28:42 -05:00
sdreyesg
95592a5ea0 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>
Upstream-commit: f37351f9e88e077b2a1b219cd412e781ebb2ef9c
Component: engine
 2015-02-22 14:51:32 -08:00
Cary
2e2ad7fccb Fix three spelling mistakes 
There are three instances of "boo2docker" that should be changed to "boot2docker".

Signed-off-by: Cary Hartline <varmateo@icloud.com>
Upstream-commit: 4c7d41ac180bba52bf567515bf9f033ecfa70de7
Component: engine
 2015-02-22 14:47:39 -06:00
Jessie Frazelle
190cc5a491 Merge pull request #10838 from moxiegirl/mac-update 
Adding in updates for Mac for upcoming events
Upstream-commit: aa057fd3b3f3a2817f01f834482c396cf08ce53d
Component: engine
 2015-02-20 13:10:29 -08:00
Mary Anthony
03bd05f3c6 Fixing spacing after period 
Upstream-commit: 112aa1e341e4c9392b27a3752d276671c0376f38
Component: engine
 2015-02-17 16:10:32 -08:00
Mary Anthony
73618648ff Adding in Fred's comments. 
Upstream-commit: 1b36272dc30659e528e0dd7028e69b48fec3cdde
Component: engine
 2015-02-17 15:59:29 -08:00
Mary Anthony
e83b1f8cc3 Tweaking language 
Upstream-commit: abc6896984cfa1ac4ab39a4a683038eaa10dee5d
Component: engine
 2015-02-17 11:02:25 -08:00
Mary Anthony
bfa857605b Updating per Sven's request for localhost definition 
Upstream-commit: 0581e8652dd0debb235864eac46986ff3625e8af
Component: engine
 2015-02-17 10:55:19 -08:00
Mary Anthony
868d3c6f92 Adding in updates for Mac for birthday. 
Signed-off-by: Mary Anthony <mary.anthony@docker.com>
Upstream-commit: d03ce18b0bfaa5abaaac10b5bfb4a8d92683c0b3
Component: engine
 2015-02-17 09:58:58 -08:00
Ferenc Szabo
5fc38e9a3e 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>
Upstream-commit: 112829434d5aa517a00d89c3b476233fa277eb94
Component: engine
 2015-02-17 16:53:18 +01:00
Arnaud Porterie
da0bb2cbb5 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>
Upstream-commit: f058e9c43c8752dedcd4d251ddf105b22d0ed1d5
Component: engine
 2015-02-13 09:13:29 -08:00
Sven Dowideit
48d21d06a2 updates from review 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 32c6179f475183ba778cb90656a971cde81340dc
Component: engine
 2015-02-10 11:02:05 +10:00
unclejack
2fa60db4e0 update kernel reqs doc; recommend updates on RHEL 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: b4089114efe23b18218886ec2085455d463c7179
Component: engine
 2015-02-10 11:02:05 +10:00
Sven Dowideit
ce923ef765 Merge pull request #10624 from stevekochscience/master 
Add link to user guide to end of 14.04 section
Upstream-commit: c28ea14bbb5c16cd69aee384d5261f6a53581741
Component: engine
 2015-02-09 14:05:33 +10:00
Steve Koch
72669b3feb 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>
Upstream-commit: 823cb1281060981a537b4d36315bf0a02074b2a2
Component: engine
 2015-02-06 15:50:51 -07:00
Sven Dowideit
20a29795dd Do some major rearranging of the fedora/centos/rhel installation docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: eb814e4e703b4676e0cb410052d1145ee9f8628e
Component: engine
 2015-02-06 19:48:19 +10:00
Lokesh Mandvekar
f31f8c4059 update fedora docs to reflect latest rpm changes 
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Upstream-commit: 66839cf3a6718f844e71d2561cc706c95f5629ec
Component: engine
 2015-02-06 19:48:19 +10:00
Sven Dowideit
bafbcb6583 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)
Upstream-commit: d5df948829bfd6e12dc2c0ca3228b583386b6e87
Component: engine
 2015-01-13 21:40:14 -05:00
Sven Dowideit
5b87d47ac2 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)
Upstream-commit: e23d07a110fcf615bf36defd76e7be06cd7e80df
Component: engine
 2015-01-06 23:30:03 -05:00
Sven Dowideit
50e537246c Merge pull request #9783 from SvenDowideit/pr_out_debian_wheezy_backports_kernel_updated_to_3_16 
Debian Wheezy backports kernel updated to 3.16
Upstream-commit: 7a3efc9aa5441285c85724e360811abf6146c464
Component: engine
 2014-12-23 11:19:26 +10:00
panticz
147e9f2038 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>
Upstream-commit: 973c3c768be19b80543631ad9515fe05b95b2d22
Component: engine
 2014-12-23 11:14:14 +10:00
Sven Dowideit
af134040ea Merge pull request #9740 from SvenDowideit/pr_out_fixes_as_requested 
Login with PUTTY instead of using the CMD
Upstream-commit: 197281f5858a90f7fdf8418e19b362fa57a052f3
Component: engine
 2014-12-23 11:11:53 +10:00
Sven Dowideit
892e46c364 fixes as requested 
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: db165f7d2c3e05bbd7bac8c1188145370c7b1171
Component: engine
 2014-12-23 11:06:45 +10:00
Krasimir Georgiev
4725a40462 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)
Upstream-commit: 948f33263e95997a9c6596d695c92ab03c630899
Component: engine
 2014-12-23 11:06:44 +10:00
panticz
fab564562c Update Debian version to 7.7 
Replaces #9724

fix by: panticz <mail@konczalski.de> (github: panticz)
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
Upstream-commit: 491ff81a0b6653d75b2bc4ca81251d7bf5ee9f3f
Component: engine
 2014-12-23 10:53:36 +10:00
Fred Lifton
f644595194 Merge pull request #9682 from SvenDowideit/scottstamp-stale-links-pr-carry 
Scottstamp stale links pr carry
Upstream-commit: 5df189a1b0b63d66f1478e12e4e738e2378f26b0
Component: engine
 2014-12-17 16:03:55 -08:00
Fred Lifton
d2d0349752 Merge pull request #9601 from dchen1107/master 
Using container-vm image alias instead of specific name with version.
Upstream-commit: d79bc04e7bd728ed3ca4bffc463235bb2980670d
Component: engine
 2014-12-16 11:01:15 -08:00
Sven Dowideit
912c56d931 add Scott's link checker script, and fix what it finds 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: fbb9223b1adc16834768acaa7a5776697825deb2
Component: engine
 2014-12-16 14:46:25 +10:00
Scott Stamp
dcaedcf606 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>
Upstream-commit: 4e7fb6b1f03173b0fbc41c18c9e9857b5708974a
Component: engine
 2014-12-16 12:49:53 +10:00
Dawn Chen
00d7210a86 Using container-vm image alias instead of specific name with version. 
Signed-off-by: Dawn Chen <dawnchen@google.com>
Upstream-commit: 0b3caf1f78c167239d7879d3bfd0d0d95a48a3d7
Component: engine
 2014-12-12 11:28:54 -08:00