docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
11,315 Commits 12 Branches 296 Tags
2bfa151ffc1cc09bb722e02825dfd5562a7736be
Commit Graph

785 Commits

Author SHA1 Message Date
Tibor Vass
631e8d7105 Merge pull request #8352 from zachborboa/patch-1 
Fix typo
Upstream-commit: 290222c3ddbdfb871f7fa088b8c724b9970a75ba
Component: engine
 2014-10-28 22:39:05 -04:00
Solomon Hykes
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
Victor Vieux
1429a5fb4a update sysinfo to logrus 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0a37f836adef969e9e5aa9ce7b2c465f9441c1a5
Component: engine
 2014-10-27 18:59:02 +00:00
Jessie Frazelle
d5e3aaa45d Merge pull request #8782 from shuai-z/rm-clean 
removed redundant Clean
Upstream-commit: 80d35c7fd0ca3a3c8d4dd4b4cd575048a9fbc092
Component: engine
 2014-10-27 09:23:10 -07:00
Jessie Frazelle
6c8bda9fe4 Merge pull request #8770 from LK4D4/logrus_support 
Logrus support
Upstream-commit: 15b6b7be010546f30d7eabd000167d428efc0b13
Component: engine
 2014-10-27 09:05:24 -07:00
Tibor Vass
c6209d5ca3 Merge pull request #8641 from vbatts/vbatts-archive_test_and_benchmark 
archive: tests and benchmarks for hardlinks
Upstream-commit: 2b4173620586853480c0977743550dbe8c2697b7
Component: engine
 2014-10-27 09:55:19 -04:00
shuai-z
854a22f34f removed redundant Clean 
The doc (or src) says: The result is Cleaned.

http://golang.org/pkg/path/filepath/#Join

Signed-off-by: shuai-z <zs.broccoli@gmail.com>
Upstream-commit: ce407ccff4fb4245384e50d86870d2e247cd43ec
Component: engine
 2014-10-26 13:55:29 +08:00
Alexandr Morozov
bad39206ea Mass gofmt 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: ee7dd44c017458c8fe0be8e09569b1238366dca3
Component: engine
 2014-10-24 15:11:48 -07:00
Alexandr Morozov
352377fa69 Remove pkg/log 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: b99dcb3c7ef6e66754354292f2ec0217341c8d2b
Component: engine
 2014-10-24 15:03:24 -07:00
Alexandr Morozov
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
Vincent Batts
7c1ecdcafa archive: tests and benchmarks for hardlinks 
Adding moar information, so benchmark comparisons can be moar
comparative.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 0fdf7839a21390f5813589195639caf594a3ddc2
Component: engine
 2014-10-24 08:58:31 -04:00
Andrea Luzzardi
b7e17d56af Add MemInfo to the system pkg. 
MemInfo provides a simple API to get memory information from the
system.

Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: e0c9d7b654221a0d4e5a310b0f9a0adb9ef69aa0
Component: engine
 2014-10-22 14:05:45 -07:00
Tibor Vass
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
Zach Borboa
fb16be4a98 Fix typo 
Signed-off-by: Zach Borboa <zachborboa@gmail.com>
Upstream-commit: d0f12a0f7379b95e848c773fa16dd706a49197c6
Component: engine
 2014-10-20 18:46:39 -07:00
Brian Goff
94f641a2fe Make container.Copy support volumes 
Fixes #1992

Right now when you `docker cp` a path which is in a volume, the cp
itself works, however you end up getting files that are in the
container's fs rather than the files in the volume (which is not in the
container's fs).
This makes it so when you `docker cp` a path that is in a volume it
follows the volume to the real path on the host.

archive.go has been modified so that when you do `docker cp mydata:/foo
.`, and /foo is the volume, the outputed folder is called "foo" instead
of the volume ID (because we are telling it to tar up
`/var/lib/docker/vfs/dir/<some id>` and not "foo", but the user would be
expecting "foo", not the ID

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ef98fe0763024abd90bd5a573fec816895ee92e4
Component: engine
 2014-10-20 20:23:01 -04:00
Srini Brahmaroutu
d5e9b821af Adding capability to filter by name, id or status to list containers api 
Closes #7599

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 16346253537267b42bbf35e81c0139b4d0aee43c
Component: engine
 2014-10-20 18:33:20 +00:00
Alexandr Morozov
a4666e24dd Merge pull request #8238 from vbatts/vbatts-daemon_timestamps 
daemon logging: unifying output and timestamps
Upstream-commit: cb106e74a14a37157b09459965a69c944f9c19f0
Component: engine
 2014-10-16 15:55:49 -07:00
Michael Crosby
ae2c341183 Merge pull request #8380 from cpuguy83/moar_names 
Add more names
Upstream-commit: 0e67cf0627a60595f0aac51693f9266a893d5295
Component: engine
 2014-10-16 14:04:15 -07:00
Victor Vieux
456ba41de5 add BytesSize in pkg/units 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: ae4689f14d59ece06bbd2a08a9687dc075e42d6d
Component: engine
 2014-10-14 03:54:32 +00:00
unclejack
adae4bd745 pkg/graphdb: some linting 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9e45069e0ab8023bb7c8bcbda9a525fb6932dcf8
Component: engine
 2014-10-06 22:57:27 +03:00
unclejack
5826291b82 pkg/timeutils: lint and add comments 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d1a85078b552bf35e76a4e12fca6ecbdecb1c3b6
Component: engine
 2014-10-06 22:27:56 +03:00
unclejack
5b14fa9a40 pkg/units: lint 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d202ff2ece6812f90af60292b88a9a20adb807ee
Component: engine
 2014-10-06 22:19:41 +03:00
unclejack
85977c7e75 pkg/truncindex: lint and add comments 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 39fe2a3e4e059c4235f2e1692e240058fccc0ea3
Component: engine
 2014-10-06 22:00:58 +03:00
unclejack
2df7b086ef pkg/version: lint and add comments 
Upstream-commit: d29c7e51cf0c260e6b528f78783aa27e5953b4bf
Component: engine
 2014-10-06 18:41:53 +03:00
Brian Goff
cab0cbec0f Add more names 
Docker-DCO-1.1-Signed-off-by: Brian Goff <bgoff@cpuguy83-mbp.home> (github: cpuguy83)
Upstream-commit: ed55a2db06c7343f00a71844b166da1bbfbb812d
Component: engine
 2014-10-03 10:17:42 -04:00
Michael Crosby
0172f7a1f0 Merge pull request #8350 from erikh/add_erikh_maintainer_proxy 
Add erikh as maintainer of pkg/proxy
Upstream-commit: 4c8b8861ecb6b47230e0e021760922e15e8afd3f
Component: engine
 2014-10-01 15:50:41 -07:00
Erik Hollensbe
b0e52e738c Add erikh as maintainer of pkg/proxy 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 10efa07fa28e400a597ed7076aa0d730a081ebf2
Component: engine
 2014-10-01 15:37:46 -07:00
Rafe Colton
afe8e130e0 Move archive package into pkg/archive 
Now that the archive package does not depend on any docker-specific
packages, only those in pkg and vendor, it can be safely moved into pkg.

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
Upstream-commit: 30d5a42c1f24e26f681b7330249f04fec891aee9
Component: engine
 2014-09-29 23:23:36 -07:00
Rafe Colton
a84cb1fe40 Move Matches() file path matching function into pkg/fileutils 
This is the second of two steps to break the archive package's
dependence on utils so that archive may be moved into pkg. `Matches()`
is also a good candidate pkg in that it is small, concise, and not
specific to docker internals

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
Upstream-commit: 73f4bfed810b65943f1d9d038a8db9bd834067fa
Component: engine
 2014-09-29 23:21:41 -07:00
Rafe Colton
3ffb3fc6cc Move Go() promise-like func from utils to pkg/promise 
This is the first of two steps to break the archive package's dependence
on utils so that archive may be moved into pkg.  Also, the `Go()`
function is small, concise, and not specific to the docker internals, so
it is a good candidate for pkg.

Signed-off-by: Rafe Colton <rafael.colton@gmail.com>
Upstream-commit: b845a62149d5f4990462ac6c9167c5cfaa0e66cb
Component: engine
 2014-09-29 23:16:27 -07:00
Jessica Frazelle
8734c910c3 Adding self to various maintainers files. 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6c60e8c7849742c111a2b0a5ad4ff88fc8e960ef
Component: engine
 2014-09-29 15:43:07 -07:00
Vincent Batts
50457aefd5 daemon logging: unifying output and timestamps 
A little refactor of the ./pkg/log so engine can have a logger instance

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 92df943fbf225d78b160babb36e9c6fd38cdc0d0
Component: engine
 2014-09-26 14:44:46 -04:00
Derek McGowan
3443a67be3 pkg/tarsum: fix panic with dynamic buffer 
When read is called on a tarsum with a two different read sizes, specifically the second call larger than the first, the dynamic buffer does not get reallocated causing a slice read error.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5cdf7f507771e159ddd335f3757cd33f7ba4e426
Component: engine
 2014-09-25 15:58:35 -07:00
Alexandr Morozov
a6c06e4ad8 Test for jsonlog.WriteLog 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 2add198a7abc084dd394f61ed26057ec5d639a4c
Component: engine
 2014-09-23 19:19:25 +04:00
Alexandr Morozov
8dd6b83d46 Benchmark for jsonlog.WriteLog 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 81c9927f8f3c190ed9dd15b62716a240ce20fc51
Component: engine
 2014-09-23 18:24:18 +04:00
Victor Vieux
680ee7cfce Merge pull request #5956 from vbatts/vbatts-tarsum_hashes 
tarsum: allow for generic hashes
Upstream-commit: 350b1cf6ea5681e26ea752e2e54ef6c9a04d91e0
Component: engine
 2014-09-22 11:11:25 -07:00
unclejack
98789bf31d pkg/jsonlog: avoid JSONLog allocation in loop 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 473bb5274ce7a520bc73ccb3529f99729a799062
Component: engine
 2014-09-22 18:57:28 +03:00
Alexandr Morozov
f5deb7d0f9 Close logs pipes and catch write errors 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: a7ee201ee85c95afb8556323d79e32cf9e2d8737
Component: engine
 2014-09-22 10:55:46 +04:00
Alexandr Morozov
750e7b6a57 Change unused WriteCloser to Writer 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: fd3f2e175fa6ddb606d2c681ff86a97faccfebbd
Component: engine
 2014-09-22 10:54:58 +04:00
Guillaume Dufour
9e6770baa4 FIX 6613:launch docker fail with space named drive 
Signed-off-by: Guillaume Dufour <guillaume.duff@gmail.com>
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: acea488eb6ed40e6e5894e1b259ad861c9a98042
Component: engine
 2014-09-19 12:07:53 -04:00
Michael Crosby
1192584d04 Merge pull request #6950 from jfrazelle/6831-check-flag-centos6.5 
Fix duplicate iptables rules
Upstream-commit: d5537e0f039512c322efa6aec176349eff731499
Component: engine
 2014-09-18 17:51:15 -07:00
Vincent Batts
e5b81f13f8 tarsum: allow for alternate block ciphers 
Not breaking the default cipher and algorithm for calculating checksums,
but allow for using alternate block ciphers during the checksum
calculation.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 4e9925d780665149b8bc940d5ba242ada1973c4e
Component: engine
 2014-09-18 10:34:58 -04:00
Michael Crosby
a701f25898 Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter 
lower the number of allocations in broadcastwriter
Upstream-commit: 77d30e71122c7ec328f79836dcab4409f72e04b9
Component: engine
 2014-09-17 15:26:44 -07:00
unclejack
c978982604 Merge pull request #7889 from vbatts/vbatts-tarsum_name_collision 
tarsum: name collision fix
Upstream-commit: 458b019e62bd41da08b99d49db9b2ee079fee29a
Component: engine
 2014-09-17 21:59:39 +03:00
Vincent Batts
b0b8a2773b tarsum: name collision fix 
If a tar were constructed with duplicate file names, then depending on
the order, it could result in same tarsum.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: c5e6362c53cbbc09ddbabd5a7323e04438b57d31
Component: engine
 2014-09-17 14:37:46 -04:00
Alexandr Morozov
995ea10dab Benchmark for StdWriter.Write 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 55cac6c9421702ca1e42b3e3f92266e865a5c769
Component: engine
 2014-09-17 19:24:07 +04:00
unclejack
1aa081f9b0 stdcopy: improve perf by avoiding buffer growth 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 277aa9c67415b9b76ab17daea583b51f8560a6a5
Component: engine
 2014-09-17 18:06:17 +03:00
unclejack
ba4bc005be move stdcopy to pkg/stdcopy 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 1f03e60c2a96a92acae0e4d2fd604ab2c6d55473
Component: engine
 2014-09-17 18:06:17 +03:00
unclejack
a9aedbcc8a use custom marshalling for JSONLog 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9851e8c4c18a89327ec2c1f04e36c9932c4231c1
Component: engine
 2014-09-17 17:03:54 +03:00
unclejack
cb5f7b942d add the timeutils package 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 9ae3134dc9f0652ef48ec1fd445f42d8fe26de35
Component: engine
 2014-09-17 14:30:08 +03:00