Commit Graph
27716 Commits
Author SHA1 Message Date
Sebastiaan van Stijn 454d1d388e Remove Frugalware installation docs
These docs were outdated, and not actively
maintained. Also, there are no official packages
available for this distribution, so better to
remove it from the documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 9b8b6aa224d0e88bdd27e322ae1c922e3dfcbe12
Component: engine
2016-09-14 18:10:25 +02:00
Sebastiaan van Stijn b3b358d207 Merge pull request #26526 from lixiaobing10051267/masterSymble
fix some incorrect symbols before executing command
Upstream-commit: 9e9ba1e1c1235c3bdb7a70a0a9d0c5932d5afe9e
Component: engine
2016-09-14 17:48:43 +02:00
Alexander Morozov cc5042d8d1 Merge pull request #26504 from tonistiigi/frozen-fix
Fix already loaded detection for frozen images
Upstream-commit: 397df22963e9190bee494c8562a8c4c1bb1fdb6f
Component: engine
2016-09-14 08:22:48 -07:00
lixiaobing10051267 849847f7b2 fix some incorrect symbols before executing command
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 7b73b5fd6acf7a8fc3e9cee3437221794879b7c6
Component: engine
2016-09-14 22:28:09 +08:00
Sebastiaan van Stijn 422892f89b Merge pull request #25540 from estesp/ro-plus-userns
Remove --read-only restriction when user ns enabled
Upstream-commit: 8ac2000f5065b887753ffe32d2b793bb4bbd84c5
Component: engine
2016-09-14 13:53:58 +02:00
Carl Loa Odin 69938656f3 Add errexit to mkimage-yum.sh
Add errexit to mkimage-yum bash script to abort early. This to prevent
disaster when mktemp fails and leave $target variable empty.

Signed-off-by: Carl Loa Odin <carlodin@gmail.com>
Upstream-commit: fa255c92df52f816ec15b60460f02c8e66534e76
Component: engine
2016-09-14 12:04:04 +02:00
lixiaobing10051267 c6ac7292a4 add bash symbol for docker network inspect
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 7c3a26db166bf4d618ae414470f6bed7160f1371
Component: engine
2016-09-14 17:36:48 +08:00
Tobias Munk 757f5a4a4c fix typo
Signed-off-by: Tobias Munk <schmunk@usrbin.de>
Upstream-commit: 46162c71d2c8575005c268d87a1d3ac5b9b3c22c
Component: engine
2016-09-14 11:19:19 +02:00
Yanqiang Miao 4ffc78810e refactor the function 'aufsMount' in 'daemon/graphdriver/aufs/aufs.go'
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>

update

Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: b6a268d91fe3192d71c77c5aac4fddde2e8c864c
Component: engine
2016-09-14 15:42:51 +08:00
Yong Tang 9a730a715e Check bad syntax on dockerfile before building.
This fix tries to address the issue raised in 26453 where bad syntax
on dockerfile is not checked before building, thus user has to wait
before seeing error in dockerfile.

This fix fixes the issue by evaluating all the instructions and check
syntax before dockerfile is invoked actually.

All existing tests pass.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c8dc2b156a079ce03db8f579094b9643632661a8
Component: engine
2016-09-13 21:43:10 -07:00
Jana Radhakrishnan e77039e819 Merge pull request #26551 from cpuguy83/26548_fix_tasks
Do not look at `Attachment` tasks in /tasks
Upstream-commit: 3ae023cd2286188158f7a7ed356b63df63f00d09
Component: engine
2016-09-13 21:27:15 -07:00
Akihiro Suda a658a7684d fix racy tests in pkg/archive
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 62cbd2589fb92c71711a323953f2713ab529e801
Component: engine
2016-09-14 04:17:23 +00:00
Madhu Venugopal 131853bc0a Merge pull request #26449 from mrjana/net
Fix autostart for swarm scope connected containers
Upstream-commit: 1d76ab4f80e3bc2b6b62e7913b6be01966cb0975
Component: engine
2016-09-13 18:22:16 -07:00
Brian Goff 58f4fbdb5f Do not look at Attachment tasks in /tasks
Fixes #26548

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 15eee038c0b06b4f0ae1bf12bebbb9a1f5deec78
Component: engine
2016-09-13 20:44:06 -04:00
Darren Stahl b5041bd104 Windows: Enable more build tests
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: e79b0b42f074ced1814010974ffad47d0d3d24d0
Component: engine
2016-09-13 17:43:27 -07:00
Misty Stanley-Jones 1562fecdca Merge pull request #26547 from londoncalling/fix-links-in-overview
fixed on-page links
Upstream-commit: e08b2f7a082de21f62816ccbb42dedad36d47adb
Component: engine
2016-09-13 16:30:17 -07:00
Victoria Bialas 04ccb628a7 fixed on-page links
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
Upstream-commit: c073404af855b172febf7fbd8cf0cd17968a0b59
Component: engine
2016-09-13 16:20:05 -07:00
Daniel Nephin dd60049ff5 Fix testcases that expect trailing whitespace
and broken integration tests based of nil pointers

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e16e9775d48b6cd0cc7b4a66114d1b9680aa2f31
Component: engine
2016-09-13 17:58:12 -04:00
Daniel Nephin d90a93ce88 Refactor formatter.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c8336743a47216f87956b77449bd21714d3c45f1
Component: engine
2016-09-13 17:58:12 -04:00
Tõnis Tiigi d3ee804f34 Merge pull request #26543 from dnephin/fix_filter_args
Use opts.FilterOpt for filter flags
Upstream-commit: 9b0aaccf5556832994cef2b41f3b20b7ef0be006
Component: engine
2016-09-13 14:36:51 -07:00
Jana Radhakrishnan 293cb24e33 Fix autostart for swarm scope connected containers
The swarm scope network connected containers with autostart enabled
there was a dependency problem with the cluster to be initialized before
we can autostart them. With the current container restart code happening
before cluster init, these containers were not getting autostarted
properly. Added a fix to delay the container start of those containers
which has atleast one swarm scope endpoint to until after the cluster is
initialized.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: c9fb551d60584ac4ad01561e2f56b7b7cc9483b9
Component: engine
2016-09-13 14:21:58 -07:00
Anusha Ragunathan 3f481b7c53 Merge pull request #26216 from vieux/plugin_manifest
add some plugin manifest reference doc
Upstream-commit: 8aa454dfc8192094221d9ffae5a48d642ea865e4
Component: engine
2016-09-13 14:03:20 -07:00
Daniel Nephin 71b78a5b8d Use opts.FilterOpt for filter flags.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a07be9be38a96f43a0a7bac48caf35f9370bb543
Component: engine
2016-09-13 16:20:10 -04:00
Brian Goff 8782511c3a Merge pull request #22373 from cpuguy83/add_mounts_api_on_create
Add new `HostConfig` field, `Mounts`.
Upstream-commit: b4c1645db5d45720665683bbefb053c4e09f73dd
Component: engine
2016-09-13 14:39:50 -04:00
Tõnis Tiigi 393b27a858 Merge pull request #26503 from clnperez/swarm-test-move-err-check
swarm: always check err before http status in tests
Upstream-commit: 711455d34eb082ad11de1da2e2952dee017175ab
Component: engine
2016-09-13 10:53:55 -07:00
Alexander Morozov 134af38b9b project: add area/daemon and area/docs labels
I've removed `kind/docs` because I don't think that it's right kind for
issues.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 851bf81603183b6493facb3bf3479d2936473073
Component: engine
2016-09-13 10:32:03 -07:00
Alexander Morozov 988b9e5bc2 Merge pull request #26433 from Microsoft/jjh/fix24819
Windows: Fix regression pulling linux images
Upstream-commit: 85c3b8c1b15923fb45e59b7fb986012241ece419
Component: engine
2016-09-13 08:35:38 -07:00
Daniel Nephin 38a7f4f62e Merge pull request #24761 from WeiZhang555/parallel-stop
Enhancement: allow parallel stop, pause, unpause
Upstream-commit: c2decbe5ee9bd7677699228257db6bcd12d13b78
Component: engine
2016-09-13 10:46:51 -04:00
Brian Goff 81d3a2d917 Migrate old mount format to use mount specs
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 29b1c1da730f76fbd5206a33238593af5c77c358
Component: engine
2016-09-13 09:55:35 -04:00
Brian Goff 06b2219a87 Add new HostConfig field, Mounts.
`Mounts` allows users to specify in a much safer way the volumes they
want to use in the container.
This replaces `Binds` and `Volumes`, which both still exist, but
`Mounts` and `Binds`/`Volumes` are exclussive.
The CLI will continue to use `Binds` and `Volumes` due to concerns with
parsing the volume specs on the client side and cross-platform support
(for now).

The new API follows exactly the services mount API.

Example usage of `Mounts`:

```
$ curl -XPOST localhost:2375/containers/create -d '{
  "Image": "alpine:latest",
  "HostConfig": {
    "Mounts": [{
      "Type": "Volume",
      "Target": "/foo"
      },{
      "Type": "bind",
      "Source": "/var/run/docker.sock",
      "Target": "/var/run/docker.sock",
      },{
      "Type": "volume",
      "Name": "important_data",
      "Target": "/var/data",
      "ReadOnly": true,
      "VolumeOptions": {
	"DriverConfig": {
	  Name: "awesomeStorage",
	  Options: {"size": "10m"},
	  Labels: {"some":"label"}
	}
      }]
    }
}'
```

There are currently 2 types of mounts:

  - **bind**: Paths on the host that get mounted into the
    container. Paths must exist prior to creating the container.
  - **volume**: Volumes that persist after the
    container is removed.

Not all fields are available in each type, and validation is done to
ensure these fields aren't mixed up between types.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: fc7b904dced4d18d49c8a6c47ae3f415d16d0c43
Component: engine
2016-09-13 09:55:35 -04:00
Vincent Demeester 2f979c6743 Merge pull request #26514 from AkihiroSuda/fix-pkg-integration-race
[test] fix races in pkg/integration/cmd
Upstream-commit: 675144ff8d251a97322859a78f28ed4f988d3a74
Component: engine
2016-09-13 15:18:41 +02:00
Brian Goff fe1086552a Merge pull request #26517 from yongtang/26493-inspect-size
Fix issue of `WARNING: --size ignored for volume` for `docker inspect`
Upstream-commit: 04c189fa496152c40f1df92938cd17e3ca1decdd
Component: engine
2016-09-13 08:59:12 -04:00
Sebastiaan van Stijn 3ac40d17e5 Merge pull request #26515 from AkihiroSuda/improve-ckpt-doc
[doc] add current limitation to experimental/checkpoint-restore.md
Upstream-commit: 8754dc398e5868e636d6fa82140c3cb76acb3715
Component: engine
2016-09-13 14:55:18 +02:00
Sebastiaan van Stijn 73717df772 Merge pull request #25817 from sfsmithcha/update_glossary
add swarm mode terms to the glossary
Upstream-commit: 027e7be3482ff314f22dafcb7a4a2ab26b1a7ad7
Component: engine
2016-09-13 12:08:32 +02:00
Sebastiaan van Stijn afc1ccd008 Merge pull request #25466 from justincormack/deprecate-maintainer
Begin process of deprecating MAINTAINER
Upstream-commit: 4d187df277153bf704868d9a67b1e4fa29abf873
Component: engine
2016-09-13 12:07:04 +02:00
Justin Cormack fea8e9cc1f Merge pull request #26518 from SUSE/dont-write-aa-profile-to-etc
apparmor: do not save profile to /etc/apparmor.d
Upstream-commit: 379b02b48d185c3e91b0322cfcb3eb54223a8787
Component: engine
2016-09-13 10:37:11 +01:00
Vincent Demeester 9ac54a66eb Merge pull request #26489 from yuexiao-wang/update-exec
update option for docker exec
Upstream-commit: 0c90f777b745263deb4be55250ac3d19ddd91cf2
Component: engine
2016-09-13 11:16:22 +02:00
Vincent Demeester d3652a1d28 Merge pull request #26439 from lixiaobing10051267/masterReload
fix logruns.Warnf while daemon.networkOptions fails
Upstream-commit: eb0728a99313f11fc814e1529cd545f1cec66620
Component: engine
2016-09-13 11:03:52 +02:00
Vincent Demeester 5c9eaf9226 Merge pull request #26478 from sdurrheimer/zsh-completion-service-group-add-rm
Add zsh completion for 'service {create,update} --group-{add,rm}'
Upstream-commit: 0deae9f2fa3672bf7e5ce5899253e498800726b7
Component: engine
2016-09-13 10:18:27 +02:00
Steve Durrheimer 689d1a45e3 Add zsh completion for 'service {create,update} --group-{add,rm}'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 1df220d51fcba1e6f0a03bb83f80a7d45137f385
Component: engine
2016-09-13 10:15:22 +02:00
Aleksa Sarai d90edcd897 apparmor: do not save profile to /etc/apparmor.d
Writing the profile to /etc/apparmor.d, while also manually loading it
into the kernel results in quite a bit of confusion. In addition, it
means that people using apparmor but have /etc mounted read-only cannot
use apparmor at all on a Docker host.

Fix this by writing the profile to a temporary directory and deleting it
after it's been inserted.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Upstream-commit: 2f7596aaef3a9f8ec1f2d0937462d9263bee8b6b
Component: engine
2016-09-13 16:25:16 +10:00
Yong Tang 26569691e1 Fix issue of WARNING: --size ignored for volume for docker inspect
When `docker inspect` is invoked, it is possible to pass a flag of
`-s` for container types to display size information. If `-s` is used
for non-container types then a warning `WARNING: --size ignored for volume`
will show up.

However, currently `WARNING: --size ignored for volume` will show up even
when `-s` is not passed to `docker inspect` for non-container types.

This fix fixes this issue by checking if `-s` has been passed or not (`getSize`).
Also, since image inspect does not support `-s`, `IsSizeSupported` has been changed
to false for images.

This fix is tested manually.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 54976b718feac328609a0323d60f02a28c988f94
Component: engine
2016-09-12 23:08:19 -07:00
Akihiro Suda 0ac3b2e9e4 add current limitation to experimental/checkpoint-restore.md
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: d1c910af383fcce51e57c23b0c848c1f3c3baa8f
Component: engine
2016-09-13 05:14:41 +00:00
Akihiro Suda 3e11675204 fix races in pkg/integration/cmd
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: e17f77ec51f50f9c14c1acd36f1db6f5246b62e0
Component: engine
2016-09-13 04:23:36 +00:00
Zhang Wei 6e795d6e5b Add parallel operation support for pause/unpause
Support parallel pause/unpause

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: f1dda4395eb52eaeca8f9a1c76c2e2c3e6532490
Component: engine
2016-09-13 11:01:28 +08:00
Zhang Wei a92bf719a1 Enhancement: allow parallel stop
Stop multiple containers in parallel to speed up stop process, allow
maximum 50 parallel stops.

Signed-off-by: Abhinav Dahiya <abhinavdtu2012@gmail.com>
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 2155b46915a4df821405d26f576d9fae9fa5178e
Component: engine
2016-09-13 10:50:55 +08:00
lixiaobing10051267 7315cb0e38 fix logruns.Warnf while daemon.networkOptions fails
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 56916b5e8d8a22bc9590d28b9b752a2db4821441
Component: engine
2016-09-13 09:17:39 +08:00
John Howard ee76200cde Windows OCI convergence step 1
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7c7c3d7746d0dd77a7c0454a5bfe56b406ebadf1
Component: engine
2016-09-12 16:11:47 -07:00
Justin Cormack 3fe1e84cec Merge pull request #26496 from riyazdf/trust-sandbox-fix
Use latest version of notary server in trust sandbox docs
Upstream-commit: 6fafd07282f950799613c2ffc8eac6ff86d48206
Component: engine
2016-09-12 23:56:41 +01:00
Tõnis Tiigi 5363845025 Merge pull request #26499 from LK4D4/health_containerd
libcontainerd: use healthcheck to track containerd conn
Upstream-commit: 6a50b673eb1aed482700b38b131eff61449ed306
Component: engine
2016-09-12 15:52:48 -07:00