Commit Graph

507 Commits

Author SHA1 Message Date
bd5fa21461 add docs
Upstream-commit: a97cf23355e661d0336a71b5225ad463efa41297
Component: engine
2013-08-05 11:07:27 +00:00
6b62e3168d Merge pull request #1298 from crosbymichael/1246-auth-request
* Registry: Do not require login unless 401 is received on push
Upstream-commit: 4dcc0f316c6dbcad3932b483ad0946a4b7d526cc
Component: engine
2013-08-02 17:39:54 -07:00
3029f070e6 Return JSONError for HTTPResponse error
Upstream-commit: dae585c6e4c19817b2dbd106171728a0bb564ccc
Component: engine
2013-08-03 00:27:58 +00:00
f9de212d00 Merge pull request #1384 from crosbymichael/1326-build-without-cache
* Builder: Add no cache for docker build
Upstream-commit: ead7eb619ed5a60a5ffab62827aa4a3c761504e8
Component: engine
2013-08-02 14:38:34 -07:00
ac12d9b409 Add no cache for docker build
Add a new flag to disable the image cache when building images.
Upstream-commit: 3a123bc479457c4dfa14e39b7c42d9a9dccf8c32
Component: engine
2013-08-02 16:18:54 +00:00
6241318046 rebase master
Upstream-commit: 108635582f410c4c767f0e49f4b772a9208e12da
Component: engine
2013-07-31 15:32:08 +00:00
7aa4663949 Return registy status code in error
Added Details map to the JSONMessage
Upstream-commit: 3043c2641990d94298c6377b7ef14709263a4709
Component: engine
2013-07-30 23:24:31 +00:00
ccc9b252b2 Merge branch 'master' into add_last_version-feature
Upstream-commit: 99c27fa0ddf6db7eb8a1b9484ea6ad19c0b2e4f5
Component: engine
2013-07-30 16:23:06 +00:00
d8352677c8 Merge branch 'master' into 1237-improve_docker_top-feature
Upstream-commit: 0b57e4483a13a3c4ddf0c74d531d714f199e191d
Component: engine
2013-07-30 11:51:16 +00:00
915bf69673 Merge branch 'cleanup_signal_handling' of https://github.com/calavera/docker into calavera-cleanup_signal_handling
Upstream-commit: c99e8de5a4faeb6c3d696790cc300a88f8e96855
Component: engine
2013-07-30 11:14:36 +00:00
4dd9531b17 Keep the loop to allow resizing more than once.
Upstream-commit: 10e37198aa14cb3192fd0bf29572a5dce58c348f
Component: engine
2013-07-29 11:13:59 -07:00
4b37d9ec34 Remove unnecessary signal conditional.
Upstream-commit: c8ec36d1b9bfbe1e22acd0124409ecb5a109d406
Component: engine
2013-07-29 10:28:41 -07:00
86b74909af Remove unused argument.
Upstream-commit: 88b6ea993d76fb8891ee7a7fa8828b5c5753c7f5
Component: engine
2013-07-27 10:17:57 -07:00
fba18c65a3 Do not show empty parenthesis if the default configuration is missing.
Upstream-commit: d4f70397930b15c8860a71df1abb9bc5ac9ab4ff
Component: engine
2013-07-27 10:00:36 -07:00
8ad99ad99c Merge pull request #1288 from dlintw/1286-improve-import-txz-description
Fixes #1286 improve-import-txz-description
Upstream-commit: 9cc8b72a38491efbaf86f3d13689bc13ef74d32d
Component: engine
2013-07-25 12:37:37 -07:00
c0c3fbc7b6 Fixes #1286
Upstream-commit: 8f6b6d57840410d1491321d7681ef2a946e90bc9
Component: engine
2013-07-25 15:36:32 +08:00
7907b8ec17 Merge pull request #1277 from dotcloud/add_commands_unit_tests
* Tests: Reimplement old Commands unit tests in order to insure behavior
Upstream-commit: 6ae3305040346083c4b17997e706e7b364c33910
Component: engine
2013-07-24 15:24:51 -07:00
743adaf705 add kernel version
Upstream-commit: 6057e6ad70ba4550df358e89b9a7e1da61666604
Component: engine
2013-07-24 13:36:55 +00:00
8d3c08d3c7 bump master
Upstream-commit: ca39f15fa3285e86660cc66d2c3e446e12c9ce86
Component: engine
2013-07-24 13:28:01 +00:00
5780ce867e bump master
Upstream-commit: 4bc3328e807802d77c1cdb1381d5dadf44daa6db
Component: engine
2013-07-24 12:18:53 +00:00
600442316a Reimplement old Commands unit tests in order to insure behavior
Upstream-commit: bc823acc255a786b00a7b2759b67fd7b3256fce3
Component: engine
2013-07-23 17:27:49 -07:00
012e944035 add since for polling, rename some vars
Upstream-commit: 2e4d4c9f60d0ad92ab0cc84c56c060678222c4db
Component: engine
2013-07-23 15:41:19 +00:00
d1efb7843b basic version of the /events endpoint
Upstream-commit: b5da816487d68853a8ac46630cb3118646f71d2d
Component: engine
2013-07-23 15:41:19 +00:00
001001e211 change dockercfg to json and support multiple auth remote
Upstream-commit: 3bae188b8dc51911a44ea1c7b5681f9f07f9d3af
Component: engine
2013-07-23 15:07:18 +00:00
2e339a6cec Merge branch 'master' into 1237-improve_docker_top-feature
Conflicts:
	docs/sources/api/docker_remote_api.rst
Upstream-commit: c81662eae473e2b35e4e449be18cc6dfda07e4ec
Component: engine
2013-07-22 16:22:11 +00:00
7d9d3be422 fix error message when invalid directory
Upstream-commit: 74a2b13687787a33b0963f020f704d3cdde4b06d
Component: engine
2013-07-22 14:52:05 +00:00
52d2580351 Updated the stop command's docs.
Upstream-commit: 1d02a7ffb63915055f5fd9bda420bd08a8679da1
Component: engine
2013-07-21 19:00:18 -04:00
744c5e7658 add LXC version to docker info in debug mode
Upstream-commit: 921c6994b1ad41c940bdb08732225b8db74b68f2
Component: engine
2013-07-19 16:36:23 +00:00
c5cd9cfc76 Merge pull request #1211 from dotcloud/new_logs
*Runtime: Logs are now synchronised
Upstream-commit: 0bd534adcf0933d19540506f790d00d8d1cb23d4
Component: engine
2013-07-19 06:43:29 -07:00
1b1ac70ce1 create the cidfile before creating the container
This change makes docker attempt to create the container ID file and
open it before attempting to create the container. This avoids leaving
a stale container behind if docker has failed to create and open the
container ID file.

The container ID is written to the file after the container is created.
Upstream-commit: 25be79208a1473a65be883989ae49b7c71081a83
Component: engine
2013-07-19 16:03:45 +03:00
3498daf9b5 add support for container ID files (a la pidfile)
Upstream-commit: 64e74cefb746caa7f2a581149bbd523dd1ac9215
Component: engine
2013-07-19 16:03:45 +03:00
37e3d486fa add ps args to docker top
Upstream-commit: cfec1c3e1b88ceeca73144198df7a210ed3dc421
Component: engine
2013-07-19 10:06:32 +00:00
9c8c35f4bd handle -dev
Upstream-commit: 0afed3eded0950b5899729714fb11d6a7322301e
Component: engine
2013-07-18 20:56:41 +00:00
0089cd0195 Merge branch 'master' into add_last_version-feature
Upstream-commit: 39ff542142e61dd9041925ad95fbac23be307414
Component: engine
2013-07-18 20:51:31 +00:00
325ed80b66 switch version to -dev
Upstream-commit: 0089dd05e910852d5b821074c73287e730040630
Component: engine
2013-07-18 20:50:04 +00:00
d7ec6adcd6 Merge pull request #1227 from dotcloud/bump_0.5.0
Bump to 0.5.0
Upstream-commit: 51f6c4a7372450d164c61e0054daf0223ddbd909
Component: engine
2013-07-18 11:51:29 -07:00
e1b72763dc add debug and simplify docker logs
Upstream-commit: 1b0fd7ead33722d8782634d54cbd797f284aa085
Component: engine
2013-07-18 13:29:40 +00:00
2b2f5cce76 Merge pull request #1194 from crosbymichael/build-verbose
* Builder: Add verbose output to docker build
Upstream-commit: de563a3ea372432acb39e711eeb0b43296754c39
Component: engine
2013-07-17 12:53:06 -07:00
aa3ed33e67 Merge branch 'master' of https://github.com/kencochrane/docker into kencochrane-master
Upstream-commit: f310b875f8972870e87e4395b5dbd8613b66fa39
Component: engine
2013-07-17 19:23:06 +00:00
28398dc429 updated with notes from @vieux
Upstream-commit: d0e8ca1257f7f969a035d3d78b55e08c067e8a20
Component: engine
2013-07-17 13:46:11 -04:00
df2dfb45a8 Merge -b and -v options
Upstream-commit: eefbadd230d2788b0bdf0daac38ada0d145e3861
Component: engine
2013-07-15 17:51:32 -07:00
723f4f9ef0 Bump version to 0.5.0
Upstream-commit: bc21b3ebf0dadc51e47d971217d132e5299831a0
Component: engine
2013-07-15 14:57:52 -07:00
f649b0a057 updated the help commands on a few commands that were not correct
Upstream-commit: 4174e7aa7a6600a2cfedd1c568000556cf1daf79
Component: engine
2013-07-12 13:55:26 -04:00
c8bc9a992c Fixed tag option for "docker pull" (the option was ignored)
Upstream-commit: cd0fef633c5d871b192146e405ca7c5bebb2f3ba
Component: engine
2013-07-12 10:42:54 -07:00
5d09c440fb Merge pull request #977 from dotcloud/966-improve_docker_login_parameters-feature
* Client: Add options to docker login to be able to use it via script
Upstream-commit: 752f99e8a18a5e16f2a93b0fac1984b3a4412346
Component: engine
2013-07-12 05:07:25 -07:00
a1035172cd Merge pull request #1192 from dotcloud/docker_port-fix
hotfix: fix broken docker port
Upstream-commit: 8ff271fc742f21c4532f469e06e9f48498f23e8e
Component: engine
2013-07-12 04:57:53 -07:00
c22c23bfc2 Merge branch 'master' into list_container_processes-feature
Upstream-commit: 9232d1ef62b6be8979052599625af8a71227662c
Component: engine
2013-07-12 11:47:27 +00:00
18c42253ef use http://get.docker.io/latest
Upstream-commit: e9011122fbc4c65afe235a75ca8197ce4fd23753
Component: engine
2013-07-12 11:45:40 +00:00
015f243412 Add verbose output to docker build
Verbose output is enabled by default and
the flag -q can be used to suppress the verbose output.
Upstream-commit: 474191dd7bca9eedaccb9de1771eecfce7dfebbb
Component: engine
2013-07-11 15:27:33 -09:00
5d58cdd260 change output
Upstream-commit: 976428f505b64a51efbd97f71acff5db2f4f5ed0
Component: engine
2013-07-11 21:04:23 +02:00