Commit Graph
19381 Commits
Author SHA1 Message Date
Srini Brahmaroutu 89ab17818a Timeouts are causing tests to fail differently. GCCGO CI.
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: ffe32ac371023220075b8ec7ac3cc62b431445b0
Component: engine
2015-10-08 15:14:56 +00:00
Phil Estes f7b1046066 Merge pull request #16848 from thaJeztah/fix-broken-link-in-error
Fix broken link in error-message
Upstream-commit: f418f4864bd317755ecf66bd9acc406a7bddc2a9
Component: engine
2015-10-08 11:11:11 -04:00
Phil Estes 99dfae8822 Simplify dir removal in overlay driver
There is no need to call `os.Stat` on the driver filesystem path of a
container as `os.RemoveAll` already handles (properly) the case where
the path no longer exists.

Given the results of the stat() were not even being used,  there is no
value in erroring out because of the stat call failure, and worse, it
prevents daemon cleanup of containers in "Dead" state unless you re-create
directories that were already removed via a manual cleanup after a
failure.  This brings removal in overlay in line with aufs/devicemapper
drivers which don't error out if the filesystem path no longer exists.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 6ed11b53743668dba3bcf6ecef4e57a399d95569
Component: engine
2015-10-08 11:04:00 -04:00
Stefan Berger ea88988c20 contrib: Adjustments to AppArmor docker engine policy for docker 1.9
This patch contains a few extensions for the AppArmor docker engine
policy for docker 1.9.

Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
Upstream-commit: f5be0821cfc583f187f7e91865c987d78321670c
Component: engine
2015-10-08 10:08:53 -04:00
James Turnbull 85e1a44e76 Merge pull request #16832 from sunyuan3/daemoncommand
Replace the deprecated -d with docker daemon.
Upstream-commit: 52de25049609d55aff26b91db12a792ace30f275
Component: engine
2015-10-08 10:06:10 -04:00
James Turnbull 6ff15cb8df Merge pull request #16828 from jwayong/jwayong/docs
Docs: Add docker-elements to remote API client lib doc page
Upstream-commit: a4eba15b75d840672a82802aad992894dbe85a5a
Component: engine
2015-10-08 10:05:44 -04:00
moxiegirl 282a5880a8 Merge pull request #15265 from greaber/dockerignore-docs
Further clarifications to .dockerignore docs
Upstream-commit: df6cd114a04e343c1f6f2637857bed3c5924873c
Component: engine
2015-10-08 06:24:44 -07:00
James Turnbull 18faaa074a Merge pull request #16845 from thaJeztah/is-that-a-container-in-your-repo
docs: minor fix in faq, and update link
Upstream-commit: e777f96e59ffed8bcabc4f8937a058c01d17aa58
Component: engine
2015-10-08 08:55:29 -04:00
Lei Jitang 262c5c28a2 Use consistent command description
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2b0927c9ac23b66d8a05761801d1c5f882ba8dfb
Component: engine
2015-10-08 08:46:21 -04:00
Sebastiaan van Stijn 6dd7824ffd Merge pull request #16844 from thaJeztah/fix-typo-in-maintainers
Fix typo in MAINTAINERS
Upstream-commit: c1783a1c2a97a840cfb26e8333ad2ff8c532816f
Component: engine
2015-10-08 14:42:12 +02:00
Sebastiaan van Stijn 66bb31005c Fix broken link in error-message
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 4830f488d5bcdbe73ab49fcedef0c6f686cbe704
Component: engine
2015-10-08 14:32:34 +02:00
Sebastiaan van Stijn 1e33aad6ac docs: minor fix in faq, and update link
The registry doesn't have containers, only images.
Also updated the Docker Hub link to the new location.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 6fda30a43753d504faa8a3d06ef886796e954b81
Component: engine
2015-10-08 13:49:30 +02:00
Sebastiaan van Stijn 10aeab9367 Fix typo in MAINTAINERS
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 618e00da818bcd72f7062999e8f9729184bdba26
Component: engine
2015-10-08 13:32:58 +02:00
Lei Jitang 5cf6a93d8d Revert add parent img refcount for faster rmi
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: b290690d73094bafea58e34dbccb0db37fd8e6ee
Component: engine
2015-10-08 06:46:27 -04:00
Vincent Demeester 8709c3083b Merge pull request #16780 from Microsoft/jjh/vfs-build-tags
Fix VFS build tags
Upstream-commit: 53d24291648f3c610ddb13e131a498e1d27ae676
Component: engine
2015-10-08 09:43:06 +02:00
Deng Guangxing 0012e76955 update dockernetwork.md and network api
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
Upstream-commit: 54f98f40a478903345400656268202b69b50d46d
Component: engine
2015-10-08 15:34:24 +08:00
Yuan Sun 7fe62e2968 Add description for "--cpu-shares=0".
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: b7249569e27e1962c69eef2b8f547fb6fb7ad367
Component: engine
2015-10-08 10:50:55 +08:00
Alexander Morozov e67f107724 Merge pull request #16783 from Microsoft/10662-cliwait
Windows CI: cli_wait_test
Upstream-commit: 4a9d039721ac16b07dffb784b2c1e3f884f62459
Component: engine
2015-10-07 19:39:32 -07:00
Yuan Sun ee5def44d4 Replace the deprecated -d with docker daemon.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: b08c6b17685d4af40e9705ca0efddbdffdf2657e
Component: engine
2015-10-08 10:25:16 +08:00
Yuan Sun 5cf2935c37 add TestRunInValidCPUShares
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 042d08a2a89c040b2fc7d97d8cc22a6c4593e275
Component: engine
2015-10-08 10:04:51 +08:00
Tibor Vass b5abf96150 Merge pull request #16830 from Microsoft/10662-refixdownload
Windows: Regression re-fix builder
Upstream-commit: a8175b751c65b4c2373110f2a513048646336cf9
Component: engine
2015-10-07 19:51:39 -04:00
Daniel Hiltgen 47fa2052c1 Add TLS support for discovery backend
This leverages recent additions to libkv enabling client
authentication via TLS so the discovery back-end can be locked
down with mutual TLS.  Example usage:

    docker daemon [other args] \
        --cluster-advertise 192.168.122.168:2376 \
        --cluster-store etcd://192.168.122.168:2379 \
        --cluster-store-opt kv.cacertfile=/path/to/ca.pem \
        --cluster-store-opt kv.certfile=/path/to/cert.pem \
        --cluster-store-opt kv.keyfile=/path/to/key.pem

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 124792a8714425283226c599ee69cbeac2e4d650
Component: engine
2015-10-07 16:01:00 -07:00
John Howard 2e11eb0e71 Windows: Regression re-fix builder
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9cd84e405d970239df7169e66a099e28311ef614
Component: engine
2015-10-07 15:57:37 -07:00
Morgan Bauer 8c3d5b861b refactor logs to not use internal data structures
- refactor to make it easier to split the api in the future
 - additional tests for non existent container case

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 1eecc1e7e57f3b96878df01fd32596bc485117a8
Component: engine
2015-10-07 15:44:16 -07:00
Morgan Bauer 254c913ad5 refactor daemon
- create pass through in daemon for access to functions on daemon
   member
 - import image
push image
export image and corrections
lookup image & comments
load image
list images
image history & comments

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 77c592d26a83aa5a56726d6e1741f18f044e64ab
Component: engine
2015-10-07 15:29:02 -07:00
Januar Wayong 9c388a6249 Docs: Add docker-elements to remote API client lib doc page
This closes #16824

Signed-off-by: Januar Wayong <januar@gmail.com>
Upstream-commit: 96ad26a7308b9e8b8ad52c5bfb4f0556941fc3f5
Component: engine
2015-10-08 08:45:35 +11:00
Alexander Morozov 074778dab7 Refactor listenFD function
* fixed weird logic with "*"
* return error if fdNum is failed to parse
* check if listener at offset is nil
* close unused listeners

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: fb04043ca52f316ad9cea32ba44a168a68558356
Component: engine
2015-10-07 14:26:48 -07:00
Alexander Morozov b0a8b96c68 Return listenbuffer behavior
Now we're start to serve early, but all Accept calls are intercepted by
listenbuffer or systemd socket.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 281a48d092fa84500c63b984ad45c59a06f301c4
Component: engine
2015-10-07 14:18:42 -07:00
Grant Reaber 5e87c46dcd clarify dockerignore semantics
Signed-off-by: Grant Reaber <grant.reaber@gmail.com>
Upstream-commit: 899ecc11c521d536f26b2e2f062382930dd6ff99
Component: engine
2015-10-07 15:51:57 -05:00
moxiegirl 780fae5a2c Merge pull request #16806 from aidanhs/aphs-split-docs-dockerfiles
Don't put dockerfiles in one continuous code block
Upstream-commit: 4c1540c8d2bb57123a4faa769d78cdf6202d4314
Component: engine
2015-10-07 13:40:19 -07:00
Vivek Goyal a357665097 devmapper: Make sure device is a thin pool device
Right now we check for the existence of device but don't make sure it is
a thin pool device. We assume it is a thin pool device and call poolStatus()
on the device which returns an error EOF. And that error does not tell
anything.

So before we reach the stage of calling poolStatus() make sure we are working
with a thin pool device otherwise error out.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 6d2d0a74e8effe65175473352bf58fc4beda1718
Component: engine
2015-10-07 16:28:49 -04:00
John Howard 3a210ffac2 Windows CI: Fix cli_wait_test
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: e666dfff9b7b82b026f9d45d8a8cb0d9193f0b56
Component: engine
2015-10-07 12:57:41 -07:00
Alexander Morozov 2675c04eda Merge pull request #16818 from runcom/rmi-perf
graph: add parent img refcount for faster rmi
Upstream-commit: ce0457a2c9a2b946679c084acbdb69a81a8a4dc7
Component: engine
2015-10-07 10:45:49 -07:00
Arnaud Porterie 6b3f6691b5 Merge pull request #16645 from mavenugo/ux
Docker Network UX & remote API changes
Upstream-commit: 8e31036816e200dfe54cc2205235de7dea54bcd0
Component: engine
2015-10-07 10:44:58 -07:00
Jess Frazelle 80c6a28fe2 Merge pull request #16807 from jfrazelle/rename-flag
change flag name to better follow the other flags that start with disable
Upstream-commit: a1c373197fe7f865ccac0ad338c213e3d1f863de
Component: engine
2015-10-07 10:40:32 -07:00
Brian Goff d6696485ff Make docker volume behave like docker network
Before, typing `docker volume` with no args would forward to the handler
for `docker volume ls`, except the flags for the `ls` subcommand were
not supported.
Instead just print the cmd usage.

This makes the behavior of the `docker volume` subcommand behave exactly
like the `docker network` subcommand.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2feebd95d33c4eb4073f5477860491626a9c19c6
Component: engine
2015-10-07 13:36:46 -04:00
Jessica Frazelle 3ba7e5f650 change flag name to better follow the other flags that start with disable;
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c559d8ebf7df5f7b7cb912c34e2f9056fa1b32e5
Component: engine
2015-10-07 10:16:37 -07:00
Antonio Murdaca 433291e005 graph: add parent img refcount for faster rmi
also fix a typo in pkg/truncindex package comment

Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 292a1564dca2f32b9158a6886fadee1cc184f987
Component: engine
2015-10-07 19:09:44 +02:00
Alexander Morozov 362fe5af33 Merge pull request #16381 from rhvgoyal/deferred_deletion
devicemapper: Implement deferred deletion capability
Upstream-commit: 8cee3018740374ae44ae5f71b8032cc1b3d98cb4
Component: engine
2015-10-07 09:27:41 -07:00
Doug Davis fde720d014 Fix help test comment to align with the code
I disagree with #14546 that pushed the help text past 80 chars.
Aside from it now making the help text look ugly on 80 char displays,
which I use, one thing I like about the previous limitation is that it
forced us to keep our options down to more reasonable phrases/words.
For example, I think
`    --disable-content-trust=true`
could have been:
`    --disable-trust=true`
or even:
`    --disable-ctrust=true`

But regardless, let's at least make the comments match what the code does.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 73a6ac00cebd0cf9a68a922aa0d4aa61d4ff84d6
Component: engine
2015-10-07 05:09:46 -07:00
Madhu Venugopal af07841b68 Networking API and UX documentation
More doc updates will follow

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: dd28ded711417c72d2e228d1ace129ac5fd05f19
Component: engine
2015-10-07 03:54:27 -07:00
Madhu Venugopal 45997573a5 Network UX and integration tests
* Exiting experimental network UX
* removed experimental service UX
* integrated with the new network remote API

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 22a9ba090eb3cc1bc6c851785a876b064df7341a
Component: engine
2015-10-07 03:54:27 -07:00
Madhu Venugopal 8623fdfb48 Network remote APIs using new router, --net=<user-defined-network> changes
* Moving Network Remote APIs out of experimental
* --net can now accept user created networks using network drivers/plugins
* Removed the experimental services concept and --default-network option
* Neccessary backend changes to accomodate multiple networks per container
* Integration Tests

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 2ab94e11a2a8499088a72ab27fd09e897d8c810a
Component: engine
2015-10-07 03:54:19 -07:00
Aidan Hobson Sayers 917e7739ac Mention more realistic examples are available
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 4cb0790a620924a9fe5d751c6c7e6b37183697df
Component: engine
2015-10-07 11:45:57 +01:00
Vincent Demeester d3031c000f Merge pull request #16758 from HuKeping/update-test
Update test
Upstream-commit: 0137e3eda2bae42a83cecd967249e4da54f2fa52
Component: engine
2015-10-07 07:09:13 +02:00
Tibor Vass 1f889ca641 Move types from progressreader and broadcastwriter to broadcaster
progressreader.Broadcaster becomes broadcaster.Buffered and
broadcastwriter.Writer becomes broadcaster.Unbuffered.

The package broadcastwriter is thus renamed to broadcaster.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 2391233404e2e6892c79a24f31cc99715c086b21
Component: engine
2015-10-06 22:20:07 -04:00
Brian Goff 5a9d726a00 Merge pull request #16147 from tiborvass/refactor-builder
Refactor builder with new Go interfaces
Upstream-commit: 2606a2e4d3bf810ec82e373a6cd334e22e504e83
Component: engine
2015-10-06 20:36:07 -04:00
HuKeping c90c198590 Update test
Use of checkers on Integration test.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 28cff8bd031adcc2937918c2630139b81140af2a
Component: engine
2015-10-07 07:11:45 +08:00
Tibor Vass d8db4defa7 Abstract builder and implement server-side dockerfile builder
This patch creates interfaces in builder/ for building Docker images.
It is a first step in a series of patches to remove the daemon
dependency on builder and later allow a client-side Dockerfile builder
as well as potential builder plugins.

It is needed because we cannot remove the /build API endpoint, so we
need to keep the server-side Dockerfile builder, but we also want to
reuse the same Dockerfile parser and evaluator for both server-side and
client-side.

builder/dockerfile/ and api/server/builder.go contain implementations
of those interfaces as a refactoring of the current code.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e0ef11a4c2c6789e08b61df082b5b9aa70898e7a
Component: engine
2015-10-06 19:10:19 -04:00
Aidan Hobson Sayers 000787bb0d Don't put dockerfiles in one continuous code block
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 6a1a192e072cc44d80230626071efe756d77d373
Component: engine
2015-10-06 22:58:42 +01:00