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

3220 commits

Author SHA1 Message Date
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
Phil Estes
d2cb3af75b Merge pull request #11481 from jfrazelle/perms-on-release 
cleanup docs/release.sh
 2015-03-20 10:57:43 -04:00
Jessica Frazelle
844c0f154a change perms on release and cleanup docs 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-19 21:07:02 -07:00
Jessie Frazelle
f574262ff7 Merge pull request #11470 from albers/events-filter-name 
Remove 'name' filter from docker events documentation
 2015-03-19 16:22:30 -07:00
Jessie Frazelle
0d3da36a5f Merge pull request #11479 from falmp/patch-1 
Fixed --read-only description indentation
 2015-03-19 16:22:08 -07:00
Jessie Frazelle
fcc87c0df0 Merge pull request #11498 from jbnunn/patch-1 
Typo/grammar corrections to dockerizing.md
 2015-03-19 16:21:29 -07:00
Michael Crosby
455a272aef Merge pull request #11428 from vishh/parent-cgroup 
Adding '--cgroup-parent' option.
 2015-03-19 14:41:57 -07:00
J. Nunn
a8faba021c Typo/grammar corrections to dockerizing.md 
Added commas where necessary, edited typos to improve readability.

Signed-off-by: J. Nunn <jeffnunn@amazon.com>
 2015-03-19 10:51:12 -05:00
falmp
b311066d24 Fixed --read-only description indentation 
The wrong indentation was breaking documentation layout with code blocks.

Signed-off-by: Francisco Lopes <chico.lopes@gmail.com>
 2015-03-19 11:53:50 -03:00
Harald Albers
ec7530afde Remove 'name' filter from docker events documentation 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-03-19 08:51:36 +01:00
James Turnbull
33bec0a7f6 Merge pull request #11028 from jstangroome/patch-1 
Correct IP/MAC address generation docs
 2015-03-19 01:44:43 -04:00
Vishnu Kannan
c7267017e9 Adding integration tests for --cgroup-parent feature. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-19 02:34:42 +00:00
Vishnu Kannan
f7dd1333b5 Adding documentation for '--cgroup-parent' option. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-19 02:34:15 +00:00
Doug Davis
2cde817458 Merge pull request #11410 from cpuguy83/10191_build_resources 
Allow setting resource constraints for build
 2015-03-18 21:44:21 -04:00
Brian Goff
e6ae89a45a Allow setting resource constrains for build 
Closes #10191

Allow `docker build` to set --cpu-shares, --cpuset, --memory,
--memory-swap for all containers created by the build.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-03-18 20:57:13 -04:00
moxiegirl
068d343ddf Merge pull request #11452 from jeffdm/master 
Adding Kitematic link to Mac OS X install instructions in docs
 2015-03-18 17:32:48 -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
Jessie Frazelle
42f5c87425 Merge pull request #11328 from jfrazelle/fix-docs-release-script 
Fix clear cache docs release.
 2015-03-18 16:06:27 -07:00
Tibor Vass
8ec4e69839 Merge pull request #11430 from jfrazelle/export_outputflag 
Modified `docker export` to allow an --output flag
 2015-03-18 19:04:43 -04:00
moxiegirl
50bf3cbedc Merge pull request #11305 from moxiegirl/HOSTPATH-text-11144 
Clarify behavior of docker cp
 2015-03-18 08:46:52 -07:00
Sebastiaan van Stijn
4e6a01023b cleanup: docs: remove temporary inline styles 
Some inline `<style>` tags were temporarily added to the documentation
because the documentation-stylesheets where not yet updated to the
latest version (see https://github.com/docker/docker/pull/11231 and
https://github.com/docker/docker/pull/11229#issuecomment-77698868).

This removes those temporary `<style>` tags.

depends on #11230 (https://github.com/docker/docker/issues/11230)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-03-17 22:48:28 +01: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
Mary Anthony
241579a34f Fixing it back 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-17 10:07:09 -07:00
moxiegirl
2ab105e9fe Merge pull request #11433 from moxiegirl/pick-up-tweaks-9882 
Return of the Ring: Metadata Labels Doc Tweaks
 2015-03-17 09:47:36 -07:00
Arnaud Porterie
1ff5a91007 Merge pull request #10568 from LK4D4/logging_drivers 
Logging drivers
 2015-03-17 09:45:58 -07:00
Andy Goldstein
a2b0c9778f Add ability to refer to image by name + digest 
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
 2015-03-17 10:10:42 +00:00
Joseph Kern
5ff122f797 Modified docker export to allow an --output flag 
Copied code from CmdSave into CmdExport. This should work, not an expert in the API calls being made. But it does make more sense to have a consistent export/save flag.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added an --output flag to docker export and created tests.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Docker-DCO-1.1-Signed-off-by: Joseph Kern <jkern@semafour.net> (github: jfrazelle)

checkpoint before edits on the export functions

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

White space cleanup.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added text to reflect a new output option for the export command.

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Whitespace clean up

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>

Added man page documentation for the new --output flag in export

Signed-off-by: Joseph Kern <joseph.a.kern@gmail.com>
 2015-03-17 00:20:19 -07:00
Mary Anthony
6ddfe883dd Updating with Sven's comments and other tweaks 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-16 21:49:33 -07:00
Arnaud Porterie
b6ac111abf Merge pull request #9882 from ibuildthecloud/labels 
Proposal: One Meta Data to Rule Them All => Labels
 2015-03-16 20:20:05 -07:00
James Turnbull
97a5c584b3 Merge pull request #11429 from tianon/eval-shellinit 
Add "eval" to every invocation of "boot2docker shellinit"
 2015-03-16 21:19:50 -04:00
Jessie Frazelle
da24ba42e2 Merge pull request #11239 from thaJeztah/docs-tables-in-run-reference 
docs: use more tables in run reference and minor fixups
 2015-03-16 18:02:42 -07:00
Michael Crosby
e6b18cb66d Merge pull request #11210 from xuhdev/patch-1 
Update doc: "docker create" must specify a command
 2015-03-16 17:43:17 -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
Jessie Frazelle
f4f10cf43b Merge pull request #11203 from rhatdan/Dockerfile 
We had some testers who found a hard to diagnose bug in Dockerfile
 2015-03-16 17:26:18 -07:00
Jessie Frazelle
44e9715e46 Merge pull request #10723 from SvenDowideit/takeover-10653 
Update sample systemd for container
 2015-03-16 17:18:57 -07:00
Jessie Frazelle
c7f5ee9d69 Merge pull request #10816 from SvenDowideit/docker-build-return-code 
Add some information about the docker build return code
 2015-03-16 17:18:26 -07:00
Darren Shepherd
fae92d5f0a Documentation changes for labels 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-03-16 17:08:40 -07:00
Tibor Vass
085054db9d Merge pull request #10591 from duglin/ErrUnknownCmd 
Generate an error on unknown Dockerfile instruction
 2015-03-16 17:47:28 -04:00
Jessie Frazelle
61e7efeadd Merge pull request #11364 from Mashimiao/update-manpage 
Update docker manpage
 2015-03-16 14:13:27 -07:00
Mary Anthony
9a78ed8f48 Clarify behavior of docker cp 
The STDOUT behavior of cp is not yet released in 1.50 so removed.
Also, tested against 1.5 all other behaviors and extended documentation to match.
Renamed HOSTPATH to HOSTDIR to give a self documenting name.

Adding back in the references to STDOUT
fix the command string
Entering Doug's comment re append and ~/tmp/foo in the glass
Adding in Doug's comments regarding PATHs and missing |-
Updating with James comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-16 12:44:28 -07:00
sapphiredev
4b0744b119 Fix minor typo 
Signed-off-by: sapphiredev <se.imas.kr@gmail.com>
 2015-03-16 19:50:52 +09:00
Sven Dowideit
88924993a2 Merge pull request #11393 from enguerran/patch-1 
Ambiguous example in registry_mirror.md
 2015-03-16 16:21:00 +10:00
Arnaud Porterie
bc7d1d6ef3 Merge pull request #10298 from hqhq/hq_move_resource_to_hostconfig 
move resource options from Config to hostConfig
 2015-03-15 17:30:46 -07:00
Enguerran
0cd857d99f Update registry_mirror.md 
The syntactic coloration is a little bit ambiguous, I suggest this as a fix.

Signed-off-by: Enguerran Colson <engcolson@gmail.com>
 2015-03-15 12:35:43 +01:00
Mary Anthony
dc899c4eaf Adding in minor copy edits 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-03-14 21:31:36 -07:00
James Turnbull
495f5e4998 Merge pull request #11321 from duglin/CmdLineTweak 
Add "Docker" to Reference pull-down for Command Line
 2015-03-14 21:04:25 -06:00
moxiegirl
2830b6fa58 Merge pull request #11297 from moxiegirl/11235-tweak-doc 
Consistency in the restart policy docs
 2015-03-14 19:58:46 -07:00
Doug Davis
8a5b50d65d Generate an error on unknown Dockerfile instruction 
Instead of just printing a warning and going on, this will generate
an error and stop processing.

This used to be part of #10561 but I decided it might need its own
independent discussion/PR as to not derail #10561.

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-03-13 16:08:34 -07:00
James Turnbull
e2ca237aa2 Merge pull request #11345 from x1022as/cli 
Change cli.md to show right `docker rmi` output
 2015-03-13 16:33:03 -06:00
Jessie Frazelle
d2f925fb27 Merge pull request #11373 from tianon/move-hack-scripts-back 
Move scripts back to hack/, leave docs in project/
 2015-03-13 15:26:54 -07:00