Commit Graph

3910 Commits

Author SHA1 Message Date
091a1141be Update docker_remote_api.md
Minor fixes:
* v1.19: GET /containers/(id)/logs - add missing '/'
* v1.18: Break up POST /containers/create and POST /containers/(id)/start into separate lines.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 084d46408160cf309bb7730a0ccb7fdd2f71c84e
Component: engine
2015-08-02 10:11:18 -07:00
3022ea2e8f Merge pull request #14539 from nhocki/improve-docs-for-execstart
Adding information about ExecStart configuration for systemd
Upstream-commit: 7feb176233f2cc86f249de8aa4c2e98095e8d324
Component: engine
2015-08-01 09:23:59 -07:00
7eec334052 Adding information about ExecStart configuration for systemsd
Closes #14491

Signed-off-by: Nicolás Hock Isaza <nhocki@gmail.com>
Upstream-commit: 6b44c05205a89e3208cd3a962d06641c7d52e512
Component: engine
2015-07-31 21:28:30 -05:00
66c7ee5c73 Merge pull request #14960 from MHBauer/faq-links
Fix FAQ links 
Upstream-commit: bb2039c9259581a1b445df584b53597f83bd1d91
Component: engine
2015-08-01 00:05:53 +02:00
712ef17493 Docker stats: display Block IO stats
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 6a4ac63aaac829e94c7d6cbb31a8d36b93757620
Component: engine
2015-07-31 21:26:32 +08:00
0ed74d6e3a Actually link to the information
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
Upstream-commit: d2cd142ce1da96589902d07fddf3a12e63631d78
Component: engine
2015-07-30 21:16:45 -04:00
0c28668f97 Merge pull request #14950 from ottok/master
Multiple fixes to 'docker stats' output
Upstream-commit: 85051832522ca217401d6eb4ddda1b1a7fdce9ad
Component: engine
2015-07-30 14:02:35 -07:00
0a7e55f30a 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)
Upstream-commit: 75f6929b449a59335572436862d644afacf55cdb
Component: engine
2015-07-30 12:14:28 -07:00
1f4838511c Fix FAQ links
- don't use relative references '..'
 - registry-index-spec became hub-registry-spec
 - reference new 'glossary' instead of old 'terms'

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 3754ad573754b8e1794217ebff9a7e1c656c8c2d
Component: engine
2015-07-30 11:46:39 -07:00
eaafbe08a2 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>
Upstream-commit: b619220ce11770ffaea068b54d3975c74f7c24f9
Component: engine
2015-07-30 10:14:57 +03:00
d28ea90e30 Merge pull request #15066 from dwcramer/fix-broken-link
[#15027] Fix broken link and edit link text to match section heads
Upstream-commit: 26ff3bd2e92ab561f297f7fb84eb8ee7898907d8
Component: engine
2015-07-30 13:37:29 +10:00
b35bdd7bb1 Merge pull request #15071 from epc/epc-2015209
Docs: Copy edits for typos
Upstream-commit: cc45e027f1a91f9b033d501aff3d2a6024ecb904
Component: engine
2015-07-30 13:36:23 +10:00
7b7157591c Merge pull request #15099 from ewindisch/apparmor-restore-en
Restore AppArmor generation + fixes
Upstream-commit: d7661cb48b93978b4b30d2c60f3201d685af7f95
Component: engine
2015-07-29 09:36:59 -07:00
30d606b70d Fix minor formatting error in security article docs
Signed-off-by: Chander G <chandergovind@gmail.com>
Upstream-commit: 6cf0e27ee0400654addcb8e9eac963dc71846dd5
Component: engine
2015-07-30 01:06:04 +05:30
31bfebec11 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>
Upstream-commit: 6ca22add1845ca87ba9a3ec0c319a70f981545b2
Component: engine
2015-07-28 18:17:24 -07:00
e9b83a5a26 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>
Upstream-commit: 3edc88f76df6a3bc9d887de8157ec71730c9057a
Component: engine
2015-07-28 17:45:51 -04:00
2d57408e26 Merge pull request #15082 from ChanderG/master
Add link to Systemd article in Debian Jessie docs, fix typo
Upstream-commit: bfbac726c774a3a9cf308555aa01b96e7129bf1f
Component: engine
2015-07-28 22:35:48 +02:00
153ab403d4 Add link to Systemd article, fix typo
Signed-off-by: Chander G <chandergovind@gmail.com>
Upstream-commit: b9e6be25d1afbf04a3455ff55394bd9037238b2c
Component: engine
2015-07-29 01:54:44 +05:30
48c1e253ec 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>
Upstream-commit: f52514a03888441a51aac677054958516b2ae43f
Component: engine
2015-07-28 10:58:17 -07:00
9afedf1bd9 Copy edits for typos
Signed-off-by: Ed Costello <epc@epcostello.com>
Upstream-commit: fb396a71d571585c2622faeb3b70c6105d86947f
Component: engine
2015-07-28 08:51:01 -04:00
06f659e1d1 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>
Upstream-commit: 1825e06944db20ec677aa8d26b36e9036b0dd257
Component: engine
2015-07-27 18:25:50 -07:00
c613c1b932 [#15027] Fix broken link and edit link text to match section heads
Signed-off-by: David Cramer <davcrame@cisco.com>
Upstream-commit: 00f7ced864be4440a100dad5b0726e36a52ac4e5
Component: engine
2015-07-27 19:12:04 -05:00
ddd991a6be Merge pull request #14963 from MHBauer/plugins-links
Fix Plugins links
Upstream-commit: e5af7a0e869c0a66f8ab30d3a90280843b9999e0
Component: engine
2015-07-27 23:25:48 +02:00
26a080a43f Merge pull request #15052 from MHBauer/ubuntu-docs
Fix interrupted numbering sequence in ubuntu installation docs
Upstream-commit: 967bc13ae68939c616033710f7695993aa4f5208
Component: engine
2015-07-27 22:45:51 +02:00
9b82ceb5e0 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>
Upstream-commit: 289e0d244bcbf98c064ce80dcad1a1985974a068
Component: engine
2015-07-27 13:10:29 -07:00
1afac43bc7 Merge pull request #15041 from runcom/remove-saucy-from-installation-guide
Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
Upstream-commit: 8492e62306166fa8d79ecf6eb95186933bbeaa09
Component: engine
2015-07-27 21:39:55 +02:00
c72e1b691a Remove Ubuntu Saucy 13.10 from Ubuntu installation guide
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 1e43ce350d0715c0316294a2b4cc03f18213c631
Component: engine
2015-07-27 19:55:26 +02:00
0579fb2aaa Merge pull request #15031 from liubin/typo/liubin-change-restart-command
Change restarting Docker daemon command in CentOS
Upstream-commit: db647c3b603ed6cd4a792473ab6e88304d38a07a
Component: engine
2015-07-27 10:54:55 -07:00
2203799750 Merge pull request #14560 from bkeyoumarsi/volume-plugin-doc-fix
Updated volume-driver plugin api docs
Upstream-commit: fdb932fa17f4af2d54d3ceecc753e841242f8b1c
Component: engine
2015-07-27 10:39:15 -07:00
4f0e936463 Merge pull request #14735 from charleswhchan/patch-1
Minor edits to Environment variables section
Upstream-commit: f3af9c8bdb68e5db7aaed7aec11aa2a78fd7e546
Component: engine
2015-07-27 10:37:39 -07:00
9093f9669d Merge pull request #14981 from calavera/bump_api_version
Bump api version to 1.21.
Upstream-commit: 912bafcf3636ce1de242177a144c727e965b97be
Component: engine
2015-07-27 10:17:24 -07:00
56f08785e1 Merge pull request #14988 from ChanderG/master
Fix minor typo in Debian installation docs
Upstream-commit: f0f753d70aee870a1d5b2c5638b1ead108353100
Component: engine
2015-07-27 09:51:58 -07:00
a4c7971630 Bump api version to 1.21.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 0eb88a0751365050cb177e16196622fd1d322efc
Component: engine
2015-07-27 09:48:47 -07:00
d4728ca93c Merge pull request #15007 from cles/arch-systemd-network-issue
Add arch install docs warning about systemd-network
Upstream-commit: 6c0c6b120ac4ea05301b584c3b84f7e875f542e6
Component: engine
2015-07-27 09:22:01 -07:00
264f05bb5c Merge pull request #14987 from vdemeester/fix-cli-import-docs
Add missing documentation to cli/import.md
Upstream-commit: a65f7acbbf5e543c9389ff0497eb966fefc00f1d
Component: engine
2015-07-27 09:19:57 -07:00
9ae5c1b997 Change restarting Docker daemon command in CentOS
Signed-off-by: bin liu <liubin0329@gmail.com>
Upstream-commit: aa5fc634f1d508eeb398977d7723f0255664ff78
Component: engine
2015-07-27 23:30:06 +08:00
736dba388d 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>
Upstream-commit: cc997a7f44f36e9f663afbb4af7e790586f1fc7a
Component: engine
2015-07-26 21:02:42 -07:00
6423dac6de Fix Plugins links
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: c2cf349bcd3a32a01da6db83700613fc9c10e12a
Component: engine
2015-07-26 18:28:25 -07:00
b39a60e323 much improved wording for manual network config setup on arch install docs by @moxiegirl
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
Upstream-commit: 26fa9b0d0d23700ba87aba7862fcf2baa5c26f1e
Component: engine
2015-07-26 19:11:27 +02:00
1e7a75140d 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>
Upstream-commit: 3101941120db54dde89933d76d3ea23c4bde0f7c
Component: engine
2015-07-26 18:39:42 +02:00
624235bebb Fix typo
Signed-off-by: John Tims <john.k.tims@gmail.com>
Upstream-commit: 7b552c7a3782d2cb8270c5c3ca05d7b34b1ea407
Component: engine
2015-07-26 10:53:07 -04:00
0560ee0b45 Change of wording, rearrange section ordering
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
Upstream-commit: e1b57b2a87a763fc9fac5fbd59f64dcf1e541e7e
Component: engine
2015-07-26 13:27:35 +02:00
a41b93c9fb Add arch install docs warning about systemd-network
Signed-off-by: Oriol Francès <oriolfa@gmail.com>
Upstream-commit: 6bd15a68cf59043e05bd69fccbafcfed25d7c22e
Component: engine
2015-07-26 13:27:07 +02:00
29208c0bdb Merge pull request #15004 from charleswhchan/patch-2
Update faq.md
Upstream-commit: 5297a25b4eabb0bd6b76a09ea8f63d3e18329243
Component: engine
2015-07-26 13:03:45 +02:00
10ca606a3c Fix typo in JSON config example, in the CLI documetation
Signed-off-by: Michał Czeraszkiewicz <czerasz.hosting@gmail.com>
Upstream-commit: 09a9958e22640e1bcfec1c0c274a8c42ebc88b4a
Component: engine
2015-07-26 12:09:31 +02:00
6591e5b614 Update faq.md
Fix case for PostgreSQL.

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: c6816dfc677a639361320274760d956eea200a29
Component: engine
2015-07-25 22:03:20 -07:00
a56deec7d3 Fix minor typo in Debian installation docs
Signed-off-by: Chander G <chandergovind@gmail.com>
Upstream-commit: ceeb22dc6e341da413926a5f972d54f5a3ca8715
Component: engine
2015-07-26 03:49:18 +05:30
4f2862dc8f Merge pull request #14546 from dmcgowan/trusted-notary-integration
Notary integration
Upstream-commit: 4f5b677fd9808b34382061c458e13d3930516889
Component: engine
2015-07-24 17:44:14 -07:00
99a373ceb8 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)
Upstream-commit: 259cadb0b19a9049302e78fec529b0105efabb1d
Component: engine
2015-07-24 16:31:18 -07:00
674470f5c3 Merge pull request #14637 from metalivedev/patch-1
Document that load supports compressed tarballs.
Upstream-commit: 86c7ea48632fd86c692ef763d2113b0971325797
Component: engine
2015-07-24 23:38:43 +02:00