docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity
4,365 Commits 12 Branches 297 Tags
e63f1ff2a2968bbe6f873edd45282eb709c168ce
Commit Graph

337 Commits

Author SHA1 Message Date
Guillaume J. Charmes
7686e1f389 Merge branch 'master' into shykes-0.6.5-dm-plugin 
Conflicts:
	utils.go
	utils_test.go
Upstream-commit: 7cf60da38880534d76d031c4646fbd469d922385
Component: engine
 2013-11-14 14:02:44 -08:00
Michael Crosby
bf15883f56 Merge pull request #2445 from alexlarsson/fix-shared-root-from-dm 
Fix lxc start for shared root filesystems 
Upstream-commit: 629c6e36492336f01fd4e25426a5c875f52628e2
Component: engine
 2013-11-14 11:20:53 -08:00
Michael Crosby
084cb15f1a Allow drivers to implement ApplyDiff in Differ interface 
Upstream-commit: 5d9723002bc764e2c768e5184994d7949f55fc49
Component: engine
 2013-11-11 19:09:57 -08:00
Victor Vieux
943cd7996b on docker start, do not cleanup if already running 
Upstream-commit: bc6d87284174c1a862603a2da574ff60bb03e0fa
Component: engine
 2013-11-11 18:15:38 -08:00
Michael Crosby
b93991acb1 Add ability to exclude files from tar 
Upstream-commit: 2c7f50a77dc281289387008b4a08656e7e5328be
Component: engine
 2013-11-11 14:30:38 -08:00
Victor Vieux
6a146241db Merge branch 'master' of https://github.com/zilin/docker into zilin-master 
Conflicts:
	container.go
Upstream-commit: 4c7d24bc8b4bf436ba72d98089767e72a8f3f960
Component: engine
 2013-11-11 12:59:18 -08:00
Victor Vieux
abd8707658 Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid 
Server: always return long id's
Upstream-commit: 87c8437a900e683547278fcdd92de71ed8a866e3
Component: engine
 2013-11-11 13:06:19 -08:00
Victor Vieux
fac387b017 Merge branch 'master' of https://github.com/aanand/docker into aanand-master 
Upstream-commit: da24945070e305e09d4d96d1f981614eaa18b01f
Component: engine
 2013-11-11 12:34:16 -08:00
Michael Crosby
86d455035f Remove Differ and Changer interfaces 
Add the methods to the Driver interface
to force the drivers to implement the methods
Upstream-commit: 4d1a537433ede2bbc75b0a4817e8121f9e03fd86
Component: engine
 2013-11-11 12:10:53 -08:00
Alexander Larsson
122fd6b9c2 Implement fallback operation for driver.Diff() 
This moves the Diff() operation to a separate Differ interface and
implements a fallback that uses the Changes() results to encode
a diff tar.
Upstream-commit: e82f8c1661f3fa18e4dc6ca3aebe4dcc46e8961b
Component: engine
 2013-11-11 17:46:07 +01:00
Sven Dowideit
d772cfe673 make all image ID and container ID API responses use the Long ID (Closes #2098) 
Upstream-commit: b3974abe4f01d408850e245c9b52c77f3571e0b2
Component: engine
 2013-11-09 12:16:49 +10:00
Michael Crosby
82d35959fb Merge pull request #13 from crosbymichael/fix-volume-mount 
Do not pass container information when creating a volume
Upstream-commit: 1f35531f396dba279b289a515416351568b96c0a
Component: engine
 2013-11-08 16:35:00 -08:00
Michael Crosby
911620a74d Do not pass container information when creating a volume 
Upstream-commit: ddb27268c98941b9f8a131b7b5403eb4d44beebb
Component: engine
 2013-11-08 16:11:57 -08:00
Michael Crosby
28000adccb Allow drivers to export their own diff 
Upstream-commit: 1eb00e1d5b375cb79d492f1c5cd95d7317bc543c
Component: engine
 2013-11-08 15:32:50 -08:00
Michael Stapelberg
e5498d2e58 Return “err” instead of “nil” when MkdirAll() fails when binding a volume 
Upstream-commit: e7fdcc15c5eb3812c71dd61f22a8d77d3ae72e36
Component: engine
 2013-11-08 22:52:10 +01:00
Michael Crosby
c94da34819 Make sure dirs are created before injecting file 
Upstream-commit: 20f690f1762e369e9ad761e166f22ff57a17275a
Component: engine
 2013-11-08 12:06:15 -08:00
Victor Vieux
b89c66d724 prevent panic if you use API in a wrong way 
Upstream-commit: 49d7b87cfc4385470a5ecf181f92c13b8391c002
Component: engine
 2013-11-07 18:54:00 -08:00
Solomon Hykes
07ffba21a6 Don't rely on drivers for diff and export 
Upstream-commit: 99210c9c6efbe10df922faa66fa3232ab898ef7b
Component: engine
 2013-11-08 02:48:52 +00:00
Victor Vieux
2f4c3fdf6d Merge branch '1887-allow_ro_volumes-from' of https://github.com/daniel-garcia/docker into daniel-garcia-1887-allow_ro_volumes-from 
Upstream-commit: f417c4b09955e3b250bec19a0d4b13ff30ba4e80
Component: engine
 2013-11-07 17:59:55 -08:00
Solomon Hykes
914824bce7 Move Change to the archive package, and fix a leftover merge in 
Container.Inject()
Upstream-commit: 9ae4bcaaf8aa01da340341e47f99f83a59ce91dc
Component: engine
 2013-11-08 00:45:07 +00:00
Solomon Hykes
783f801512 gofmt 
Upstream-commit: f1127b9308fbb4d4e21c3c5567ace9fdda82559d
Component: engine
 2013-11-07 23:58:03 +00:00
Solomon Hykes
c471d2b756 Merge branch 'master' into 0.6.5-dm-plugin 
Conflicts:
	container.go
	runtime.go
Upstream-commit: 165d1bdbc0c4236df9afe85d9cd8b1e65d625865
Component: engine
 2013-11-07 23:26:52 +00:00
Solomon Hykes
7e3e167f73 Simplify graphdriver interface: Create, Get. No more external mounting or Dir/Image interface 
Upstream-commit: f2bab1557c3fef4a95b5b982fe7127fcb29c4f8f
Component: engine
 2013-11-07 22:38:50 +00:00
Solomon Hykes
a48448b288 Internal cleanup: use the mounted container filesystem instead of manipulating the aufs layers directly 
Upstream-commit: 77ae9789d3e1cfb895de9eaf343866f984c92668
Component: engine
 2013-11-07 20:30:56 +00:00
Guillaume J. Charmes
6d24142423 go fmt 
Upstream-commit: 6998c3c387518ba8e06ceff00b10be583c95d6cd
Component: engine
 2013-11-07 12:27:33 -08:00
Alexander Larsson
5edb271922 lxc: Work around lxc-start need for private mounts 
lxc-start requires / to be mounted private, otherwise the changes
it does inside the container (both mounts and unmounts) will propagate
out to the host.

We work around this by starting up lxc-start in its own namespace where
we set / to rshared.

Unfortunately go can't really execute any code between clone and exec,
so we can't do this in a nice way. Instead we have a horrible hack that
use the unshare command, the shell and the mount command...
Upstream-commit: 157d99a72786c454dfaad8b0800914cc80879aa8
Component: engine
 2013-11-06 20:43:06 +01:00
Mark Allen
73c7a730fc See if a path exists before injecting Reader there 
Closes #1965
Upstream-commit: 74f853a2aeaf86ff675ecab5387bbd710a0138b7
Component: engine
 2013-11-05 23:44:52 -06:00
unclejack
26ce0d7e39 disallow / as source for bind mount in the cli 
This makes the docker cli reject docker run commands which include bind
mounts like "/:/some/path/in/the/container".
Bind mounting the root directory is a bad idea and the cli should throw
an error right away.

The same check will also be made by the remote API via another commit.
Upstream-commit: 4b8c41c4a2591797f97ad079e4314b21498ba732
Component: engine
 2013-11-05 22:52:54 +02:00
Daniel Garcia
6c362cebcc Add ability to mount volumes in readonly mode using -volumes-from 
Upstream-commit: f9cb6ae46a3478c19e85a2a159c4ac31223ec499
Component: engine
 2013-11-05 11:58:51 -06:00
Guillaume J. Charmes
83558bb275 Merge pull request #2525 from dotcloud/fix_hostnames 
Fix regression in /etc/hosts
Upstream-commit: 342bd43b766e828753ffec35a6ae9b76e988c483
Component: engine
 2013-11-04 11:26:27 -08:00
Solomon Hykes
4092fc1017 Integrate devmapper and aufs into the common "graphdriver" framework. 
aufs is still enabled by default, no mechanism for switching drivers
yet.
Upstream-commit: 98c3693acf2db18c0d0c6211498bf6e1d8f068c6
Component: engine
 2013-11-04 17:28:35 +00:00
Paul Nasrat
164d9c3b6b Create new network on dead ghosts on restart. 
Fixes #2089
Upstream-commit: 95708dd35cd94a2c849e37efa05bb4e01ed36bb8
Component: engine
 2013-11-03 14:13:18 -05:00
Victor Vieux
f2a6417e83 fix regression in /etc/hosts 
Upstream-commit: f3685333c0fdea58c8e6adbc93c95ebbc4a9fa47
Component: engine
 2013-11-01 15:46:26 -07:00
Victor Vieux
f8fdcccb61 rebase 
Upstream-commit: 7ddd4fe66a00266507848e8ebc1ce3782532b51d
Component: engine
 2013-11-01 14:01:32 -07:00
Jérôme Petazzoni
5e4f415366 Refactor HostConfig and escape apparmor confinement 
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
 2013-11-01 13:55:19 -07:00
Michael Crosby
5287e87035 Merge pull request #2492 from dotcloud/publish-all-flag 
Add -P flag to publish all exposed ports
Upstream-commit: 65ba2868d7e0084f5edd2fc836d032f39ec39b9a
Component: engine
 2013-11-01 10:21:02 -07:00
Aanand Prasad
a1a49c8919 Container memory limit can be specified in kilobytes, megabytes or gigabytes 
-m 10  # 10 bytes
    -m 10b # 10 bytes
    -m 10k # 10240 bytes (10 * 1024)
    -m 10m # 10485760 bytes (10 * 1024 * 1024)
    -m 10g # 10737418240 bytes (10 * 1024 * 1024 * 1024)

Units are case-insensitive, and 'kb', 'mb' and 'gb' are equivalent to 'k', 'm' and 'g'.
Upstream-commit: 9ee9d2f9959390d1cda56accbbd975df18d157ad
Component: engine
 2013-11-01 12:00:17 +00:00
Solomon Hykes
c2b31012f8 Partial merge of devmapper/ in order to integrate it as a backend 
plugin.

The merge is inert, in other words the devmapper code is not called
and the primary aufs backend is untouched.
Upstream-commit: 36c7a7ae943220ffb1bea9cd47d2f586db00eab2
Component: engine
 2013-11-01 04:24:17 +00:00
Michael Crosby
f514bb46a5 Initial work on moving aufs to a subpackage 
Upstream-commit: 699a1074fb9cdf323044f8c132d7130f6a2945bc
Component: engine
 2013-10-31 18:07:54 -07:00
Michael Crosby
fb9771da9e Move archive.go to sub package 
Upstream-commit: 96d1e9bb5a269936afeb9748a894f6995b17e0a4
Component: engine
 2013-10-31 16:57:45 -07:00
Michael Crosby
44da76a732 Add -P flag to publish all exposed ports 
Upstream-commit: 652f07bb59e9c46d5f3e375c4a99d0b23771e0ad
Component: engine
 2013-10-31 11:28:30 -07:00
Zilin Du
33735534d9 Merge remote-tracking branch 'upstream/master' 
Conflicts:
	container.go
Upstream-commit: b543516556bc71663e1db16c026eda378816548a
Component: engine
 2013-10-31 10:53:40 -07:00
Brian Olsen
67465c23f0 Fixed problem with variables containing \n. 
The /.dockerenv file is now a marshalled json array so that environment
variables with \n and other weird values are supported.
Upstream-commit: 1c3a674444c6a6f08ea5ce3812046a00678e4a29
Component: engine
 2013-10-31 01:19:32 +01:00
Brian Olsen
fe428bd3cd Support copying value from env with -e option. 
Upstream-commit: 25c4c87c86aca2f17363dbcd9d7bc47640ff9c23
Component: engine
 2013-10-31 01:19:09 +01:00
Brian Olsen
303967e843 Set environment variables using a file. 
Upstream-commit: be7eb4bfcb09e17a2c45179bab268ba15050cb6a
Component: engine
 2013-10-31 00:48:12 +01:00
Michael Crosby
15ee14c05a Hotfix: Migrate public mappings after upgrade 
Upstream-commit: 746ba127bfb3556d378ccd8b2c725b490d090334
Component: engine
 2013-10-30 08:15:12 -07:00
Victor Vieux
c452ed1a32 Enable sig-proxy by default in run and attach 
Upstream-commit: e0b59ab52b87b8fc15dd5534c3231fdd74843f9f
Component: engine
 2013-10-29 11:18:34 -07:00
Michael Crosby
7ce1e20657 Add -name for docker run 
Remove docker link
Do not add container id as default name
Create an auto generated container name if not
specified at runtime.
Upstream-commit: 0d2924408bad7aa797bfaf0610e836d82928296f
Component: engine
 2013-10-28 18:09:08 -07:00
Tianon Gravi
576fafed48 Rename all cases of "docker-init" to "dockerinit" for consistency 
Upstream-commit: cf86e2bb226c82a991eb392e426e707cf8193c03
Component: engine
 2013-10-25 15:13:25 -07:00
Alexander Larsson
cd17fb7c91 Move ListOps to utils submodule 
This will be needed for later use in docker-init without a docker
dependency
Upstream-commit: d063c8d941d366e4815b91c4fa4fc91fc1e1eb23
Component: engine
 2013-10-25 15:13:24 -07:00