Commit graph

3904 commits

Author SHA1 Message Date
Michael Crosby
06f6c0c7e5 Add LXC built in support deprecation notice
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-08-03 14:54:42 -07:00
Alexander Morozov
8505183252 Merge pull request #14950 from ottok/master
Multiple fixes to 'docker stats' output
2015-07-30 14:02:35 -07:00
Josh Hawn
75f6929b44 Fix docker cp Behavior With Symlinks
[pkg/archive] Update archive/copy path handling

  - Remove unused TarOptions.Name field.
  - Add new TarOptions.RebaseNames field.
  - Update some of the logic around path dir/base splitting.
  - Update some of the logic behind archive entry name rebasing.

[api/types] Add LinkTarget field to PathStat

[daemon] Fix stat, archive, extract of symlinks

  These operations *should* resolve symlinks that are in the path but if the
  resource itself is a symlink then it *should not* be resolved. This patch
  puts this logic into a common function `resolvePath` which resolves symlinks
  of the path's dir in scope of the container rootfs but does not resolve the
  final element of the path. Now archive, extract, and stat operations will
  return symlinks if the path is indeed a symlink.

[api/client] Update cp path hanling

[docs/reference/api] Update description of stat

  Add the linkTarget field to the header of the archive endpoint.
  Remove path field.

[integration-cli] Fix/Add cp symlink test cases

  Copying a symlink should do just that: copy the symlink NOT
  copy the target of the symlink. Also, the resulting file from
  the copy should have the name of the symlink NOT the name of
  the target file.

  Copying to a symlink should copy to the symlink target and not
  modify the symlink itself.

Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
2015-07-30 12:14:28 -07:00
Otto Kekäläinen
b619220ce1 Multiple fixes to 'docker stats' output:
* Add space between values in docker stats output for easier parsing

  Old output could not be parsed easily because there were columns
  that did not have any separator. Also values that are together
  without any space is difficult to read even for humans.

* Update unit.HumanSize comment to match what the does actually does

Signed-off-by: Otto Kekäläinen <otto@seravo.fi>
2015-07-30 10:14:57 +03:00
Sven Dowideit
26ff3bd2e9 Merge pull request #15066 from dwcramer/fix-broken-link
[#15027] Fix broken link and edit link text to match section heads
2015-07-30 13:37:29 +10:00
Sven Dowideit
cc45e027f1 Merge pull request #15071 from epc/epc-2015209
Docs: Copy edits for typos
2015-07-30 13:36:23 +10:00
Jessie Frazelle
d7661cb48b Merge pull request #15099 from ewindisch/apparmor-restore-en
Restore AppArmor generation + fixes
2015-07-29 09:36:59 -07:00
Chander G
6cf0e27ee0 Fix minor formatting error in security article docs
Signed-off-by: Chander G <chandergovind@gmail.com>
2015-07-30 01:06:04 +05:30
Mary Anthony
6ca22add18 Docker Toolbox Updates fixes #14561
- Tested Mac/iterated with Jeff on fixes
- Waiting on formal uninstall;manual now
- 4 hour work
- Fixe #14562 converting Windows to Mac
- Found errors in installer need fixes/another iteration
- Updated as far as possible with limited installation
- 3 Hours work
- Entering comments from PR review
- New screen captures and migration material
- Entering Sven's comment
- Testing with powershell, Seb's comments
- Fix link in upgrade
- Minor tweaks to http and typos
- Adding deprecation note

Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-28 18:17:24 -07:00
Eric Windisch
3edc88f76d Restore AppArmor profile generation
Will attempt to load profiles automatically. If loading fails
but the profiles are already loaded, execution will continue.

A hard failure will only occur if Docker cannot load
the profiles *and* they have not already been loaded via
some other means.

Also introduces documentation for AppArmor.

Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-28 17:45:51 -04:00
Sebastiaan van Stijn
bfbac726c7 Merge pull request #15082 from ChanderG/master
Add link to Systemd article in Debian Jessie docs, fix typo
2015-07-28 22:35:48 +02:00
Chander G
b9e6be25d1 Add link to Systemd article, fix typo
Signed-off-by: Chander G <chandergovind@gmail.com>
2015-07-29 01:54:44 +05:30
Kir Kolyshkin
f52514a038 daemon.md: do fix placement of exec driver heading
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.

Now, this is the second time I am fixing this. First time
it was commit 68efb27, but the following commit 9af7afb
screwed it up again, so the header appears twice now.

Get rid of the the wrong one.

Cc: David Calavera <david.calavera@gmail.com>
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
2015-07-28 10:58:17 -07:00
Ed Costello
fb396a71d5 Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
2015-07-28 08:51:01 -04:00
Mary Anthony
1825e06944 Remove references to boot2docker replace with docker-machine
- boot2docker is deprecated in the 1.8.0
- docker-machine replaces it
- this fixes #14563
- Updating with thaJetzah comments

Signed-off-by: Mary Anthony <mary@docker.com>
2015-07-27 18:25:50 -07:00
David Cramer
00f7ced864 [#15027] Fix broken link and edit link text to match section heads
Signed-off-by: David Cramer <davcrame@cisco.com>
2015-07-27 19:12:04 -05:00
Sebastiaan van Stijn
e5af7a0e86 Merge pull request #14963 from MHBauer/plugins-links
Fix Plugins links
2015-07-27 23:25:48 +02:00
Sebastiaan van Stijn
967bc13ae6 Merge pull request #15052 from MHBauer/ubuntu-docs
Fix interrupted numbering sequence in ubuntu installation docs
2015-07-27 22:45:51 +02:00
Morgan Bauer
289e0d244b
Fix interrupted numbering sequence in ubuntu installation docs
- increase indent of note to match surrounding text

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-07-27 13:10:29 -07:00
Sebastiaan van Stijn
8492e62306 Merge pull request #15041 from runcom/remove-saucy-from-installation-guide
Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
2015-07-27 21:39:55 +02:00
Antonio Murdaca
1e43ce350d Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-27 19:55:26 +02:00
Jessie Frazelle
db647c3b60 Merge pull request #15031 from liubin/typo/liubin-change-restart-command
Change restarting Docker daemon command in CentOS
2015-07-27 10:54:55 -07:00
Jessie Frazelle
fdb932fa17 Merge pull request #14560 from bkeyoumarsi/volume-plugin-doc-fix
Updated volume-driver plugin api docs
2015-07-27 10:39:15 -07:00
Jessie Frazelle
f3af9c8bdb Merge pull request #14735 from charleswhchan/patch-1
Minor edits to Environment variables section
2015-07-27 10:37:39 -07:00
Jessie Frazelle
912bafcf36 Merge pull request #14981 from calavera/bump_api_version
Bump api version to 1.21.
2015-07-27 10:17:24 -07:00
Jessie Frazelle
f0f753d70a Merge pull request #14988 from ChanderG/master
Fix minor typo in Debian installation docs
2015-07-27 09:51:58 -07:00
David Calavera
0eb88a0751 Bump api version to 1.21.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-27 09:48:47 -07:00
moxiegirl
6c0c6b120a Merge pull request #15007 from cles/arch-systemd-network-issue
Add arch install docs warning about systemd-network
2015-07-27 09:22:01 -07:00
moxiegirl
a65f7acbbf Merge pull request #14987 from vdemeester/fix-cli-import-docs
Add missing documentation to cli/import.md
2015-07-27 09:19:57 -07:00
bin liu
aa5fc634f1 Change restarting Docker daemon command in CentOS
Signed-off-by: bin liu <liubin0329@gmail.com>
2015-07-27 23:30:06 +08:00
Bardia Keyoumarsi
cc997a7f44 Updated volume-driver plugin api docs
There was a mistake in the plugin_volume.md file regarding the /VolumeDriver.Remove call.

Added fix and a better explanation.

Signed-off-by: Bardia Keyoumarsi <b.keyoumarsi@gmail.com>
2015-07-26 21:02:42 -07:00
Morgan Bauer
c2cf349bcd
Fix Plugins links
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-07-26 18:28:25 -07:00
Oriol Francès
26fa9b0d0d much improved wording for manual network config setup on arch install docs by @moxiegirl
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
2015-07-26 19:11:27 +02:00
Vincent Demeester
3101941120 Add missing documentation to cli/import.md
PR #11907 added support for import using file (path), but it missed
the update of cli/import.md. This fixes that.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-26 18:39:42 +02:00
John Tims
7b552c7a37 Fix typo
Signed-off-by: John Tims <john.k.tims@gmail.com>
2015-07-26 10:53:07 -04:00
Oriol Francès
e1b57b2a87 Change of wording, rearrange section ordering
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
2015-07-26 13:27:35 +02:00
Oriol Francès
6bd15a68cf Add arch install docs warning about systemd-network
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
2015-07-26 13:27:07 +02:00
Sebastiaan van Stijn
5297a25b4e Merge pull request #15004 from charleswhchan/patch-2
Update faq.md
2015-07-26 13:03:45 +02:00
Michał Czeraszkiewicz
09a9958e22 Fix typo in JSON config example, in the CLI documetation
Signed-off-by: Michał Czeraszkiewicz <czerasz.hosting@gmail.com>
2015-07-26 12:09:31 +02:00
Charles Chan
c6816dfc67 Update faq.md
Fix case for PostgreSQL.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-07-25 22:03:20 -07:00
Chander G
ceeb22dc6e Fix minor typo in Debian installation docs
Signed-off-by: Chander G <chandergovind@gmail.com>
2015-07-26 03:49:18 +05:30
Arnaud Porterie
4f5b677fd9 Merge pull request #14546 from dmcgowan/trusted-notary-integration
Notary integration
2015-07-24 17:44:14 -07:00
Derek McGowan
259cadb0b1 Rename to flags and environment variables to content trust
Update help line to allow 90 characters instead of 80

The trust flag pushes out the help description column wider, requiring more room to display help messages.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-24 16:31:18 -07:00
Sebastiaan van Stijn
86c7ea4863 Merge pull request #14637 from metalivedev/patch-1
Document that load supports compressed tarballs.
2015-07-24 23:38:43 +02:00
Sebastiaan van Stijn
d951ef128f Merge pull request #14522 from carlossg/patch-1
Clarify filters option in list containers doc
2015-07-24 23:13:32 +02:00
moxiegirl
2b847df8c2 Merge pull request #14939 from rtrauntvein/docs-autobuild
Fix broken link in automated build doc
2015-07-24 13:48:14 -07:00
Sebastiaan van Stijn
f32295eda6 Merge pull request #14877 from calavera/deprecate_docker_d
Add -d to the deprecated feature list for 1.8.
2015-07-24 17:44:23 +02:00
Charles Chan
42263dafcf Minor edits to Environment variables section
* Clarify the list of supported instructions.
* Clarify behavior of ONBUILD, based on comments by @SvenDowideit, @theJeztah in PR #14735.
* Reorder list of instructions in alphabetical order.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-07-24 06:38:55 -07:00
Carlos Sanchez
1fb29e6c3c Clarify filters option in list containers and list images docs
Based on the list containers with filters options it would seem that filtering containers with label `test=docker-java` could be done with `{"test":["docker-java"]}` which doesn't work

The options that work are `{"label":["test"]}` and `{"label":["test=docker-java"]}`

As seen in https://github.com/docker-java/docker-java/pull/262

Signed-off-by: Carlos Sanchez <carlos@apache.org>
2015-07-24 11:57:18 +02:00
Nathan McCauley
48250832a3 Add cmdline docs for signing and verification flows
Signed-off-by: Nathan McCauley <nathan.mccauley@docker.com>
2015-07-24 01:31:50 -07:00