26d6511511
Merge pull request #3324 from roylee17/enhance-docker-top-err-msg
...
docker-top: improve error message for non-running containers
Upstream-commit: 7ec1236cee1323afaa4c5dd95130b6e81d172f26
Component: engine
2013-12-23 17:15:37 -08:00
7878ada020
Merge pull request #3327 from shykes/pkg-graphdb
...
Move utility package 'graphdb' to pkg/graphdb
Upstream-commit: 2b4bb67ce00a2202c01e0bfbfd34ea08e6c1a923
Component: engine
2013-12-23 16:33:11 -08:00
5587d7db10
Merge pull request #3304 from vieux/prevent_orphan_deletion
...
Prevent orphan in docker rmi
Upstream-commit: b75f385abda358fe6bdb3516da4423bd72a2b253
Component: engine
2013-12-23 15:44:46 -08:00
10227320c8
Move utility package 'graphdb' to pkg/graphdb
...
Upstream-commit: d16d748132330ff58e142472a579d1f6c65e3eac
Component: engine
2013-12-23 23:33:06 +00:00
c952ec0ff7
docker-top: improve error message for non-running containers
...
Signed-off-by: Tzu-Jung Lee <roylee17@gmail.com >
Upstream-commit: b1a3a5580285b58d643ff0c09c263f78d1088f37
Component: engine
2013-12-23 14:50:24 -08:00
bfdf325ac2
prevent orphan
...
Upstream-commit: 8dcca2125a2176924ea9d816214d88b8b6450bf2
Component: engine
2013-12-20 16:26:02 -08:00
9e800ce4e1
Add arch/os info to user agent (Registry)
...
Upstream-commit: e4561438f1156a96ee7fd2e25a8b9e6a3831fa83
Component: engine
2013-12-20 08:19:25 -08:00
cf1704f27a
Merge pull request #3064 from tianon/custom-dockerinit-path
...
Allow custom dockerinit path
Upstream-commit: 636dfc82b0c9aaddd5b0f5fb0f70797d5068c93e
Component: engine
2013-12-19 14:31:41 -08:00
5f28e84d16
Merge pull request #3128 from codeaholics/1530-improve-error-message
...
Improve error message when refusing to remove image due to multiple repo tags
Upstream-commit: 70c7220a990ba522a12baed8d8c7aa06af7f8547
Component: engine
2013-12-17 20:49:25 -08:00
bc4bacc415
Merge pull request #3168 from discordianfish/2464-replace-lxc-ps
...
Reimplement lxc-ps
Upstream-commit: d9a1cc7e2beb9a8956ed97328a945868db107f52
Component: engine
2013-12-17 09:06:52 -08:00
fe64f8a242
Improve error message when refusing to remove image due to multiple repo tags
...
Upstream-commit: c3705e83e7eac1e67dbb9c6fc354063bbe43eae6
Component: engine
2013-12-17 12:34:25 +00:00
c79738b3bc
Add dockerinit SHA1 and path to "docker info" when debug mode is enabled
...
Upstream-commit: f02d766f9a93bf86c6473eb2772bc239ffaa1cd6
Component: engine
2013-12-16 22:29:05 -07:00
8986c6ae1a
Allow untag operations with no container validation
...
Upstream-commit: 62213ee314d0669a278fae1e3052329f4ca35f75
Component: engine
2013-12-16 13:29:43 -08:00
d5accda95c
Reimplement lxc-ps
...
Instead of calling lxc-ps in top endpoint, we reimplement it by
calling ps and filter for pids running in a given container.
Upstream-commit: 4faba4fae78ab216f2cfd90b1ef23706d933b731
Component: engine
2013-12-16 13:30:35 +01:00
3e3c1af9cc
add GetenvInt64 ans SetenvInt64
...
Upstream-commit: 85b9338205da0c8f1d62f277db342cf4b9feaf13
Component: engine
2013-12-13 16:29:22 -08:00
77daf141f4
move docker info to the job api
...
Upstream-commit: 51e2c1794b50295607c6eddb29edf39d40816a88
Component: engine
2013-12-13 16:15:15 -08:00
3589bae2ee
improve GetenvJson
...
Upstream-commit: d5f5ecb658c7a6a0f04939061494c9d404d393ce
Component: engine
2013-12-13 16:02:19 -08:00
f8c4f98d81
use args
...
Upstream-commit: 4b5ceb0f24285718620465bb4073269d6fb8097b
Component: engine
2013-12-13 14:29:27 -08:00
3eb9010924
move commit to job
...
Upstream-commit: 930ec9f52ceceabcb72589ac7f20e1e8bbccbed5
Component: engine
2013-12-13 14:19:56 -08:00
3c2d9ba7fe
Merge pull request #3175 from vieux/engine-job-stop
...
Move stop to job
Upstream-commit: aaa1c48d243e693b29bc52e382e3c37637c8bc3c
Component: engine
2013-12-13 14:15:58 -08:00
9575d9c5e7
move resize to job
...
Upstream-commit: 73e8a39ff219833ebb28c12dc318466e3551b5bd
Component: engine
2013-12-13 13:15:39 -08:00
5570b7b013
Merge pull request #3185 from vieux/job_tag
...
Move tag to job
Upstream-commit: 8224e13bd25a41c3e3d8755edd3a754cd060adee
Component: engine
2013-12-12 17:02:39 -08:00
07befa45fc
move tag to job
...
Upstream-commit: e43ff2f6f2630f971c9494aed285f1d410e42df9
Component: engine
2013-12-12 11:52:11 -08:00
4c119b77b9
Merge pull request #3144 from codeaholics/643-stale-nfs-handle
...
Prevent deletion of image if ANY container is depending on it; not just running containers
Upstream-commit: 1124261158721f5db51b4da6ea77a7d3c51ff82a
Component: engine
2013-12-11 17:18:54 -08:00
c49a4958ea
move t from arg to env
...
Upstream-commit: 6ba456ff87cfe2687db7df896e2983636ca9fe1e
Component: engine
2013-12-11 15:36:50 -08:00
342605f90e
Engine: new command 'stop' gracefully stops a container.
...
Upstream-commit: dbe1915fee1beb034459fb875928c96e27ecbfce
Component: engine
2013-12-11 11:52:59 -08:00
d332e70646
Merge pull request #3153 from vieux/improve_docker_push_display
...
Update docker push to use new display
Upstream-commit: bd292759f03688cfa22f885572cae6e5cbfc4d77
Component: engine
2013-12-11 11:11:53 -08:00
5cde259caa
Merge pull request #2735 from shykes/engine-job-kill
...
New engine command: 'kill'
Upstream-commit: 5fd3c8204de3a8188097add6a75ca70536e1375a
Component: engine
2013-12-11 10:35:57 -08:00
f1ea4ce449
Merge pull request #3113 from shykes/engine-export
...
Move 'docker export' to the engine API
Upstream-commit: 0025e9bd719b1cd8314543019ed8e6f6bc5c57cd
Component: engine
2013-12-10 13:28:24 -08:00
879ab073ea
update docker push to use [====> ]
...
Upstream-commit: 95f061b408eafbf981450d3fdb26ebc3188cba4a
Component: engine
2013-12-10 10:57:16 -08:00
8644761a3b
Merge pull request #3119 from shykes/engine-version
...
Port 'docker version' to the engine API
Upstream-commit: 09d2c2351c4b016d57f979990698838a94173ec4
Component: engine
2013-12-09 17:35:44 -08:00
dbd21cfe22
Prevent deletion of image if ANY container is depending on it; not just running containers
...
Upstream-commit: 776bb43c9e97824a2cb05353c68ef5645f3cc112
Component: engine
2013-12-09 20:46:21 +00:00
707fb0bfad
Port 'docker version' to the engine API
...
Upstream-commit: de35b346d17ef86ef091e1736575c60c41fc3771
Component: engine
2013-12-08 07:41:53 +00:00
d8d9197f34
Cleanup version introspection
...
* Unify version checking code into version.go
* Make 'version' available as a job in the engine
* Use simplified version checking code when setting user agent for registry client.
Upstream-commit: 869a11bc93c4b5dc9dbd74d65e69045f367bdb36
Component: engine
2013-12-08 07:35:24 +00:00
34b1795f6e
Engine: 'export' returns a raw archive of a container's filesystem
...
Upstream-commit: 9656cdf0c248fda629fe9f13cf4ce4d3fabd35a4
Component: engine
2013-12-08 01:33:37 +00:00
d007e15eed
New engine command: 'wait'
...
Upstream-commit: 3569d080afc721a1eb04ad4a65f1309b53da1238
Component: engine
2013-12-06 23:05:21 +00:00
17c91d08c7
Engine: port 'kill' to the new integer status.
...
Upstream-commit: 427bdb60e73ad059e813babd981168ea2464ea1f
Component: engine
2013-12-06 23:02:27 +00:00
4c9354ea8f
gofmt
...
Upstream-commit: 9b1930c5a07fe3f696ec54f5d429b8020cc9086f
Component: engine
2013-12-06 23:02:27 +00:00
18f68039b6
Engine: new command 'kill' sends a signal to a running container
...
Upstream-commit: fdb3de7b11e4b85ec86f76aad51290730c037668
Component: engine
2013-12-06 23:02:27 +00:00
1181340954
wait on pull from another client
...
Upstream-commit: fb810b54ff404e81bd2486a944e24583a55fe8bf
Component: engine
2013-12-05 14:41:56 -08:00
f1ec7415d1
Merge pull request #2917 from codeaholics/2698-only-tag-top-layer
...
Only tag the top-most layer when pushing to a registry
Upstream-commit: a8e99d923507e245f933599c94a061bfdc375452
Component: engine
2013-12-05 10:02:57 -08:00
3f773fbd23
Merge pull request #2966 from andrewsmedina/govet2
...
fixed some `go vet` issues.
Upstream-commit: 5f55c1aee1a6acdce35f5d7be776104d66e44483
Component: engine
2013-12-04 17:57:10 -08:00
0624a140ec
fix offline image transfert
...
Upstream-commit: be282b57d561bdb7e686ed8d4f7b6327e7a65b70
Component: engine
2013-12-04 11:55:42 -08:00
8eac8d89db
remove unused parameter in Download
...
Upstream-commit: 12180948be8040a4cdf99a0e660098cd33e32832
Component: engine
2013-12-04 11:54:11 -08:00
37888fa7b4
Use basic auth for private registries when over HTTPS.
...
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
Upstream-commit: 045989e3d824f577cd90a6386b66a5814e703766
Component: engine
2013-12-03 16:32:13 +01:00
f20cc21995
Merge pull request #2957 from creack/handle_sigquit
...
Catch SIGQUIT for cleanup
Upstream-commit: 67c03552f65e912550295e1dfc9498055ddd3ac9
Component: engine
2013-12-02 12:13:07 -08:00
92e4ac1dc3
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
Upstream-commit: e1414a4c3999362c97ad66ed1dd9cd64678df9af
Component: engine
2013-12-02 10:31:09 -08:00
9ddc2663be
Merge branch 'master' into handle_sigquit
...
Conflicts:
server.go
Upstream-commit: 4e030c78d21f01c3b15e0f360ab7ffcf53918bea
Component: engine
2013-11-29 18:51:32 -08:00
26d7cf1b0c
fixed some go vet issues.
...
Upstream-commit: a6c9a332d040a98c5cf4325491fc8d9aa7e5475b
Component: engine
2013-11-29 22:53:20 -02:00
b0f24a88da
Engine: integer job status, improved stream API
...
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
Upstream-commit: a4f8a2494b0fb755db52c68cf61ddc8ff52d2965
Component: engine
2013-11-30 00:25:46 +00:00
