docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
9,781 Commits 12 Branches 296 Tags
0c3330ed80c8d7d459e53fd258ff189def3136a0
Commit Graph

9781 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Crosby
0c3330ed80 Merge pull request #7343 from shykes/cleanup-main 
Cleanup main function
Upstream-commit: 54b287bbc81216a2663b776f536ad40193a87bf1
Component: engine
 2014-07-31 12:26:09 -07:00
Aaron Huslage
c795cf8d33 Merge pull request #7193 from hollietealok/doc_remove 
Removed docker_io_oauth_api.md: Docker is not currently accepting regist...
Upstream-commit: 32fdcaa4192577b629bb622991804f9f9148e823
Component: engine
 2014-07-31 15:19:58 -04:00
James Turnbull
cf3f6d4b4d Merge pull request #7337 from rogaha/add_ga_universal_analytics_support 
Added GA universal analytics support
Upstream-commit: b5ef212ec17932dc159a44f2a77c6e9d4cf4ee9d
Component: engine
 2014-07-31 09:00:08 -04:00
Tibor Vass
33f1ef65b6 Merge pull request #7338 from tianon/moar-dotcloud 
Fix more instances of "dotcloud/docker" in hack/
Upstream-commit: bbca4867f8f5ecda47c7e34ddc3544aff8f2e3bd
Component: engine
 2014-07-30 23:51:23 -04:00
Sven Dowideit
aaca9c7303 Merge pull request #7328 from cpuguy83/fix_search_image_oldindex 
Replace old index image with hub
Upstream-commit: 970ebaa887f0f43c8ca2549ff9a7ca07c32e1fca
Component: engine
 2014-07-31 12:06:30 +10:00
Michael Crosby
463d8552c2 Merge pull request #7340 from crosbymichael/tags-unit 
Fix graph tags test on freebsd
Upstream-commit: 65d316e50d8cb5ae2b4ff4f721d428ff30108148
Component: engine
 2014-07-30 18:18:14 -07:00
Michael Crosby
8511e76574 Remove perm change in archive 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@docker.com> (github: crosbymichael)
Upstream-commit: 6bc483fa59adc0be65ea9c804c69d861a02435bd
Component: engine
 2014-07-30 18:06:48 -07:00
Kato Kazuyoshi
5d2578de83 Fix graph/tags_unit_test.go on FreeBSD 
- Directories should have u+x (0600 -> 0700)
- Don't chown files to root because we don't have to

Docker-DCO-1.1-Signed-off-by: Kato Kazuyoshi <kato.kazuyoshi@gmail.com> (github: kzys)
Upstream-commit: 5ebe86ccf9bedf439b2c90e26dee0f27c0c116f9
Component: engine
 2014-07-30 18:06:19 -07:00
Michael Crosby
6b69ddd081 Merge pull request #7325 from tiborvass/case-insensitive-attach 
Make --attach case-insensitive
Upstream-commit: 2970ba487766f51d0d8f5d026e981abec55c1519
Component: engine
 2014-07-30 17:10:16 -07:00
Tianon Gravi
4d9e0d4b74 Fix more instances of "dotcloud/docker" in hack/ (and add a DOCKER_PKG environment variable to simplify references to our "package path" in our bundlescripts) 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3a14eb066cef537e52f96c6ad76adab2efe02e05
Component: engine
 2014-07-30 17:02:04 -06:00
Roberto Gandolfo Hashioka
8454954b93 Added GA universal analytics support 
Docker-DCO-1.1-Signed-off-by: Roberto Hashioka <roberto.hashioka@docker.com> (github: rogaha)
Upstream-commit: e13b1fc05f5caaa324678b7da2fc917943557185
Component: engine
 2014-07-30 15:32:14 -07:00
unclejack
625730681d Merge pull request #7100 from discordianfish/fix-port-allocation 
Fix masked err in portmapper
Upstream-commit: 19c8e74fd3deeae7a22eb4c502acd2b9f3072ab0
Component: engine
 2014-07-30 23:51:21 +03:00
unclejack
69a9f824be Merge pull request #7298 from erikh/fix_cli_restart_test 
fix docker integration-cli restart test race
Upstream-commit: 3100afa0e19f9fe36a6de304212998e357c1f3e0
Component: engine
 2014-07-30 23:29:39 +03:00
Tibor Vass
d3b2916a28 Make --attach case-insensitive 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: a7134132933d899f30ab775ac9604ff4e87d7c8d
Component: engine
 2014-07-30 15:36:16 -04:00
Victor Vieux
69c6e53156 Merge pull request #7317 from erikh/server_split 
Partition server/ by image, init, events, container, and "everything left"
Upstream-commit: 8162c6eeddccb6e74c1982206f40f72129dcca82
Component: engine
 2014-07-30 12:28:37 -07:00
Tibor Vass
aaa8e88106 Merge pull request #7331 from erikh/simplify_checksum 
Simplify utils.CheckSum.Read to use TeeReader instead
Upstream-commit: a0338ff04be1d478e16ccd476a12e1c045fa6a5e
Component: engine
 2014-07-30 15:14:41 -04:00
Erik Hollensbe
69c59dfd2b Partition server/ by image, init, events, container, and "everything left" 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 74fdadc86cf8ecb90604f0e2feb087dc82227cb0
Component: engine
 2014-07-30 11:50:33 -07:00
Erik Hollensbe
8be33461d7 Remove CheckSum from utils; replace with a TeeReader 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: ef6b78f7db890a79b40484fd892ff486017ff2e9
Component: engine
 2014-07-30 11:23:43 -07:00
unclejack
d495064880 Merge pull request #6962 from erikh/3349-cleanup-docker-socket 
Clean up the docker socket on termination of the daemon.
Upstream-commit: c3045f563d68217a4f8887c762adb2939378b657
Component: engine
 2014-07-30 18:43:01 +03:00
Brian Goff
a0d04e4cbb Replace old index image with hub 
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
Upstream-commit: ba57d3d9e63445f43e4d53da44e8dec27baa288d
Component: engine
 2014-07-30 11:15:18 -04:00
unclejack
362bc99b19 Merge pull request #7215 from tiborvass/add-os-to-docker-info 
Add OS to docker info
Upstream-commit: c18b38f912d08105177630718a78562186ae7324
Component: engine
 2014-07-30 18:02:45 +03:00
Tibor Vass
ca4826fd77 Add OS to docker info 
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
Upstream-commit: b0fb0055d279bc25aa2f91c112929ea8eb92c1db
Component: engine
 2014-07-30 10:37:52 -04:00
Solomon Hykes
409af56c06 Move kernel version/capabilities detection to NewDaemon 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 4949e070fbcac1ef9fbeabe59e3f39cdb830e5fd
Component: engine
 2014-07-30 09:26:51 +00:00
Solomon Hykes
f3b5291fed Move canonical root path detection to NewDaemon 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: e92a9e0b53d296f6e0caa925a56ebbd76b20acaa
Component: engine
 2014-07-30 09:26:51 +00:00
Solomon Hykes
504ecb28ba Move TMPDIR symlink cleanup to NewDaemon 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: a7d8c732b1760fcb3d5fb99c035a34123809e9cd
Component: engine
 2014-07-30 09:26:51 +00:00
Solomon Hykes
190fbe906e Check for OS and root privileges in NewDaemon 
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 419b9fe16425c301855aab781e1386f7a227a09d
Component: engine
 2014-07-30 09:26:51 +00:00
hollietealok
4d9bca3054 Removed OAuth doc from mkdocs.yml 
Docker-DCO-1.1-Signed-off-by: hollietealok <hollie@docker.com> (github: hollietealok)
Upstream-commit: 2b9d8248d6136645d3801693370e23d752f748f2
Component: engine
 2014-07-29 13:56:19 -07:00
Tibor Vass
fdbe4305c1 Merge pull request #7286 from erikh/parsers 
Move parsing functions to parsers/ and the specific kernel handling...
Upstream-commit: 403df1765abfd3ac62b7f6b8bd709fb0d691d8c8
Component: engine
 2014-07-29 16:11:31 -04:00
Erik Hollensbe
e25f77248d Move parsing functions to pkg/parsers and the specific kernel handling 
functions to pkg/parsers/kernel, and parsing filters to
pkg/parsers/filter. Adjust imports and package references.

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 4398108433121ce2ac9942e607da20fa1680871a
Component: engine
 2014-07-29 13:09:10 -07:00
Tianon Gravi
8545bf6daa Merge pull request #7311 from tianon/travis-old-go 
Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while
Upstream-commit: 335e82f3f7abfcf783bead6e38b7a3aefe0c768a
Component: engine
 2014-07-29 13:48:24 -06:00
Tibor Vass
887f270676 Merge pull request #7292 from erikh/buildfile_move 
server/buildfile.go -> builder/builder.go
Upstream-commit: 1063b438eb149ddc9b899c38a06cc1e666d512bf
Component: engine
 2014-07-29 15:38:42 -04:00
Victor Vieux
b812e976e3 Merge pull request #7272 from unclejack/create_httputils_pkg 
move resumablerequestreader to pkg/httputils
Upstream-commit: 3bae02cbe32b856107a5d61c496f35d69c35aa2d
Component: engine
 2014-07-29 12:18:10 -07:00
Tianon Gravi
981a6f43de Add Go 1.2 to Travis so we make sure we keep retrocompat for a little while 
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 38bce179040c80512c39c42ebbf776e58ac3dfcf
Component: engine
 2014-07-29 13:07:59 -06:00
Erik Hollensbe
17543b1068 server/buildfile.go -> builder/builder.go; add maintainers file 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 3a177ccd3afdfe481a7248fccb2efe0f2cbdfcca
Component: engine
 2014-07-29 11:35:02 -07:00
James Turnbull
d0658f2e0a Merge pull request #6877 from underscorephil/patch-1 
Update softlayer.md
Upstream-commit: 475131cd4a5ef8178e36bf40721baf14ce2b6e26
Component: engine
 2014-07-29 13:20:55 -04:00
James Turnbull
8323f096b4 Merge pull request #7256 from jstoja/docs-api-insert-image 
Fixing docs - Insert api call
Upstream-commit: 4749b884fe162edbd303fe6cc23223a7be9b9226
Component: engine
 2014-07-29 13:19:22 -04:00
James Turnbull
e9f01897da Merge pull request #7269 from r0n22/patch-1 
Update HTTP Proxy Section
Upstream-commit: 900d54b48b3091f9bd03f254d5ac9e458bdd53d9
Component: engine
 2014-07-29 13:15:27 -04:00
unclejack
b7f9603931 move resumablerequestreader to pkg 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: c0517857f64d1148d02809e3ba3dd39bf8322ed3
Component: engine
 2014-07-29 16:30:45 +03:00
Sven Dowideit
c30e5bea2d Merge pull request #7280 from knappe/patch-1 
Correct Typo In Documentation
Upstream-commit: 3369b4f6f03f400d7c6d3dbf1a86401d983503be
Component: engine
 2014-07-29 19:15:48 +10:00
Erik Hollensbe
39b46f69f1 fix docker integration-cli restart test race 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: 5931669343f568114cb209dabf8913be44cd63e8
Component: engine
 2014-07-28 23:46:14 -07:00
Victor Vieux
c827ecda15 Merge pull request #7062 from crosbymichael/fix-lxc-caps 
Fix cap drop issues with lxc
Upstream-commit: ac3eecf3db5f81a553b71267f2e18ca7b7d95fea
Component: engine
 2014-07-28 16:19:08 -07:00
knappe
bed02719c0 Correct Typo In Documentation 
Upstream-commit: 331200cbaae75a2876bac037c8df2e609bab9658
Component: engine
 2014-07-28 14:39:17 -06:00
Victor Vieux
80ac009e50 Merge pull request #7274 from vbatts/vbatts-gh7136 
progress bar: don't strings.Repeat a negative number
Upstream-commit: a0dad3dfb22a5d09d01bb886caece26950d17b61
Component: engine
 2014-07-28 11:50:16 -07:00
Victor Vieux
2a6df8d538 Merge pull request #7210 from fcarriedo/refactor-common-code 
pkg/units: Refactor common code
Upstream-commit: f906f31877f63a7f9fab954157667e0f341210ba
Component: engine
 2014-07-28 11:45:46 -07:00
Vincent Batts
b178420296 jsonmessage: added test and cleaned up others 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 704b97d1c4cc6eaa6ecf9630eed2dffd5abaffb9
Component: engine
 2014-07-28 14:43:28 -04:00
Tianon Gravi
ec6e0ee58c Merge pull request #6943 from tiborvass/parallel_compile_test 
Parallel compile test binaries
Upstream-commit: 5ef1126669ee6fac50679e4d65d1eb822a59fbec
Component: engine
 2014-07-28 12:32:56 -06:00
Michael Crosby
63538328fe Merge pull request #6520 from unclejack/bump_go_to_1.3 
bump Go to 1.3
Upstream-commit: d09e682c46befb37a3dd47375b885d91c437c1f2
Component: engine
 2014-07-28 11:06:43 -07:00
Tianon Gravi
9833b2f84a Merge pull request #7257 from seblu/master 
Improve systemd units
Upstream-commit: 380153f0d7e2c3a285ebf2f43306d99aa6c8dd9a
Component: engine
 2014-07-28 11:51:19 -06:00
Vincent Batts
ddd05d0cc1 progress bar: don't strings.Repeat a negative number 
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 77237be0e23dfaba4d4d97a525c3ecc7fb819042
Component: engine
 2014-07-28 12:01:43 -04:00
Tibor Vass
93d0b8352d Merge pull request #7140 from proppy/more-addtar-tests 
integration-cli: add more tests for BuildAddTar
Upstream-commit: 030676444ade28ded0953ff179d65fe99bbf4fed
Component: engine
 2014-07-28 11:58:29 -04:00