3abcc54bab
Docs: Add note that export doesn't include volume data.
...
The documentation on `docker export` doesn't mention that
data in volumes is not included in the export.
This adds a note that volumes are not part of the export
and refers to the "Backup, restore, or migrate data volumes"
to give the user some pointers.
Relates to https://github.com/docker/docker/issues/10095
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 67588d0ec4d73a8f2efb150d555c38b7ebfca7f6
Component: engine
2015-01-15 16:54:45 +01:00
c664f952ef
Merge pull request #10082 from jfrazelle/10081-fix-renaming
...
Renaming a container with an invalid name should fail
Upstream-commit: f67c6d313b971a068262a09840f7afdf4d34b292
Component: engine
2015-01-14 13:12:36 -08:00
4fdee94024
Renaming a container with an invalid name should fail
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: a92281637f5b629e110b5bd074566bb6c302bb62
Component: engine
2015-01-14 12:54:23 -08:00
4bfc5b4983
Merge pull request #10056 from coolljt0725/add_link_accept_ID
...
Add --link accept container ID
Upstream-commit: 37b69408f84d970322e8620b6360bde70974e4b6
Component: engine
2015-01-14 12:50:10 -08:00
2042ef7db5
Merge pull request #9836 from SvenDowideit/transcluded-no-sudo-note
...
Add a note that remote and Boot2Docker users should not type sudo
Upstream-commit: 71ab2efbfaa351b83af6b6c4fae8aa9c376a88da
Component: engine
2015-01-14 12:44:53 -08:00
2df21c5a26
Merge pull request #10072 from LK4D4/fix_mutable_net_files
...
Rewrite TestRunMutableNetworkFiles to avoid races
Upstream-commit: 95fea08f7adabfb1b21a7716e36d8aeda51a37a1
Component: engine
2015-01-14 11:48:46 -08:00
8dc568f672
Merge pull request #10092 from docker/revert-10087-proper-netgo-thanks-rsc
...
Revert new netgo
Upstream-commit: 7d80fd6ca6f26f37b5c19d95b53c7fb4faa22bd1
Component: engine
2015-01-14 10:15:14 -08:00
fcb3e5c2df
Revert "Add proper "netgo" compiling, thanks to rsc ♥"
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jfrazelle@users.noreply.github.com > (github: jfrazelle)
Upstream-commit: e7cfb1c28b2a52f34c8e48ede2e24645991d1104
Component: engine
2015-01-14 09:55:35 -08:00
1220f4f0e6
Merge pull request #10075 from LK4D4/test_for_maxcount
...
Test for restarting count
Upstream-commit: 5136b11514b4d891334c06a0692c5deeecfd5b32
Component: engine
2015-01-14 09:17:02 -08:00
c990187923
Merge pull request #10086 from tianon/properly-fix-daemon-kill-on-failure
...
Properly fix "daemon kill" on test failure
Upstream-commit: 355415d823ab2738d7531676a2e6b144aa5d7452
Component: engine
2015-01-14 09:13:32 -08:00
94243b231b
Merge pull request #10087 from tianon/proper-netgo-thanks-rsc
...
Add proper "netgo" compiling, thanks to rsc ♥
Upstream-commit: c05e7c41358697f6d1e673359a15e55aeea25539
Component: engine
2015-01-14 09:09:18 -08:00
65bf9de1e2
Add tests for --link
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2292167b02ce0489d38e0a6beeb792bcb7534f34
Component: engine
2015-01-14 15:25:58 +08:00
162b61e657
Add proper "netgo" compiling, thanks to rsc ♥
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: b5aba426d4bb903825ec4b3b4912f521daac4c2a
Component: engine
2015-01-13 21:35:21 -07:00
a01afb0b92
Test for restarting count
...
This test is for #10058
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 79d30364c95f13b9ff2ce3b4df9bb70d2ddd41f0
Component: engine
2015-01-13 20:28:44 -08:00
a9c40eeb27
Properly fix "daemon kill" on test failure
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: c18fdc37042dc7fb041475a524fe7abb0bd7afdc
Component: engine
2015-01-13 21:12:07 -07:00
bafbcb6583
Add a note that remote and Boot2Docker users should not type sudo
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com > (github: SvenDowideit)
Upstream-commit: d5df948829bfd6e12dc2c0ca3228b583386b6e87
Component: engine
2015-01-13 21:40:14 -05:00
701611541f
Merge pull request #10076 from MalteJ/ipv6-docs
...
IPv6 docs: The ARP cache is called NDP neighbor cache in IPv6
Upstream-commit: c9dab702bed3ffd6335a61df74b73e89b44fcbf9
Component: engine
2015-01-13 17:05:28 -08:00
a52e28bc8b
Merge pull request #10077 from crosbymichael/parallel-image-check
...
Parallel image lookup
Upstream-commit: e90df7c8d2c6c56637f07c2ebf9186f6c94d5f0b
Component: engine
2015-01-13 17:02:49 -08:00
863904b2ee
Merge pull request #10080 from crosbymichael/pid-ns
...
Add --pid flag for staying in the host's pid namespace
Upstream-commit: 47e3da848ffbe88d0188ae6cfc09d6e1668bc293
Component: engine
2015-01-13 17:00:18 -08:00
b769333838
Merge pull request #10036 from HuKeping/docs-next
...
docs: update docker inspect part of docs
Upstream-commit: 8ac075b846609f73ad8aa29d6e9dbb6cd2392293
Component: engine
2015-01-13 16:43:42 -08:00
6955e4f0e5
Merge pull request #10079 from tonistiigi/fix-attach-stdin
...
Fix attach stream closing issues
Upstream-commit: 23b48fbe146b6412390e18eb9ac8173ef43e73df
Component: engine
2015-01-13 16:40:42 -08:00
24529f4dc7
Add test for --pid=host
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 15e8f3fdd31dc498be106a69a7e29ba459c36c1a
Component: engine
2015-01-13 16:39:08 -08:00
458ae31cfd
Allow the container to share the PID namespace with the host
...
We want to be able to use container without the PID namespace. We basically
want containers that can manage the host os, which I call Super Privileged
Containers. We eventually would like to get to the point where the only
namespace we use is the MNT namespace to bring the Apps userspace with it.
By eliminating the PID namespace we can get better communication between the
host and the clients and potentially tools like strace and gdb become easier
to use. We also see tools like libvirtd running within a container telling
systemd to place a VM in a particular cgroup, we need to have communications of the PID.
I don't see us needing to share PID namespaces between containers, since this
is really what docker exec does.
So currently I see us just needing docker run --pid=host
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 23feaaa240853c0e7f9817f8c2d272dd1c93ac3f
Component: engine
2015-01-13 16:35:17 -08:00
3fb41b40ef
Fix attach stream closing issues
...
Fixes : #9860
Fixes: detach and attach tty mode
We never actually need to close container `stdin` after `stdout/stderr` finishes. We only need to close the `stdin` goroutine. In some cases this also means closing `stdin` but that is already controlled by the goroutine itself.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 28cf8fddd4c19e98fd0a6fcf0a6e7ea545521412
Component: engine
2015-01-14 02:03:25 +02:00
21dc7e659d
Merge pull request #10068 from jfrazelle/api-bump-rename
...
Add reference to rename endpoint in correct version & add to new
Upstream-commit: 0eefae8e0db0c3c567e8807f09434a0da3fc1261
Component: engine
2015-01-13 15:58:36 -08:00
dc1c238ed6
Use channels and set workers to make image lookup safe
...
This refactors the starting work by the prior commits to make this safe
for access. A maximum of 5 worker go routines are started to lookup
images on the endpoint. Another go routine consumes the images that are
required to be pushed into a map for quick lookups. The map is required
because the pushing of the image json and layer have to be done in the
correct order or the registry will explode in fire.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 476cf1b906ca14cc3ce1347f1aa479713fa6ce6e
Component: engine
2015-01-13 15:52:44 -08:00
0f5c9b554c
Replace custom waiting code with a WaitGroup
...
Signed-off-by: Ian Calvert <ianjcalvert@gmail.com >
Upstream-commit: 33286589291a56fe0a4728f8b45ad3feb5494226
Component: engine
2015-01-13 15:32:47 -08:00
1f4175ede8
Run the remote image presence checks in parallel
...
Signed-off-by: Ian Calvert <ianjcalvert@gmail.com >
Upstream-commit: 90c5ff4f06b8672cd2b427d120a8988bfc9f1de7
Component: engine
2015-01-13 15:32:47 -08:00
dbd5499197
Add reference to rename endpoint in correct version & add to new
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com > (github: jfrazelle)
Upstream-commit: ee78e3f28459b655bf7df71eb4e2e22a04a8948d
Component: engine
2015-01-13 15:22:04 -08:00
7189e0cf12
IPv6 docs: The ARP cache is called NDP neighbor cache in IPv6
...
Signed-off-by: Malte Janduda <mail@janduda.net >
Upstream-commit: c03e15c9daddac86a4fdc7e6660f338b1b733f22
Component: engine
2015-01-14 00:20:17 +01:00
94b5bf5737
Merge pull request #10003 from vbatts/vbatts-dm_loop_file_info
...
devmapper: show device and loop file , if used
Upstream-commit: 044d979f4ec83aac5664691d29123c34f6db68d6
Component: engine
2015-01-14 01:15:09 +02:00
3d1cd66149
Merge pull request #10070 from thaJeztah/change-back-error-message
...
Mention "or rename" again in error-message.
Upstream-commit: ff401263897a8573374989db8e51d3525fa194cf
Component: engine
2015-01-13 14:56:15 -08:00
b2532a1210
Merge pull request #10073 from tonistiigi/fix-unix-integration-cli
...
Fix filenames for unix only integration-cli tests
Upstream-commit: d8e6e32222c9deb0b4b5c77fc5bdedb18e5f457e
Component: engine
2015-01-13 14:55:31 -08:00
7c9f917c40
Merge pull request #10071 from mota/cleanup-router
...
Remove error return type from createRouter and ServeRequest
Upstream-commit: 3943b381efbe8da9a27f43e07710f3c81cb2c3be
Component: engine
2015-01-13 14:46:36 -08:00
cb72368bb7
Fix filenames for unix only integration-cli tests
...
Test suffix comes after the platform/arch.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: f9876dade26fd779c1cb0e2156e635c85c6e8ee2
Component: engine
2015-01-14 00:31:25 +02:00
6643773793
Rewrite TestRunMutableNetworkFiles to avoid races
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 492b18ac08e2652c1b95fd9f3c786e1fb1f28c3a
Component: engine
2015-01-13 14:14:36 -08:00
a75e2deaba
Remove error return type from createRouter and ServeRequest
...
Signed-off-by: Pierre Wacrenier <pierre.wacrenier@gmail.com >
Upstream-commit: 02923d43e20f7be6c2e1ed48846d188a682ff919
Component: engine
2015-01-13 22:43:31 +01:00
c7165c65cf
Merge pull request #10058 from HuKeping/work
...
restart: Fix the compare of restart policy
Upstream-commit: 5862422a49fd8585a74630cf99792a1b3851a2e7
Component: engine
2015-01-13 13:38:52 -08:00
d76b9718d9
Mention "or rename" again in error-message.
...
The "or rename" part was removed from the error-message,
because renaming wasn't possible at the time.
Now that https://github.com/docker/docker/pull/8570 is merged,
renaming existing containers is possible.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 78820a63d647276cf17dac9ac71ed2beb19f285d
Component: engine
2015-01-13 21:57:48 +01:00
43e822f369
Merge pull request #10069 from tianon/docker-py-commit
...
Switch docker-py clone to use an explicit commit for natural cache-busting
Upstream-commit: 0db6bb3cbf508edd89b83c60c242333b5f05d501
Component: engine
2015-01-13 11:43:28 -08:00
e622152215
Switch docker-py clone to use an explicit commit for natural cache-busting
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 3c01c971cdec8822086d03f509e119cb8a8c719c
Component: engine
2015-01-13 12:34:55 -07:00
59accfd690
Merge pull request #9973 from duglin/Issue9880
...
Make sure that ADD/COPY still populate the cache even if they don't use it
Upstream-commit: 99a15ec8bd548563a1ac4f652c55d4bb1ff769e4
Component: engine
2015-01-13 11:17:34 -08:00
62d740bb49
Merge pull request #10064 from hqhq/hq_fix_flag_comments
...
correct the flag comments
Upstream-commit: eaeaf0d8e312dff5f4677f660a6e5356f6f82d84
Component: engine
2015-01-13 11:06:24 -08:00
663cdb3f16
Merge pull request #9951 from andersjanmyr/add-proxy-from-environment-to-client
...
Add ProxyFromEnvironment enables client via proxy.
Upstream-commit: ab86f591c323b38c918a026f38a26df120a475ac
Component: engine
2015-01-13 10:53:00 -08:00
a7f4603fba
Merge pull request #9764 from ztombol/fix-reduce-arch-rootfs-size
...
Revisiting mkimage-arch.sh
Upstream-commit: 21cf4b4c4cd6cc1f4667db4f334286bdbe39e2e2
Component: engine
2015-01-13 10:39:45 -08:00
080d79ba9a
Merge pull request #8570 from brahmaroutu/rename_container_3036
...
Rename a existing container
Upstream-commit: b9e42d66e790535fe1226adea4ff39e25f493b51
Component: engine
2015-01-13 10:37:29 -08:00
c9dd2d86fb
Merge pull request #10013 from icecrime/9979_oom_exit_code
...
Fix error code when exiting on OOM
Upstream-commit: 9621e59909a93b90a4dd04b628bcbe821b2a1e51
Component: engine
2015-01-13 10:33:21 -08:00
d5a1764c0a
Delete man pages of installed packages in mkimage-arch.sh
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
Upstream-commit: 18c0b415644b594969bbec49de51098be62d18f8
Component: engine
2015-01-13 18:10:50 +01:00
88f9df3419
Revise list of installed packages in mkimage-arch.sh
...
Docker-DCO-1.1-Signed-off-by: Zoltan Tombol <zoltan.tombol@gmail.com > (github: ztombol)
Upstream-commit: 9f59b057be25656214d65040ae113c0d76d99324
Component: engine
2015-01-13 18:10:50 +01:00
4cf7955121
Merge pull request #10008 from rhatdan/help
...
Fix docker run/create not printing error messages
Upstream-commit: 6e5c5d33dd6efd65f6d6239099acb2be989423c5
Component: engine
2015-01-13 06:48:33 -08:00
