Commit Graph

448 Commits

Author SHA1 Message Date
3f3b1f9fb2 Merge pull request #3684 from crosbymichael/push-multiple-tags
Push multiple tags for repository
Upstream-commit: c2501942cfb5a169d40fd6e445e336ac3bc8c303
Component: engine
2014-01-20 15:24:53 -08:00
4963d0d960 Make sure new repositories can be pushed with multiple tags
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a2aab7757e236a895abf7b06836d8e3b84236429
Component: engine
2014-01-20 13:39:35 -08:00
c2c845ecd8 Merge branch 'fix-registry-push-tags' of https://github.com/codeaholics/docker into codeaholics-fix-registry-push-tags
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 03a25c0800691806534d96f108856097e9c18d6b
Component: engine
2014-01-20 11:23:09 -08:00
c8d1294225 Extract cgroups pkg.
Initial move before enhancing cgroups package.

Docker-DCO-1.1-Signed-off-by: Paul Nasrat <pnasrat@gmail.com> (github: pnasrat)
Upstream-commit: 2553029959929184696e25ebdba4631ba7aeb8a6
Component: engine
2014-01-20 14:15:44 -05:00
3a041a0663 Change drvier name to append version
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: cdfebc2a20e76d4ea81eb154b748e0547a7e7ab5
Component: engine
2014-01-17 17:42:58 -08:00
72a4c2e064 Rename Capabilities in sysinfo and move it to its own subpackage
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)

Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: crosbymichael)
Upstream-commit: 9e9f4b925b4b6a58a03bbff09150f1314d5fe3b2
Component: engine
2014-01-17 17:42:58 -08:00
695537a626 Update with lxc unconfined changes
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 93ead2fe789a3a94a8433b12efcca782e0a7d7de
Component: engine
2014-01-17 17:42:22 -08:00
5a3d223b61 refactor registers
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3ff5f2374cf7d68c0905840a571c521d79c7e091
Component: engine
2014-01-17 16:57:43 -08:00
58e92d3536 move top job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 812798a7d6659178300d00c470a19c7fe5e68d1c
Component: engine
2014-01-16 16:07:42 -08:00
ec9f60e58d move changes to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 90ec5de430a79ab6b145899a9842c1db968341cf
Component: engine
2014-01-15 17:13:45 -08:00
d902ac68ad move search to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 1669b802cc3e7ce30f05e61630542c88696bbca1
Component: engine
2014-01-15 17:12:48 -08:00
547b5e1700 move attach to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e1d8543c7889c1bf456641fa1ee5f676820076b6
Component: engine
2014-01-15 17:11:44 -08:00
0b0bfe2b31 fix docker insert display
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 2edcebc0275b726e87575830bb3e96dfb69d7665
Component: engine
2014-01-15 15:41:57 -08:00
9b65fcb5fa use the same 'Used' method as before
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: a33bc3018bf091725b7faca9a6039a07b6fd0ca7
Component: engine
2014-01-15 14:52:58 -08:00
42a6830aeb move insert to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 0fb8a55753269603eb8f01f725675ceacae79c29
Component: engine
2014-01-15 14:52:58 -08:00
d269d9c059 move copy to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: e2fa3f56df02818f007f929824293f9da6b2db75
Component: engine
2014-01-15 14:48:31 -08:00
e18203d1c4 move viz to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 7fbc315aa96f75322643c3e94b418fead6925144
Component: engine
2014-01-15 13:52:35 -08:00
708fd3d625 fix tests & small code improvment
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 7898dca8b3d1835d15812bd5249fcfb0de73257b
Component: engine
2014-01-15 11:06:00 -08:00
9af93e62a4 move history to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: bea6dd3888adefd070544241177860864f62fb25
Component: engine
2014-01-14 10:52:42 -08:00
a8444009df move legacy stuff outside the job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 16ca6a1c12ffe9a02da4e823646bee6461ffbad5
Component: engine
2014-01-13 16:20:05 -08:00
27c595f866 add legacy compat
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: aca1270104802347f5aa3104959282924b631daa
Component: engine
2014-01-13 15:50:20 -08:00
1ccf04f8d4 Add compat 1.8
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3a610f754f425ea6042c3f8b5452273656a06c90
Component: engine
2014-01-13 15:50:20 -08:00
5f902c5a09 Port 'docker images' to the engine API
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 17a806c8a0b6add2aa773dfca272acefee9b638c
Component: engine
2014-01-13 15:49:33 -08:00
06453f28d3 Move image_export to a job
Docker-DCO-1.0-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 5264914e574c20c8fefcd6e5d858f51f341dd9da
Component: engine
2014-01-10 15:54:44 -08:00
d1d0fdf0a6 Merge pull request #3180 from vieux/job_container_delete
Move container_delete to job
Upstream-commit: 6dde20c0c517833224689c0eff2d247910a7083b
Component: engine
2014-01-10 15:53:38 -08:00
bf5f5a9318 Merge pull request #3476 from vieux/restart_job
Move restart to a job
Upstream-commit: ad162b75a06a796d404a3e6d8fb728f0788dc399
Component: engine
2014-01-10 15:52:42 -08:00
aee266dfbc Move restart to a job
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 15689b56c8e397d3207dad5b23937cb9b1e453cd
Component: engine
2014-01-10 15:51:48 -08:00
cf41511c88 move container_delete to job
handle error

remove useless errStr

Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor@docker.com> (github: vieux)
Upstream-commit: aa3339cf39b88e4a4b3d830d9b0831d4abff1dcb
Component: engine
2014-01-10 15:34:10 -08:00
8bcba9a1ac gofmt
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: c4535c833dfdaef275d765968a2ed5513ef09097
Component: engine
2014-01-08 10:37:22 +00:00
fdb961ff89 Fix indentation to match rest of file (tabs, not spaces)
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: 145501bee3f37ccb022189e7b76f31abcbdbed3c
Component: engine
2014-01-08 10:14:30 +00:00
6a59e5045e Further simplification
Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: df4ea946a653fa3864574fd8110c6c618dde41d8
Component: engine
2014-01-08 10:14:25 +00:00
6854f9d3e2 Fix registry pushing/tagging
* docker push host:port/namespace/repo wouldn't push multiple tags for
  the same image
* getImageList was unnecessarily complex returning a nested array of
  ImgData when a correctly ordered list of images was sufficient
* removed various bits of redundancy

Docker-DCO-1.0-Signed-off-by: Danny Yates <danny@codeaholics.org> (github: codeaholics)
Upstream-commit: 5aa304f9696d8fcc2e39628ce68a39bfc932adb4
Component: engine
2014-01-08 10:13:14 +00:00
49bb0e0097 Fix issue #3375 - Return most recent image from the cache
ImageGetCached searches for an image from the cache. Instead of returning the
first image it finds, it should return the most recently created image. When a
build with --no-cache then adds a new image with the same parameters, it is
used instead of the old, existing image.

Docker-DCO-1.0-Signed-off-by: Sjoerd Langkemper <sjoerd@byte.nl> (github: Sjord)
Upstream-commit: 46c8b11f245204e9f6e1ae764b52911c327be1a9
Component: engine
2014-01-08 09:15:45 +01:00
64c8482404 Revert "Make sure the cache lookup returns always the same result"
This reverts commit 1d4b7d8fa1af95ce83f263a49ed24e686fa7cb62.

Docker-DCO-1.0-Signed-off-by: Sjoerd Langkemper <sjoerd@byte.nl> (github: Sjord)
Upstream-commit: 10b794b3328a8b8d8bcc094710cc3b59df500253
Component: engine
2014-01-08 09:14:31 +01:00
2514b9eb9b Merge pull request #3420 from RoelVanNyen/getfullname
Cleanup: runtime.getFullName is deprecated by getFullName
Upstream-commit: a0298c0bd070400b4acaad3c2d285037b5875552
Component: engine
2014-01-06 13:59:04 -08:00
3d5851faf7 Merge pull request #3310 from pnasrat/cgroups-subpackage
Extract cgroups utilities to own submodule.
Upstream-commit: 4f31141e13bad1c4494a15dd9f283107fc85eee1
Component: engine
2014-01-06 11:27:29 -08:00
8b66161d6d Just pass the container in RegisterLinks(), no need to lookup by name again
Upstream-commit: 42c7dc448f550c954aeba14cd20d1dff12845c73
Component: engine
2014-01-03 15:49:39 +01:00
cf9f2e5413 Merge pull request #3353 from creack/improve_add_cache
Improve add cache
Upstream-commit: 194eb246efc68647fd5c4efc240b49fc76235a90
Component: engine
2014-01-02 16:07:33 -08:00
0ccbdf155d Extract cgroups utilities to own submodule.
Use mountinfo rather than for cgroups parsing.
Make helper method private and change name.
Makes method naming more explicit rather than GetThisCgroup.
Use upstream term subsystem rather than cgroupType.
Upstream-commit: c561212b837735213f146c2fac291f84dbcbc8c3
Component: engine
2014-01-02 17:54:57 -05:00
e353a77e4f Merge pull request #3287 from vieux/fix_progressbar_display_push
fix progressbar in docker push
Upstream-commit: 81e596e27288c1dd9c48273fcd131742ef8e2d89
Component: engine
2014-01-02 13:38:11 -08:00
bde96d77e1 Cleanup: runtime.getFullName is deprecated by getFullName
Upstream-commit: 9dd7ae4074ecfceb62c3c3eae1811c5bd018c38c
Component: engine
2014-01-02 00:06:50 +01:00
a3c5984691 Make sure the cache lookup returns always the same result
Upstream-commit: 1d4b7d8fa1af95ce83f263a49ed24e686fa7cb62
Component: engine
2013-12-26 15:43:27 -08:00
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
6071fba45d fix progressbar in docker push
Upstream-commit: 85f9b778f54a823566dd5d81e0e0a9875a64569d
Component: engine
2013-12-20 16:55:41 -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