365103a8e5
Merge pull request #4840 from vbatts/vbatts-load_from_input
...
docker load: add --input flag
Upstream-commit: 5506e4b62dfad9d79fbeed91b9696fb51c736631
Component: engine
2014-03-25 14:37:27 -07:00
deed2b6616
docker load: add --input flag
...
for those that do not care to read from redirected stdin
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 84e1fdf35d9d6493d389a8e8be3ab41190004b30
Component: engine
2014-03-24 21:43:26 -04:00
6bdc8cd953
Merge pull request #4751 from enokd/master
...
Fixes #3369 Repeated slash-'/' characters; harmonize across all name-related commands
Upstream-commit: 4585d2da3e62a8c41c212f32cd77b510a2f123b0
Component: engine
2014-03-24 17:43:02 -07:00
186280f667
Merge pull request #4778 from vbatts/vbatts-save_to_output
...
`docker save --output` flags
Upstream-commit: a258d048a221d2598f7317ee8e64765cb20fd588
Component: engine
2014-03-24 16:52:08 -07:00
aa948163e7
Revert "Disable automatic killing of containers when docker stop fails"
...
This reverts commit 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: d503714285143013d9fa6932ee5775fd155d26d2
Component: engine
2014-03-24 12:03:56 +00:00
6ed3664799
Harmonize / across all name-related commands/Validate images names
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Upstream-commit: 43c3ee3ba154e2480191ed3743391810f23f29af
Component: engine
2014-03-21 00:40:58 +01:00
694ecbc3a5
Harmonize / across all name-related commands
...
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Harmonize / across all name-related commands:Return an error when repeated /
Docker-DCO-1.1-Signed-off-by: Djibril Koné <kone.djibril@gmail.com > (github: enokd)
Upstream-commit: e38e977a0410b754b6f318ff973dc15e6d756023
Component: engine
2014-03-20 00:45:29 +01:00
d6e39e4b66
Merge branch 'https_client' of github.com:discordianfish/docker into discordianfish-https_client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 12687b7c10b6bb7e2a278ba6d1a323fe5e5f81d7
Component: engine
2014-03-19 22:03:11 +00:00
9fba82f5c1
api/client: var style tweak
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 78a0105eaf80ed85e2ee236632a2cc16998228f9
Component: engine
2014-03-19 17:09:12 -04:00
2a0a13fcc3
docker save: add and improve docs
...
add usage examples for `docker save ...`
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: e93a16ab48f75311aab155548f32776cbd21dfe6
Component: engine
2014-03-19 14:47:20 -04:00
02cf69562f
docker save: --output flag
...
for those that do not care to redirect stdout
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 5127732c7911988c81eda7bb31ac77fc1dd36ac2
Component: engine
2014-03-19 14:31:22 -04:00
5ac53676ce
Using names in docker ps --since-id/--before-id, resolves #3565
...
Also renames --since-id/--before-id to --since/--before and add errors
on non-existent containers.
Docker-DCO-1.1-Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com > (github: LK4D4)
Upstream-commit: c1f2abd89958a8731211ceb2885eed238a3bea8d
Component: engine
2014-03-18 23:30:21 +04:00
9f3a8a726d
Merge pull request #4684 from cpuguy83/4682-do_not_sigkill_on_docker_stop
...
Disable automatic killing of containers when docker stop fails
Upstream-commit: bfbf338f51f90a67e2866358a33e22d576755439
Component: engine
2014-03-18 11:28:42 -07:00
3865d7d383
Merge pull request #4661 from vieux/add_no_prune
...
Add no prune
Upstream-commit: 68dc1896804de92b8c39cfc6bd4f7c96d4abe09e
Component: engine
2014-03-17 16:07:55 -07:00
0aaef1f844
Merge pull request #4710 from jimenez/4680-timeout_flag-fix
...
Disable timeout
Upstream-commit: fb503da34e2eae1aab3a54eed4c5a2374fa35c7d
Component: engine
2014-03-18 00:38:39 +02:00
e839931238
adding configuration for timeout and disable it by default
...
Docker-DCO-1.1-Signed-off-by: Isabel Jimenez <contact@isabeljimenez.com > (github: jimenez)
Upstream-commit: 25218f9b239784e6f38550a6e320bce56aaca3e1
Component: engine
2014-03-17 15:12:02 -07:00
511a3e0407
Disable automatic killing of containers when docker stop fails
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 8b5cf51d600dc4f3611cf063c52cf3448e7b01e5
Component: engine
2014-03-17 15:15:44 -04:00
c7bbb9caec
add no prune to rmi
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: edd8d2d3511b0b632149d1c1f2cfd2bad2df4679
Component: engine
2014-03-17 18:40:57 +00:00
063cfadb64
Merge pull request #4701 from erikh/4099-non_existent_file_no_error
...
Fix `docker cp` trying to untar files that do not exist.
Upstream-commit: 2ada6441db6ac42abd42ac6ac7ad7439da123d0e
Component: engine
2014-03-17 20:38:26 +02:00
a3b952c15e
Merge pull request #4364 from vieux/move_clone
...
move git clone from daemon to client
Upstream-commit: f9bd6c860d2b07bd44f3dff98255bce34ded883b
Component: engine
2014-03-17 11:36:56 -07:00
6fae2857fa
Merge pull request #4720 from vieux/fix_content-type_cp
...
fix content-type detection in docker cp
Upstream-commit: d81021803820b807875ef76676d723eee5b0faee
Component: engine
2014-03-17 11:24:18 -07:00
c381c0f9d5
fix content-type detection in docker cp
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 90b283c39a36f34ac97f9eb0d66da3a0a9992caa
Component: engine
2014-03-17 17:56:21 +00:00
b60da9d539
Fix docker cp trying to untar files that do not exist.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org > (github: erikh)
Upstream-commit: 9e69a042c50a3706c847addd68469dfe3eb698a0
Component: engine
2014-03-16 17:48:46 +00:00
a638dc66f8
In docker ps, sort by port instead of unsorted.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <erik@hollensbe.org > (github: erikh)
Upstream-commit: e32965dbb13973f61ba1c0496c8136cc8c9273a2
Component: engine
2014-03-16 16:28:44 +00:00
5a2ca94673
create the cli obj before calling parseCommand
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: c349c9d14a1c4bf04f35f3f5c62b0bb92614bc81
Component: engine
2014-03-14 00:47:13 +00:00
0795e31f12
Merge pull request #4659 from creack/more_info
...
Have the exec driver and kernel version in non-debug mode in `docker info`
Upstream-commit: 9c21a73f7449e412e101ba688459a26137f2c50d
Component: engine
2014-03-13 17:32:42 -07:00
4eb4057922
Have the exec driver and kernel version in non-debug mode in docker info
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 6411ee6d24d256e15909ea68b845b354dc51c4ed
Component: engine
2014-03-13 16:28:16 -07:00
c48adc6929
Update to double-dash everywhere
...
These were found using `git grep -nE '[^-a-zA-Z0-9<>]-[a-zA-Z0-9]{2}'` (fair warning: _many_ false positives there).
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 44fe8cbbd174b5d85d4a063ed270f6b9d2279b70
Component: engine
2014-03-13 11:46:02 -06:00
4c1f9818ed
Merge pull request #4621 from unclejack/fix_empty_cidfile
...
don't leave empty CIDFile behind
Upstream-commit: bd1c51259433d7f5d3f2502fab6e12a8f4b30248
Component: engine
2014-03-12 11:12:51 -07:00
80fe86e3ee
don't leave empty cidFile behind
...
This makes `--cidfile` clean up empty container ID files. These are
left behind when creating the container fails.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: a56d1b93a1a16ac482b5e30773664f2538949c53
Component: engine
2014-03-12 19:36:19 +02:00
5656d23221
Fix attach exit on darwin
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 95e5910ab23e3ef7b0154f64e1c6ae01bc647ab3
Component: engine
2014-03-11 17:51:29 -07:00
45bf14b1a8
Merge pull request #4491 from crosbymichael/add-pull-dep
...
Add deprecation warning for -t on pull
Upstream-commit: 3715f46b8bfeb4a5127e03c1a7b2beaf6a3cc341
Component: engine
2014-03-11 10:22:06 -07:00
3d1071683c
Add deprecation warning for -t on pull
...
Closes #3410
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 15e52ccaadea996b409e2f62bcbdb1a088619e35
Component: engine
2014-03-11 10:11:05 -07:00
cdaa7359ca
if client has no git, use server
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 0d6275b298ebb9161c2f55d4b4ac0f87603a11cd
Component: engine
2014-03-11 01:23:14 +00:00
2f081de14e
move git clone from daemon to client
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
add a little doc
Upstream-commit: 8301fc8e56503d5a0ea2316a0778faf4cf5f5f1e
Component: engine
2014-03-11 01:23:14 +00:00
11f1b48016
Merge pull request #4563 from creack/signal-improvment
...
Signal improvments
Upstream-commit: b5a544b02e2d6f5e880064f327bcb1d5d866e30e
Component: engine
2014-03-10 17:59:17 -07:00
9db05a87c8
Make docker use the signal pkg with strings
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 157f24ca77a38f7c5c2b22322a2a353d5098a21e
Component: engine
2014-03-10 17:36:47 -07:00
357d278b81
Move signal to pkg
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: c5632622391921160687f3e0155bdfe3d3cfc07d
Component: engine
2014-03-10 17:36:32 -07:00
4fcd3ec7b6
Merge auth package within registry
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: 8d88ea0c15b7ce7fd2b0b695c498a7ffa0f2bc87
Component: engine
2014-03-10 17:16:58 -07:00
46c0bc2613
Add authenticated TLS support for API
...
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org > (github: discordianfish)
Upstream-commit: c000cb64712349141596318dea2a8de2462c8f81
Component: engine
2014-03-09 00:06:44 +01:00
81ffbaf8cc
Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command
...
Add ability to force removal of running container via docker rm -f
Upstream-commit: e388b6aba5e7d75fecf87223abcd3c1deffd27f0
Component: engine
2014-03-07 00:05:57 +02:00
e23e08e833
Create a -G option that specifies the group which unix sockets belong to.
...
Docker-DCO-1.1-Signed-off-by: Evan Krall <krall@yelp.com > (github: EvanKrall)
Upstream-commit: 644acec2f7e3b144a423d0f0a6c900701abdc511
Component: engine
2014-03-06 11:17:04 -08:00
161ea04aaf
Merge pull request #4462 from jamtur01/langfix
...
Updated a variety of language and error messages
Upstream-commit: 910168616183e815845afc7a64b05eec7737b580
Component: engine
2014-03-05 10:22:51 -08:00
dc81426ab3
Updated a variety of language and error messages
...
In api/client.go updated:
1. Made api == API
2. Restated Docker daemon connection error to be clearer.
3. Changed use of "Impossible" in error messages.
4. Removed extra space in restart error message.
5. Fixed capitalization in three error messages.
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 9cbf22dee26e363bbe3738bbbcd1d70773d80d0d
Component: engine
2014-03-04 20:52:48 -05:00
53d25513fd
Made CLI option capitalization consistent in api/client.go
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: 725c7cd08af5b895becce19e59fe98cebdc67cf2
Component: engine
2014-03-04 20:45:22 -05:00
f917ba6a35
Merge pull request #4270 from DevTable/fixregistryauth
...
Fix registry auth and remove other hidden ping commands from client code
Upstream-commit: 0eeb146398470bb586ce5b3f1dff28f2f4bbaa4e
Component: engine
2014-03-03 17:34:21 -08:00
085a080854
Merge pull request #4385 from khia/json_format
...
Support json output in --format flag of docker inspect
Upstream-commit: 37d0ce42c689d3691824c92db81b9c7c9cd98479
Component: engine
2014-03-03 12:36:47 -08:00
d9902b0a95
fix(api): serve until the "acceptconnections" job
...
This fixes a bug that I encountered when using socket activation with
docker 0.8.1. When running the first `docker run` it would return:
"create: command not found".
The root cause was the socket activation code path was starting to
listen before the "initserver" job had finished. This meant that the
"create" handler hand't been registered yet leading to the command not
found error.
In log format it looks like this:
```
[/var/lib/docker|9d2e78e9] +job initserver()
2014/03/01 04:05:35 Listening for HTTP on fd ()
[/var/lib/docker|0d71c177] +job create()
create: command not found
[/var/lib/docker|0d71c177] -job create()
[/var/lib/docker|0d71c177] +job acceptconnections()
[/var/lib/docker|0d71c177] -job initserver() = OK (0)
```
To fix the issue select on the activationLock and block until the
"acceptconnections" job has ran.
Docker-DCO-1.1-Signed-off-by: Brandon Philips <brandon.philips@coreos.com > (github: philips)
Upstream-commit: 8d2226b7e5a5d5334f80d3ec03313fe2cd3210a3
Component: engine
2014-03-01 10:55:36 -08:00
9a5ac39c28
Support json output in --format flag of docker inspect
...
Docker-DCO-1.1-Signed-off-by: ILYA Khlopotov <ilya.khlopotov@gmail.com > (github: khia)
Upstream-commit: e07920f680a829724f617819f0c5715ed9b5194a
Component: engine
2014-02-28 17:34:31 -08:00
d1105407b3
Add ability to force removal of running container via docker rm -f
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: d78fcb32ffd4736462792407abe734b51b81367a
Component: engine
2014-02-27 23:31:36 -05:00
