Commit Graph

5556 Commits

Author SHA1 Message Date
Nalin Dahyabhai fb0b0e7cfe Make Diff() methods take an optional *DiffOptions
Add an optional *DiffOptions parameter to Diff() methods (which can be
nil), to allow overriding of default behaviors.

At this time, that's just what type of compression is applied, if we
want something other than what was recorded when the diff was applied,
but we can add more later if needed.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-06-16 10:50:08 -04:00
Nalin Dahyabhai 77ad6176a9 Rename CLI from oci-storage to containers-storage
Rename the CLI tool to match the name that we gave the transport that
uses it in containers/image, which affects just about every consumer of
this library.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2017-05-25 15:50:33 -04:00
Dan Walsh 119beac58d Add support for a toml config file
Container Storage is going to be shared by multiple tools.  Therefore
we don't want each one of these tools setting up its own container
storage.  This storage config can be shared between multiple users.
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2017-05-24 15:14:38 -04:00
Nalin Dahyabhai b046fb5a9a Add a Shutdown() method to the Store
Add a method for calling the underlying driver's Cleanup() method,
preferably when it's not going to disrupt another user of the same data
store, and try to give other users of the store a way to notice that the
driver's been cleaned up, so they need to reinitialize things before
continuing to use them.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-10-26 17:04:47 -04:00
Nalin Dahyabhai 321373adb4 Add GetContainerDirectory/GetContainerRunDirectory
Add GetContainerDirectory and GetContainerRunDirectory methods to the
store, for getting the location of a directory in which the caller can
manage data directly.

This breaks the general model of keeping the library's caller from
having to bother with where things are stored once the library is
initialized, but is added so that ocid won't have to manage the
directory in which it's dropping files to be picked up by other
binaries, in particular configuration files that it's leaving for runc.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-09-23 14:24:22 -04:00
Nalin Dahyabhai b1e8a830eb Fix typos in oci-storage(1)
Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-09-20 10:16:28 -04:00
Nalin Dahyabhai c9962555a7 Add some manuals
Add first draft of man pages for the CLI's various subcommands.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-08-24 17:59:34 -04:00
Nalin Dahyabhai ba24f4fa4c Remove more code
Based on a patch by Grant Seltzer <grantseltzer@gmail.com>

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
2016-07-18 17:35:49 -04:00
Sebastiaan van Stijn 9a9fc01af8 Merge pull request #24610 from sfsmithcha/rc4_tutorial_check
update create swarm and add nodes to use the auto-generated join command
2016-07-15 19:09:36 +02:00
Vincent Demeester 80ec9fa284 Merge pull request #24638 from miaoyq/fix-docs-err
Delete  redundant content of 'docs/extend/plugins.md'
2016-07-15 17:04:11 +02:00
Qiang Huang 92dfbc1e2d Fix aufs docs
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-07-15 13:57:38 +08:00
Yanqiang Miao cfe9d2ff1e Delete redundant content of 'docs/extend/plugins.md'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

Update plugins.md

Update plugins.md
2016-07-15 11:26:10 +08:00
Sebastiaan van Stijn 9df2a825ba Merge pull request #24654 from crosbymichael/enable-systemctl
Enable docker.socket and docker.service in fedora install docs
2016-07-15 01:42:31 +02:00
Michael Crosby 6780bdcbad State that docker supports fedora 24
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-14 16:24:21 -07:00
Michael Crosby 7a93a87c1a Enable docker socket and service on fedora
Make sure that the users enable both the socket and service for docker
as part of the default install instructions.  If both are not enabled
docker will not start at boot and restart containers.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-14 16:23:05 -07:00
Charles Smith fec803f779 update create swarm and add nodes to use the auto-generated join command
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-14 11:26:46 -07:00
Anil Madhavapeddy c37da1792d docs: correct the placement constraints `docker service` example
- the constraint expression needs to be quoted
- add an actual redis container to run so the command line works

Signed-off-by: Anil Madhavapeddy <anil@docker.com>
2016-07-14 17:38:37 +01:00
Sebastiaan van Stijn e056b4e370 Merge pull request #24630 from eskaaren/status_409
Status code 409 received when conflicting name when creating container
2016-07-14 15:26:21 +02:00
Eivin Giske Skaaren 5bf46cc436 Status code 409 received when conflicting name when creating container
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
2016-07-14 14:58:43 +02:00
Sebastiaan van Stijn e7e9f753e8 Merge pull request #24628 from vdemeester/service-doc-fixes
Service doc fixes
2016-07-14 11:38:07 +02:00
Vincent Demeester 9c5782280c Merge pull request #24588 from justincormack/nonewprivsdoc
Expand the documentation of "no-new-privileges"
2016-07-14 11:34:33 +02:00
Vincent Demeester cc651bc642
Update service inspect --pretty reference docs
Update the output and fix wrong usage in a tutorial page.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-14 11:23:03 +02:00
Vincent Demeester dbe310eff0
Update service update commandline reference docs
Update with the new remove flags

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-14 11:22:18 +02:00
Aaron Lehmann 6de8fcb2f2 Use spaces, not tabs, to format sample "swarm join" command
Using tabs here seems to cause copy/paste problems in some terminals.
Using spaces is safer.

Fixes #24609

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2016-07-13 19:31:05 -06:00
Tibor Vass 1f74917f60 Merge pull request #24591 from thaJeztah/remove-shorthand-flagz
Remove shorthand flags for "mount", "pretty", and "no-resolve"
2016-07-13 12:51:53 -07:00
Arnaud Porterie ef322a3fbb Merge pull request #24516 from crosbymichael/oom-score
Add --oom-score-adjust to daemon
2016-07-13 18:39:30 +00:00
Vincent Demeester 1dbe3f6e89 Merge pull request #24565 from thaJeztah/fix-node-inspect-formatting
docs: fix output of node inspect
2016-07-13 18:57:05 +02:00
Sebastiaan van Stijn 7bf0faf423
Remove shorthand flags for "mount", "pretty", and "no-resolve"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 18:47:29 +02:00
Arnaud Porterie 58624acf11 Merge pull request #24525 from vdemeester/24196-remove-command-flag-on-service-update
Remove --command flag for service update
2016-07-13 16:01:11 +00:00
Vincent Demeester e4a024d590
Remove --command flag for service update
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-07-13 16:19:21 +02:00
Justin Cormack 3050d9af9b Expand the documentation of "no-new-privileges"
The change to runc in https://github.com/opencontainers/runc/pull/789
was not documented previously. Also say what this affects and clean
up layout of initial table as there was some miscolouration of the
continuation lines.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2016-07-13 14:41:58 +01:00
Vincent Demeester 92b1577871 Merge pull request #24562 from thaJeztah/carry-24499-swarm-info-consistency
[carry 24499] Remove "Yes"/"No" and use "true"/"false" consistently in `docker info`
2016-07-13 15:13:58 +02:00
Sebastiaan van Stijn 9d236d88b7 Merge pull request #24560 from thaJeztah/remove-execution-driver
docs: remove executiondriver from API 1.24 docs
2016-07-13 10:43:13 +02:00
Mei ChunTao acbe38a3cc fix the docker run --readonly example. rename '/icanwrite here' to '/icanwrite/here'
Signed-off-by: Mei ChunTao <mei.chuntao@zte.com.cn>
2016-07-13 08:21:26 +08:00
Sebastiaan van Stijn 477a5f8fb0
docs: fix output of node inspect
The output uses tabs, but those don't
translate well to the rendered output in
the docs, so replacing the tabs with spaces.

Also updates the output, because REPLICATED,
and SPREAD are no longer all-caps in the
actual output.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 01:53:51 +02:00
Sebastiaan van Stijn ea365e4cb3
Make labels human readable
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 01:08:54 +02:00
Michael Crosby a894aec8d8 Add --oom-score-adjust to daemon
This adds an `--oom-score-adjust` flag to the daemon so that the value
provided can be set for the docker daemon's process.  The default value
for the flag is -500.  This will allow the docker daemon to have a
less chance of being killed before containers do.  The default value for
processes is 0 with a min/max of -1000/1000.

-500 is a good middle ground because it is less than the default for
most processes and still not -1000 which basically means never kill this
process in an OOM condition on the host machine.  The only processes on
my machine that have a score less than -500 are dbus at -900 and sshd
and xfce( my window manager ) at -1000.  I don't think docker should be
set lower, by default, than dbus or sshd so that is why I chose -500.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-07-12 15:53:15 -07:00
Sebastiaan van Stijn 3c6ef4c29d
docs: remove executiondriver from API 1.24 docs
the executiondriver property was removed in
880484992c, but docs
were only updated for the 1.25 API, not for 1.24

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-13 00:49:29 +02:00
Tibor Vass 778b38cbf1 Merge pull request #23324 from icecrime/add_run_network
Add run network
2016-07-12 14:59:48 -07:00
Sebastiaan van Stijn e794fe2750 Merge pull request #24550 from thaJeztah/fix-evil-links
Fix some broken sourceforge.net links
2016-07-12 22:25:19 +02:00
Sebastiaan van Stijn d0b495f6b1 Merge pull request #24552 from thaJeztah/add-none-join-mode
Add "auto-accept=none" to documentation
2016-07-12 22:21:23 +02:00
Sebastiaan van Stijn 06517753c1
Add "auto-accept=none" to documentation
The "none" option was not added to the documentation.
This adds an example, and adds additional information
on manually accepting or rejecting a node.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-12 22:06:01 +02:00
Charles Smith cbdce58008 Merge pull request #24544 from sfsmithcha/network_plugins_swarm_mode
author merge: add caveat for network plugins in swarm mode
2016-07-12 13:05:05 -07:00
Arnaud Porterie (icecrime) c0c7d5e715
Rename `--net` to `--network`
Add a `--network` flag which replaces `--net` without deprecating it
yet. The `--net` flag remains hidden and supported.

Add a `--network-alias` flag which replaces `--net-alias` without deprecating
it yet. The `--net-alias` flag remains hidden and supported.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2016-07-12 13:01:35 -07:00
Sebastiaan van Stijn 0e7a1079be
Fix some broken sourceforge.net links
Looks like there's issues with sourceforge project
pages. Given that sourceforge isn't really what
it used to be, trying to find alternative URLs
where possible.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-07-12 21:51:14 +02:00
Charles Smith 9ae64de614 add caveat for network plugins in swarm mode
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-07-12 11:50:34 -07:00
Sebastiaan van Stijn a44f010702 Merge pull request #24518 from dmcgowan/overlay2-override-kernel-check
Allow option to override kernel check in overlay2
2016-07-12 19:22:27 +02:00
Sebastiaan van Stijn 7da11b1afd Merge pull request #24146 from johnharris85/fix-swarm-update-auto-accept
Add comma-separated --auto-accept support.
2016-07-12 16:29:21 +02:00
Doug Davis 71d404e2bc Merge pull request #24532 from yongtang/07122016-typo-docs
Fix a minor typo in swarm tutorial docs
2016-07-12 08:03:53 -04:00
Yong Tang 93fa7e7555 Fix a minor typo in swarm tutorial docs
This fix fixes a minor typo in swarm tutorial's delete service docs.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2016-07-12 05:00:39 -07:00