Commit Graph

275 Commits

Author SHA1 Message Date
6a5005c54d Merge pull request #7716 from coolljt0725/master
Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'
Upstream-commit: 7556a4245364277f5747149c096a23ae6731fb4a
Component: engine
2014-08-25 15:11:50 -07:00
8270e6cad2 Fix the bug of docker import command when import a image with a tag use format 'URL|- [REPOSITORY[:TAG]]'.Fixes #7714
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 79cf8395277002011b7632e5a040d4f4a7a25d1f
Component: engine
2014-08-26 15:51:22 +08:00
87669d6e48 daemon: rename from "delete" job to "rm"
This commit fixes following FIXMEs:

// FIXME: rename "delete" to "rm" for consistency with the CLI command
// FIXME: rename ContainerDestroy to ContainerRm for consistency with the CLI command

Signed-off-by: lim seong yeol <seongyeol37@gmail.com>
Upstream-commit: 239e932485c3e0f72a4f88ce1301ebe269eb2e27
Component: engine
2014-08-21 19:58:26 +09:00
9df494bb71 another commit to do like @crosbymichael
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: a0392324f194f4f92e3205f0c0ed8b71dc2fc93f
Component: engine
2014-08-14 01:36:26 +00:00
0bb709c134 remove double newline
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: fcf37be2b1efa11da1958658da0e04755a225c89
Component: engine
2014-08-14 01:08:27 +00:00
4737f7cea5 Extract log utils into pkg/log
Docker-DCO-1.1-Signed-off-by: Josiah Kiehl <josiah@capoferro.net> (github: capoferro)
Upstream-commit: a02f67be5b17da63d475e6f35956c1e72c3b2e7b
Component: engine
2014-08-13 15:18:15 -07:00
fc0d245526 Move remote API config out of daemon/
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 1d10c55aec891df609d36c90ee6c30adb24c16c4
Component: engine
2014-08-13 19:25:51 +00:00
8bd8c43b79 Helpers to parse lists, IPs, hosts, dns searches from the command line
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 6200002669874f3314856527fecd0c004060913c
Component: engine
2014-08-13 19:25:47 +00:00
779c425729 Merge pull request #6162 from vbatts/vbatts-ps_filter
docker ps: introducing filters
Upstream-commit: c9c271858a652583ba548cb2ea75df68b51a9dd3
Component: engine
2014-08-13 11:44:48 -07:00
acbbac3aa0 docker ps: introducing filters
* starting with filtering for exit codes. `docker ps -a --filter 'exited=1'`
* API doc for filter parameter
* formatting filters for help usage
* tweaks for review

This requires https://github.com/dotcloud/docker/pull/4430

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 84146719d8b8322e302e7a0250fe8a3ee1a4edcd
Component: engine
2014-08-13 09:12:33 -04:00
d27f6d0c6d Remove deprecated server/ package
Victory!

Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 63503cafe4addb7d275244fbcce0e10d67225cc9
Component: engine
2014-08-13 06:56:45 +00:00
c9eb513960 Merge pull request #7507 from shykes/cleanup-tiny
Cleanup: tiny little things
Upstream-commit: 57e0cbb991783f3b5a6b24afe6c5978cd9839a01
Component: engine
2014-08-11 12:41:17 -07:00
bb524e6e8b Fix log message on http handler error
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: e9aa6489a640c6fb2d51bd07e481b9d6ab704290
Component: engine
2014-08-10 13:30:22 +04:00
301a2b811c Rename a method for clarity
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: a110ce2f284d09df3e047b1999a1535770433d5f
Component: engine
2014-08-10 04:33:19 +00:00
b7e1bdfc34 Move declaration of DockerCli to top of file for readability
Signed-off-by: Solomon Hykes <solomon@docker.com>
Upstream-commit: 5e9b3727b8f5d101b7b1f859d4f95fdf8e91ed19
Component: engine
2014-08-10 04:31:59 +00:00
a79d7ec92b Revert rm -f deprecation use SIGKILL instead
`rm -f` was originally deprecated in favor of `rm --stop/--kill` since `rm
-f` was sending SIGTERM and potentially very slow.
Instead this will bring back `rm -f` but use SIGKILL isntead

Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: 95f86da641dfec9b3db88e0f0a8457685361a871
Component: engine
2014-08-07 18:20:43 -04:00
93ad6fba3d Check content type along with content length
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 8266c381d62a0790c489e27cc93ed8f4618d03c7
Component: engine
2014-08-01 15:59:19 -07:00
22a66332f2 Return error for bad content-type
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 78ac75fe00669f8d24ecab3273d47e805963e4d3
Component: engine
2014-08-01 15:26:30 -07:00
5860a921ea Move "changes" to daemon/changes.go
This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)

Fix issues with renaming changes to container_changes
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: 49e61f62ced4e111071cf9439e3264f06b008c6c
Component: engine
2014-08-01 14:24:46 -04:00
7de8df549d Move "delete" to daemon/delete.go
This is part of an effort to break apart the deprecated server/ package

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)

Fix issues with renaming container_delete to delete
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: cc39d579f50b67617388117e5afbb47351b59337
Component: engine
2014-08-01 14:24:28 -04:00
76040cafd8 Update package for repo and tag parser
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 63a4ba229cd3da6ce7bc52e6b9f78d9cd631398d
Component: engine
2014-07-31 18:19:30 -07:00
574263662b Fix getImagesJSON output for api less than 1.7
Tag can be a number, like centos:6.4, and so must be handled like a
string otherwise will lose quotation marks when converting to json
and the client (API < 1.7) will try to convert to int, failing
because the type is string. Additionally using ParseRepositoryTag to
parse repository names to split the tag because an URL can have : and
so more than one occurrence of : can be found on repository names.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 103ae23504b9fdc52e4f7d4a50798553af09bfe5
Component: engine
2014-07-31 18:15:16 -07:00
85222943a2 Merge pull request #7312 from tianon/update-libcontainer
Bump libcontainer dep
Upstream-commit: b1496effe37ef6161faf0b4e987f4261329c0a66
Component: engine
2014-07-31 15:20:07 -07:00
604012d742 Fix .dockerignore when ignoring unreadable dirs
The initial `ValidateContextDirectory` implementation fails loudly when a file
lacks read permissions in the current context. However that situation is valid
if the file is included in the `.dockerignore` patterns.

Docker-DCO-1.1-Signed-off-by: Bruno Renié <brutasse@gmail.com> (github: brutasse)
Upstream-commit: 27cca4c70cc7f0cccfda693ca7bbb2422eec3e13
Component: engine
2014-07-31 15:10:56 -07:00
0a4008fdb8 Remove pkg/user now that it's embedded in libcontainer
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: f34d0e55f3a1f15abf28680d84ab48d40ffafbc1
Component: engine
2014-07-31 12:46:39 -06:00
ca4826fd77 Add OS to docker info
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: b0fb0055d279bc25aa2f91c112929ea8eb92c1db
Component: engine
2014-07-30 10:37:52 -04:00
e25f77248d Move parsing functions to pkg/parsers and the specific kernel handling
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 4398108433121ce2ac9942e607da20fa1680871a
Component: engine
2014-07-29 13:09:10 -07:00
6ae4c9014c update go import path and libcontainer
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: b3ee9ac74e171e00f14027e39278013629e681b8
Component: engine
2014-07-24 22:19:50 +00:00
951216bd40 Add missing error check
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@docker.com> (github: nathanleclaire)
Upstream-commit: a1c5f268e5465e0b3cdb4e2a47c0ade3de7988c0
Component: engine
2014-07-22 10:41:58 -07:00
0bdbb48e10 Merge pull request #7104 from mheon/sigproxy_docs
Update docs on --sig-proxy
Upstream-commit: 61b675d3bb6a645f7f4683253f78f0f9ddfe5a22
Component: engine
2014-07-21 13:42:41 -07:00
3d4e2246d3 update style
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 56a39ca5d3010785e3b4be849c6b13c69a23721d
Component: engine
2014-07-18 17:52:24 +00:00
be50882dfa fix doc references
Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: 4b5b3b43212c0a1883c56321aedbffc605be31f9
Component: engine
2014-07-18 17:45:25 +00:00
ee146b71d5 Add logout command
"docker logout [SERVER]" will remove the registry server' credentials from
.dockercfg file. If a server is not specified, it will log user out of the
default docker registry server

Docker-DCO-1.1-Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com> (github: dqminh)
Upstream-commit: 06bc4e07529a93abede35ea8fcc2906c5963f2a3
Component: engine
2014-07-18 17:42:49 +00:00
638498458f Update docs on --sig-proxy to indicate that SIGKILL and SIGSTOP cannot be proxied
Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 31351d08a35b2c903a2b6407bea09ccf1449e79c
Component: engine
2014-07-18 12:32:04 -04:00
b18fd72d71 Merge pull request #7083 from mheon/6983_bugfix
Fix Panic with -t and -a stderr
Upstream-commit: 5948b105e7dcc7428e9525ccb44d543169b47a6e
Component: engine
2014-07-17 18:41:24 -07:00
e650e69f7d Bugfix: only use io.Copy in hijack if attaching both stdout and stderr
Add regression tests to ensure issue is fixed.

Docker-DCO-1.1-Signed-off-by: Matt Heon <mheon@redhat.com> (github: mheon)
Upstream-commit: 1476f295aca20e1c35383c133219d54a5373183f
Component: engine
2014-07-17 13:47:33 -04:00
19a14797ac Added info re: image[:tag] to make docs consistent. Fixed a markdown issue.
Closes issue #6833

Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: 41d6ab6318cc2c8905a174ed28a78dfcad06cef5
Component: engine
2014-07-16 16:39:44 -07:00
41c1e3bafe Merge pull request #6991 from bobrik/empty-dockerignore
Skipping empty lines in .dockerignore
Upstream-commit: 1583e7af416d5c1ff4b99c59f92a953d1ed0ac25
Component: engine
2014-07-16 10:46:38 -07:00
bd79f253bc api/server/MAINTAINERS: comment proppy (vacation)
Docker-DCO-1.1-Signed-off-by: Johan Euphrosine <proppy@google.com> (github: proppy)
Upstream-commit: 32740543daf889388662a963d8a61b1096e75693
Component: engine
2014-07-14 10:13:46 -07:00
f47a491cb1 Skipping empty lines in .dockerignore
Docker-DCO-1.1-Signed-off-by: Ian Babrou <ibobrik@gmail.com> (github: bobrik)
Upstream-commit: 1a1ee73e38eb54f9b5a3fd03f98c4bb80dde1bbb
Component: engine
2014-07-12 13:38:33 +04:00
3853ef9c11 Add tests for rm with stop and kill options
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: d689a5e1e2633b5fd0db4ccccfb4969e03ae256b
Component: engine
2014-07-11 23:26:08 +00:00
ceab494147 Stop/Kill options for containers removal
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 78100706303efdf9a3deee0239a7dbb3a93837ec
Component: engine
2014-07-11 23:26:08 +00:00
067d7ed315 Merge pull request #6896 from vieux/add_parsing_deamon_side
Add repo/tag parsing on the daemon for pull and import
Upstream-commit: d53db040c867403e76915459eafbb5d7fd1d2887
Component: engine
2014-07-12 01:44:32 +03:00
c1e9ed3e53 Merge pull request #6985 from vieux/fix_api_1.14
bump api to 1.14 & update docs 
Upstream-commit: 00c1668011d26245e73f9faeb5d461a925948b71
Component: engine
2014-07-11 15:35:25 -07:00
952492cc20 bump api to 1.14 & update docs
Docker-DCO-1.1-Signed-off-by: Adrien Folie <folie.adrien@gmail.com> (github: folieadrien)
Upstream-commit: 680e27d6ec7662462594fd5264a00c09bcb14da4
Component: engine
2014-07-10 03:24:01 +02:00
34b700c7bf Updated docker logs timestamp to RFC3339
Currently the docker logs timestamp flag generates log entries like:

    $ sudo docker logs -ft daemon_dave
    [May 10 13:06:17.934] hello world

It uses Go's StampMilli timestamp to generate the timestamp. The entry
is also wrapped in [ ].

This is non-standard operational timestamp and one that will require
custom parsing.

The new timestamp is RFC3999Nano and generates entries like:

    2014-05-10T17:42:14.999999999Z07:00 hello world

These are readily parsed by tools like ELK.

Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)

Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: aa0eca03e6662c5f6b4f0f47190a45f49b61e357
Component: engine
2014-07-09 11:59:06 -04:00
0544edc315 Add repo/tag parsing on the daemon for pull and import
Docker-DCO-1.1-Signed-off-by: Victor Vieux <vieux@docker.com> (github: vieux)
Upstream-commit: 714b63d1be55f468f0cb6b06c88924a941110175
Component: engine
2014-07-07 23:09:42 +00:00
f220709916 Convert TestGetImagesJSON into several unit tests
Docker-DCO-1.1-Signed-off-by: Guilherme Salgado <gsalgado@gmail.com> (github: gsalgado)
Upstream-commit: 627805f5f8895c3a3887c312f7b8f49a89e51732
Component: engine
2014-07-07 21:55:26 +02:00
1270978241 Merge pull request #6850 from leeplay/patch-2
Update README.md
Upstream-commit: 578513095c1f69227d7942d167fc41b6598d95ac
Component: engine
2014-07-07 11:50:27 -07:00
df92ffe131 Merge pull request #6702 from mrunalp/dev/helper_fns
Move setting hostConfig and pulling images into helper functions.
Upstream-commit: 35b511b6d092c80b206c63df7bcbf372cf96bdf3
Component: engine
2014-07-07 11:39:27 -07:00