Commit Graph

402 Commits

Author SHA1 Message Date
fa056c1bc9 Merge pull request #9201 from vieux/add_hostname_docker_info
Add hostname and ID docker info
Upstream-commit: 998b591a71094b3f0112dac9b0c35a93745ac28f
Component: engine
2014-11-20 13:11:16 -05:00
addb2d43fa Hostname -> Name
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 227f4bbdb3a1e9ff0011d1ebaed39b3cb19d9e75
Component: engine
2014-11-20 17:40:08 +00:00
4b4f9725e6 Update libtrust version
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6e92dfdfd843aec909572a405337efb25beb6f58
Component: engine
2014-11-20 17:39:54 +00:00
f35e467fb4 Merge pull request #9211 from mtesselH/login
Fixed a bug - no panic anymore when logining in without TTY
Upstream-commit: d4ca9e5cce2ff7e08750123609df1864e0befdcf
Component: engine
2014-11-19 17:52:35 -08:00
e390ce1d8e Merge pull request #9144 from miminar/sigproxy_tty
Corrected description of --sig-proxy
Upstream-commit: c7e6ad8e987d06385894ee8cd77fe2571ca9bb50
Component: engine
2014-11-19 14:52:01 -08:00
5660f63578 Merge pull request #8905 from 13W/x-registry-auth
allow to use x-registry-auth header with enabled cors
Upstream-commit: f676891192670df3e5c79c4612a86186329d658f
Component: engine
2014-11-18 17:21:22 -08:00
1b2e957b5a Fix steam where it should be stream.
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7fe8d0aeeb373a0fef92758819d8054fbd744ea5
Component: engine
2014-11-18 10:49:01 -08:00
16ad3a4d02 Fixed a bug - no panic anymore when logining in without TTY
Fixes #8956

Signed-off-by: Marianna <mtesselh@gmail.com>
Upstream-commit: e6fd57b90bcdd3b0105fa5c7d17a64332f829ded
Component: engine
2014-11-17 19:41:27 -08:00
5d1b12a860 Merge pull request #8993 from SvenDowideit/make-ps-size-docs-clearer
makes the -s --size option documentation clearer #8950
Upstream-commit: 882db5f8858f36e213feabda459e6b5e639c5c85
Component: engine
2014-11-17 17:42:27 -07:00
f066184384 add ID and Hostname in docker info
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 9a85f60c75f2017b14ed5e7f2bae5dc4961cb74c
Component: engine
2014-11-17 19:23:41 +00:00
deefafa9d6 Remove unused sysinfo parameter to runconfig.Parse
Removing dead code.

Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: e45b0f92711ff190cff4b61b2ea80cdd53203a16
Component: engine
2014-11-14 18:20:54 -08:00
2e7196248a Extract client signals to pkg/signal
SIGCHLD and SIGWINCH used in api/client (cli code) are not
available on Windows. Extracting into separate files with build
tags.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 91a86670aac52d916c81a818aff3dfcf445da83e
Component: engine
2014-11-14 18:20:53 -08:00
ba50e8beb2 Merge pull request #9108 from vieux/handle_redirects
handle GET redirects over HTTP
Upstream-commit: df603eb4e400f9ed4fa88d956f53ad80b244c376
Component: engine
2014-11-14 12:07:22 -08:00
7632ac2e44 use _, _ string
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 454f56e37eefd072e350739a6c5a06743ff913ef
Component: engine
2014-11-14 19:31:52 +00:00
bb5bcd8e79 Merge pull request #9131 from vieux/empty_lines_dockerinfo
Do not display empty lines in docker info if the key doesn't exists
Upstream-commit: 967354d48818eebf9ce706bbd4914a20a0375de8
Component: engine
2014-11-13 19:08:32 -08:00
f5a6597726 Do not display empty lines in docker info if the key doesn't exists
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4f5be9da86ffed40b810bb1840c19526a9156ab3
Component: engine
2014-11-14 02:50:34 +00:00
a56997089b Corrected description of --sig-proxy
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: e71f241c4b8006f097e4c63f7b3ea28d4591ddee
Component: engine
2014-11-13 10:50:06 +01:00
22cdb1d809 Cleanup:change latest to graph.DEFAULTTAG
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3c3968692d3024fde90637dbdfe56f08de100cdd
Component: engine
2014-11-13 16:21:34 +08:00
a7280b07fa update timeout
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 5fbfec333a90b86add1dcf6bd8d5fcb728d34cdf
Component: engine
2014-11-13 03:21:18 +00:00
4981609d4e Merge pull request #9031 from cpuguy83/cleanup_api_server_creation
Cleanup api server creation
Upstream-commit: e12572f265383fa64b84c2a13fb1c23abfd7335e
Component: engine
2014-11-12 15:37:34 -08:00
ad5fd5c082 fix unix socket
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 6ca144ef3d62e358327249546bf83ce1e347be5c
Component: engine
2014-11-12 00:37:58 +00:00
f37e910c9f handle GET redirects
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4b4ad26b977bba0b52f6ea15d08750a7453304a4
Component: engine
2014-11-12 00:37:58 +00:00
bbc96d66b4 Cleanup api server creation
Current implementation is hard to reason about because of trying to mix
unix/tcp server implementations, even though they are quite different.
This cleans that up.

Also makes it possible to create and manage a new API server easily,
e.g. for adding an introspection socket to a container.

Built in such a way as to allow a non-HTTP server to work as well, such
as libchan.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: dacae746b70f50dd1f3ea9d40834386b96b6c200
Component: engine
2014-11-10 16:20:35 -05:00
5ab5947fb6 *: transition to new libcontainer/user API
This patch fixes the compilation errors in Docker due to changes in the
libcontainer/user API. There is no functionality change due to this
patch.

Signed-off-by: Aleksa Sarai <cyphar@cyphar.com> (github: cyphar)
Upstream-commit: 3ac4aa0d6ba6cb10b9a46df40f18b81dba137840
Component: engine
2014-11-08 10:03:12 +11:00
a14eceb8d8 makes the -s --size option documentation clearer #8950
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 6dc11cc992531a2cf75666e417af7730a7f0764b
Component: engine
2014-11-07 11:56:56 +10:00
ab8d055502 Merge pull request #8345 from duglin/Issue5184
Add a better error message when we get an unknown http issue
Upstream-commit: b79211f4ae0f08975d02c5d51bb482f965d60a88
Component: engine
2014-11-04 20:07:41 -05:00
1a2c21becb Add a better error message when we get an unknown http issue
Closes #5184

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 6fdaa66652d65558d8225d58f3ac48904ebac1de
Component: engine
2014-11-04 16:46:41 -08:00
0e78b6c4a5 Merge pull request #8871 from tonistiigi/start-wait-hijack
Wait for hijack on docker start command
Upstream-commit: a34f31b488dce94314e3218e3d52c38747cabc2f
Component: engine
2014-11-04 08:46:56 -08:00
d3c1cd34ce Merge pull request #8739 from duglin/CleanupDockerIgnores
Do some cleanup on .dockerignore paths
Upstream-commit: a85f58719f29f76f465747d095c85dbb8ba69d06
Component: engine
2014-11-03 16:05:24 -05:00
118bb8077c Fix help text being incorrect with multiple args
E.g. "docker foobar run" would have printed "Command not found:
foobar" and printed the help text for "run". It should instead
print the root help message for docker.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: ef004ec03fe5aad33da7d53f196f16382c750d07
Component: engine
2014-11-03 16:46:01 +00:00
f115554d46 Do some cleanup on .dockerignore paths
While working on the fix for #8330 I noticed a few things:
1 - the split() call for the .dockerignore process will generate a blank
    "exclude".  While this isn't causing an issue right now, I got worried
	that in the future some code later on might interpret "" as something bad,
	like "everything" or ".".  So I added a check for an empty "exclude"
	and skipped it
2 - if someone puts "foo" in their .dockerignore then we'll skip "foo".
    However, if they put "./foo" then we won't due to the painfully
	simplistic logic of go's filepath.Match algorithm.  To help things
	a little (and to treat ./Dockerfile just like Dockerfile) I added
	code to filepath.Clean() each entry in .dockerignore.  It should
	result in the same semantic path but ensure that no matter how the
	user expresses the path, we'll match it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: c0f0f5c9887032c606750b645001829d9f14f47c
Component: engine
2014-11-02 11:29:46 -08:00
5e75202137 allow to use x-registry-auth header with enabled cors
Signed-off-by: Vladimir Bulyga <xx@ccxx.cc>
Upstream-commit: f12b7b4bc21ff6a64505909a9ba49107877d2ca4
Component: engine
2014-11-01 19:22:28 +03:00
4047c8a0da Merge pull request #8468 from laktek/master
Fix URL check in build from Git.
Upstream-commit: 9cc71b459771d0cbac51051410859fd878236920
Component: engine
2014-10-31 14:43:21 -07:00
4454d2b409 Fix docker exec command help messages
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d8b17d785a03246cb3a081223a0242469af7d410
Component: engine
2014-10-31 09:36:07 +08:00
79bfa611f5 Wait for hijack on docker start command
With current implementation there was a possibility
that /start responds quicker than /attach, meaning that
some output would be clipped.

Fixed so the implementation matches with `docker run`.

This also fixes the flaky test results for TestCreateEchoStdout.

Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
Upstream-commit: 79a77a396e003d0f5827c48d1b179f87c1542311
Component: engine
2014-10-31 01:13:31 +02:00
54a35eb340 Merge pull request #8198 from jfrazelle/add-jessie-to-various-maintainers
Adding self to various maintainers files.
Upstream-commit: f0327c99dd6fb7353d76726e0adb67a1b5a98451
Component: engine
2014-10-28 19:35:28 -07:00
ec0d91155f Merge pull request #8772 from aluzzardi/docker-info-mem-cpu
Expose # of CPUs and memory available on docker info.
Upstream-commit: eb1b785e67784ccc9b521566fbc1737d6177d9ad
Component: engine
2014-10-28 14:14:10 -07:00
5292cfbc42 Merge pull request #8743 from vieux/hostconfig_start
do not send hostconfig at start, as we do on create now
Upstream-commit: 339173dd5be7ec8807448f83622aa88561c445a6
Component: engine
2014-10-27 11:09:57 -07:00
6c8bda9fe4 Merge pull request #8770 from LK4D4/logrus_support
Logrus support
Upstream-commit: 15b6b7be010546f30d7eabd000167d428efc0b13
Component: engine
2014-10-27 09:05:24 -07:00
fdfe0c97e7 Add HasValidGITPrefix to utils/utils.go
This will allow us to use a common Git prefix check for both api/clients/commands.go and
builder/job.go. Previous prefix check in build from Git (in builder/jobs.go) ignored valid prefixes such as "git@", "http://" or "https://".

Signed-off-by: Lakshan Perera <lakshan@laktek.com>
Upstream-commit: d3ac9ea98e872fee808693c736bc5a465d6426e2
Component: engine
2014-10-26 03:25:25 +00:00
9609160b54 Merge pull request #8321 from erikh/ui_save_output
docker save: Do not save to a terminal.
Upstream-commit: 350e1b783d4deafbb62ede4d17df37dbaffa373a
Component: engine
2014-10-24 19:37:14 -04:00
e6c9b85c85 Expose # of CPUs and memory available on docker info.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: 61f8001c23dc4fbd7b1113f20b89a0dbade9aa82
Component: engine
2014-10-24 15:56:37 -07:00
2d56e3cbc6 Use logrus everywhere for logging
Fixed #8761

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 7c62cee51edc91634046b4faa6c6f1841cd53ec1
Component: engine
2014-10-24 15:03:06 -07:00
82b5bee9bb Bump API to v1.16.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: ca6cc6560987a87b8f3b4fe4c3c227d692c49117
Component: engine
2014-10-24 11:25:44 -07:00
ea99d5664f do not send hostconfig at start, as we do on create now
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 12028fc159c6c383b1b9e8810a7a41a7c6c985bc
Component: engine
2014-10-24 00:22:21 +00:00
2a7b8eaaa5 Fix error string mapping to HTTP response code to ignore case
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 9b430f4ec1083d2e73abe4269a85c8cdd91a5ade
Component: engine
2014-10-23 13:34:06 -04:00
1e4822a1da Merge pull request #8672 from estesp/CmdRun-fix-typos-comments
Clean up comment sections and fix typos in CmdRun
Upstream-commit: 25c32d3167b13e52001d63690dcca23a70097372
Component: engine
2014-10-22 14:32:39 +03:00
4be53dd15f Merge pull request #8661 from estesp/8555-start-exit-code
Return container exit code with start -a/-i
Upstream-commit: 95d1cd0bdead2a1a1d4e70d2f7259d7575761af6
Component: engine
2014-10-21 16:22:15 -07:00
d1d44d2d21 Merge pull request #8423 from unclejack/lint_changes
lint changes part 1
Upstream-commit: 9df3e45ba985a6ed7e9a07b308d56d694d1c13ad
Component: engine
2014-10-21 12:15:58 -04:00
e695413b13 Clean up comment sections and fix typos in CmdRun
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: d2cd8e77a6ce83fdfafd32828610e8cd3ed258eb
Component: engine
2014-10-19 02:47:53 -04:00