Commit Graph

17465 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
d3031c000f Merge pull request #16758 from HuKeping/update-test
Update test
Upstream-commit: 0137e3eda2bae42a83cecd967249e4da54f2fa52
Component: engine
2015-10-07 07:09:13 +02:00
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
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
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
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
c46b8dfd3a devmapper: Implement a goroutine to cleanup deleted devices
Start a goroutine which runs every 30 seconds and if there are deferred
deleted devices, it tries to clean those up.

Also it moves the call to cleanupDeletedDevices() into goroutine and
moves the locking completely inside the function. Now function does not
assume that device lock is held at the time of entry.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 87de04005d61ab986d70a31e3ac82ec92912df55
Component: engine
2015-10-06 17:37:21 -04:00
fb33696b35 devmapper: Keep track of number of deleted devices
Keep track of number of deleted devices and export this information through
"docker info".

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: d295dc66521e2734390473ec1f1da8a73ad3288a
Component: engine
2015-10-06 17:37:21 -04:00
7bb486d26e devmapper: Implement deferred deletion functionality
Finally here is the patch to implement deferred deletion functionality.
Deferred deleted devices are marked as "Deleted" in device meta file. 

First we try to delete the device and only if deletion fails and user has
enabled deferred deletion, device is marked for deferred deletion.

When docker starts up again, we go through list of deleted devices and
try to delete these again.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: d929589c1fc4538dcd1b2a7a3dc7d4afbdfa72fd
Component: engine
2015-10-06 17:37:21 -04:00
cd659bcc9c devmapper: Provide option to enabled deferred device deletion
Provide a command line option dm.use_deferred_deletion to enable deferred
device deletion feature. By default feature will be turned off.

Not sure if there is much value in deferred deletion being turned on
without deferred removal being turned on. So for now, this feature can
be enabled only if deferred removal is on.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 51e059e7e90f37848596a0b6ec83f7835e6e4131
Component: engine
2015-10-06 17:37:21 -04:00
3c327a4ced devmapper: construct used device ID map from device Hash map
Currently during startup we walk through all the device files and read
their device ID and mark in a bitmap that device id is used.

We are anyway going through all device files. So we can as well load all
that data into device hash map. This will save us little time when
container is actually launched later.

Also this will help with later patches where cleanup deferred device
wants to go through all the devices and see which have been marked for
deletion and delete these.

So re-organize the code a bit.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 6b8b4feaa165af630dd33423f0538a0b987703ae
Component: engine
2015-10-06 17:37:21 -04:00
f9c704604b Merge pull request #16786 from LK4D4/fix_systemd_serve
Remove wait on start channel for butts socket
Upstream-commit: c1c3475c6afa44a0328dc7a09839f9eee0fe105d
Component: engine
2015-10-06 14:04:15 -07:00
fca0f83907 Merge pull request #16752 from vdemeester/skip-TestExecStartFails-on-windows
Skip TestExecStartFails on windows
Upstream-commit: 7c19f660b3a0f5e5551ea8af2b3cc9b5266c2ada
Component: engine
2015-10-06 13:52:51 -07:00
c8875071f3 Merge pull request #16799 from rhvgoyal/code-reorg
devmapper: Break down setupBaseImage() function into smaller pieces
Upstream-commit: 670c48857ace676b43649b39bd12e83b19558d23
Component: engine
2015-10-06 16:15:31 -04:00
eea788b12d Merge pull request #16804 from Microsoft/jjh/fixpullimageifnotexist
No err shadowing on pullImageIfNotExist
Upstream-commit: aee0fcf413f34bd6b82a4231a3bd771b01919007
Component: engine
2015-10-06 22:02:45 +02:00
3fb0ea6fd2 Merge pull request #16795 from runcom/bump-libcontainer
Bump libcontainer
Upstream-commit: 931e6129d0c27acc81fc2eea57f333f31f1cfb69
Component: engine
2015-10-06 12:24:19 -07:00
1bddd2d12a No error shadow pullImageIfNotExist
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b7009a4b3ad7e495be61a61e9aacc5e263073670
Component: engine
2015-10-06 11:38:23 -07:00
e9bd508682 bump libcontainer to 902c012e85cdae6bb68d8c7a0df69a42f818ce96
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 753901343624f15264b46fe9ade01cf451be99f1
Component: engine
2015-10-06 17:55:09 +02:00
a37c8bb04a devmapper: Move UUID setup and verification code in a function
Simplify setupBaseImage() even further. Move some more code in a separate
function. Pure code reorganization. No functionality change.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 0fcd485626f110bbf39e8a6b1edc11b4ac6f7065
Component: engine
2015-10-06 08:38:03 -04:00
b4d2c9486c devmapper: Move thin pool related checks in a function
Move thin pool related checks in a separate function. Pure code reorganization.
Makes reading code easier.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 69051ec0a58906e5252f902063ccead2075c8bed
Component: engine
2015-10-06 08:38:03 -04:00
0f1a89a462 devmapper: Move base device creation in separate function
This moves base device creation function in a separate function. Pure
code reorganization. Makes reading code little easier.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: efc1ddd7e3341124a2ebbb8a358f44754b32f310
Component: engine
2015-10-06 08:38:03 -04:00
3d6e7d79f9 Merge pull request #16727 from rhvgoyal/code-cleanup
devmapper: Little code cleanup and code reorganization
Upstream-commit: 1529343a3fc78251a2d62befebdbd669db133a3b
Component: engine
2015-10-05 22:23:10 -07:00
f3b76452e9 Remove wait on start channel for systemd socket
Because Serve will be called after daemon creation

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 806e4c4a02d1f7b7bf05b29ecb0a3009098b26ac
Component: engine
2015-10-05 17:41:25 -07:00
40cd5f11ba Fix daemon logs so that "API listen on" is INFO not ERROR
W/o this PR the logs would show:
```
ERRO[0000] API listen on [::]:2375
ERRO[0000] API listen on /var/run/docker.sock
```
which is misleading since these aren't "errors" they're just informational.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: cc833c5e2bee651ee55378fbaa8302df60571400
Component: engine
2015-10-05 16:17:25 -07:00
98d72c0286 Fix VFS build tags
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7db08b4e62555055031ad6228221dc8c11ebe6a2
Component: engine
2015-10-05 15:52:09 -07:00
a2758a7a50 Merge pull request #16647 from vdemeester/revert-env-validation-docs
Update documentation on the revert on env validation
Upstream-commit: e1d3cb89f16c90a3ec6777e34c769cc2a35d123e
Component: engine
2015-10-05 15:27:45 -07:00
5d2ec8fed8 Move builder files to builder/dockerfile
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: f41230b93a77ca7f4d84718f39a4847b6117f694
Component: engine
2015-10-05 18:26:47 -04:00