starred/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-08-30 18:14:19 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,097 Commits 13 Branches 321 Tags
6c91c910668596926226dfff514b26dfd544d07f
Commit Graph
118 Commits
Author SHA1 Message Date
Darren Coxall 6c91c91066 More informative error message on name collisions 
This is the proposed fix for #2506. It provides a more complete message
with regards to name collisions including informing of the opposing
containers ID.

I have included a test to ensure that the correct short id is displayed
to make the message easier to understand.
Upstream-commit: 3c67a2849337f3b9bd92dd389f0e02e48a36028b
Component: engine
 2013-11-18 17:51:47 +00:00
Solomon HykesandVictor Vieux 13d08cbd03 gofmt 
Upstream-commit: 2a209afe5fe0f27296e3e06a199bb5305910e1cf
Component: engine
 2013-11-14 10:50:43 -08:00
Solomon HykesandVictor Vieux 6c1679864e Move integration tests to integration/, expose missing public methods in the core 
Upstream-commit: 359a6f49b9ec704686d0cb0df7cb0d7c8d5f55a7
Component: engine
 2013-11-14 10:50:00 -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
Sven Dowideitand¨Sven 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
Josh Poimboeuf 67c8d19777 setup network when reconnecting to ghost container 
Re-adding the line to setup the network when reconnecting to a ghost
container.  It was inadvertently removed by commit
31638ab2ad2a5380d447780f05f7aa078c9421f5.
Upstream-commit: 2448058ee23292e2a167bbd6a2e138ad99e8b3b8
Component: engine
 2013-11-08 16:28:41 -06:00
Victor Vieux b5fe937fc9 fix Assign id as name when all else fails 
Upstream-commit: 26f846bf779c97a69e85db356dff8c1fff76161c
Component: engine
 2013-11-07 12:23:29 -08:00
Michael Crosby 626d3f3226 Ensure container name on register 
Upstream-commit: a9ed238bb76774c142107b3f06e8c9e9a1e59e65
Component: engine
 2013-11-04 09:28:40 -08:00
Victor Vieux 771aa307b1 use a symlink instead of a copy 
Upstream-commit: f9901ead069671c04a2f99c83c1e4d8a13597e7b
Component: engine
 2013-11-01 13:55:19 -07:00
Jérôme PetazzoniandVictor Vieux 5e4f415366 Refactor HostConfig and escape apparmor confinement 
Upstream-commit: 31638ab2ad2a5380d447780f05f7aa078c9421f5
Component: engine
 2013-11-01 13:55:19 -07:00
Victor Vieux 04226c60be Merge pull request #2494 from shykes/engine-links 
Engine: Minimal, unintrusive implementation of a cleaner Job API.
Upstream-commit: e3c49843d70ea2856592a7af5e5d83e655898a70
Component: engine
 2013-10-31 16:32:49 -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
Michael Crosby 4eb97d1f45 Assign id as name when all else fails 
Upstream-commit: 8227ea35cfc6a8e7e3da7baed5bfa8a62e304df5
Component: engine
 2013-10-30 18:31:18 -07:00
Victor Vieux 1f4eb6c975 fix warning in build 
Upstream-commit: ee814055673ca1d5981a4e9e4788a4199fd2f456
Component: engine
 2013-10-30 14:36:38 -07:00
Victor Vieux d6b078e758 fix typos 
Upstream-commit: 1c7ca51f3246baca6be75705ed932d26e20589e2
Component: engine
 2013-10-30 13:18:48 -07:00
Victor Vieux 0837dc21f1 improve error message 
Upstream-commit: 8fa6e2b103e436435ad0f0ae00e8cc9af4c58ad4
Component: engine
 2013-10-30 11:24:50 -07:00
Victor Vieux d2b1922a6b continue build on expose with :, but displays a warning 
Upstream-commit: b2503a72f1f1db887fd11199036f05efe3d35992
Component: engine
 2013-10-30 11:13:10 -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
Solomon Hykes b6319ac31a Rename 'GraphPath' to the more logical 'Root'. This does not affect users except for a slight text change in the usage messge 
Upstream-commit: 7e691e11b033f35fe823fbc6dcb40decd584696d
Component: engine
 2013-10-26 14:24:13 -07:00
Solomon Hykes ff1fcc1bf9 Engine: centralize checks for supported architectures and kernel versions 
Upstream-commit: 1b8eef4efbdd308f0dff0ae063ea49c0f4142888
Component: engine
 2013-10-26 14:21:04 -07:00
Michael CrosbyandVictor Vieux c25b5fa785 Ensure child containers are started before parents 
Upstream-commit: 356af1540f9a43337571e0f3ad6038789b38478e
Component: engine
 2013-10-25 15:13:26 -07:00
Michael CrosbyandVictor Vieux 33d75fdf08 Add default entity and edge to graph on runtime load 
Upstream-commit: 2e6b241dc70c0f1ed6745af1f27b11bf77c84f3b
Component: engine
 2013-10-25 15:13:26 -07:00
Michael CrosbyandVictor Vieux aed89ba28f Move name parsing logic to GetByName method 
Upstream-commit: 7c882a800309f2a2870c57e85232ae8888bcef25
Component: engine
 2013-10-25 15:13:25 -07:00
Michael CrosbyandVictor Vieux 79c39c987f Add missing else when checking for linkgraph.db 
Upstream-commit: 7d440f70fd1ba10efa9ab239516dca461535da95
Component: engine
 2013-10-25 15:13:25 -07:00
Michael CrosbyandVictor Vieux 3f2eaa1c43 Use persistent connection for links database 
Add close method to Runtime and Server to make sure
that any underlying connections are cleaned up
Upstream-commit: 7c08aeeba4ab94f77e221bfc01741cce0866d224
Component: engine
 2013-10-25 15:13:25 -07:00
Tianon GraviandVictor Vieux 7f47a302d5 Add dynbinary and dyntest scripts for building/testing a separate static dockerinit binary 
After a nice long brainstorming session with @shykes on IRC, we decided on using a SHA1 hash of dockerinit compiled into the dynamic docker binary to ensure that we always use the two in a perfect pair, and never mix and match.
Upstream-commit: 21161dbd515fb97cf9052a5980de6fc6180a89dc
Component: engine
 2013-10-25 15:13:25 -07:00
Victor Vieux 83a034fdc4 no more name encoding 
Upstream-commit: 256b7537e332c68d0fa35b60e06726c40ed66312
Component: engine
 2013-10-25 15:13:25 -07:00
Victor Vieux 3673acf131 replace == by HasPrefix for names and improve error message 
Upstream-commit: c4923757f1f92c160a34d0a591f6e62d8d94dea3
Component: engine
 2013-10-25 15:13:25 -07:00
Michael CrosbyandVictor Vieux dab2931cd1 Updated fixes post rebase from master 
Removed test cases that are no longer
applicable with links and the port changes.
Remove test case where a test was hitting an
external ip.
Upstream-commit: 0e24db3a68cabed1ff8cf8dd10854c5de201329f
Component: engine
 2013-10-25 15:13:24 -07:00
Michael CrosbyandVictor Vieux 952ac8a789 Add links for container relationships and introspection 
Upstream-commit: 1cbdaebaa1c2326e57945333420d25d6f77011d5
Component: engine
 2013-10-25 15:13:24 -07:00
Solomon Hykes 0d8e2ee2ed Runtime: remove unused field kernelVersion 
Upstream-commit: 7e4d00840392a80c0946291848c4caa18a5ec108
Component: engine
 2013-10-23 00:44:57 -06:00
Michael Crosby bedabb5a87 Merge pull request #1943 from dotcloud/1940-prevent_crash_parseNat_build-fix 
Abort build if mergeConfig returns an error and fix duplicate error message
Upstream-commit: 4196c704f052687e8b9010f0e407f66417c55d04
Component: engine
 2013-10-15 17:40:48 -07:00
Karl Grzeszczak b2ba4dc1a1 Initial steps to fix Issue #936 
Use utils.Errorf instead of utils.Debugf
Upstream-commit: ad723bbfe7cda7839b3c7f82e63699bf2b9c4911
Component: engine
 2013-10-11 08:04:40 -05:00
Zilin Du d17d5e16ae replace 127.0.0.1 by the assigned IP address in the container's /etc/hosts file. 
Upstream-commit: 7d95d300abd9d9cc811713e53fd41adec66f2e00
Component: engine
 2013-10-08 14:29:22 -07:00
unclejack 5bcfc0bffe automatically remove container via -rm 
add AutoRemove to HostConfig
add -rm flag to docker run
add TestRunAutoRemove to test -rm
docs: add -rm to commandline/command/run
add hostConfig to container monitor
make monitor destroy the container via -rm

This adds support for automatically removing a container after it
exits. The removal of the container is handled on the server side.
Upstream-commit: 22e7e107addc4703ee6ef36981dfafe985be695d
Component: engine
 2013-09-27 17:43:12 +03:00
Victor Vieux 721615e4c7 abord build if mergeConfig returns an error and fix duplicate error message 
Upstream-commit: 5bd0437eedf8036b9648dd095b22d0772fa47e4d
Component: engine
 2013-09-20 12:46:24 +00:00
Victor Vieux 2d20e5611c rebase master 
Upstream-commit: bd847f66c635380096b19c41c4a3536dff4199e1
Component: engine
 2013-09-09 22:11:53 +00:00
Solomon Hykes f75afeebe3 Add missing package import 
Upstream-commit: eca861a99d1a5abe91704b55d044eb8280adb8d1
Component: engine
 2013-09-07 17:03:40 -07:00
Solomon Hykes 7985dd19d1 Add missing comments to runtime.go 
Upstream-commit: 6a9f4ecf9bc4263baef8e9a1d86f1474f9c66d31
Component: engine
 2013-09-06 17:43:34 -07:00
Solomon Hykes aa0ad01db6 Merge builder.go into runtime.go 
Upstream-commit: 24e02043a2672320abebc3bd5fa6a592e2ebd082
Component: engine
 2013-09-06 17:33:05 -07:00
Victor Vieux 068b4e2c39 remove message during tests 
Upstream-commit: f159f4710b0c5dac8b71246dddbaee667dd6a702
Component: engine
 2013-08-29 22:59:34 +00:00
Guillaume J. Charmes 4faecb5fe5 Merge pull request #1563 from dotcloud/1073_add_loading_message 
* Runtime: Add loading containers message in no debug
Upstream-commit: 8dd3607bd1fd41b4844e3415b832780a6c878e33
Component: engine
 2013-08-23 11:20:22 -07:00
Victor Vieux 9fd5016532 assume ip_forwarding = 1 by default 
Upstream-commit: b21f89862076397b63eb3ac4a19b9125b6f6477a
Component: engine
 2013-08-19 12:34:30 +00:00
Victor Vieux 9657023315 add loading message 
Upstream-commit: 20b1e19641d94b5e71ecee7a9703eb392a81cf9a
Component: engine
 2013-08-16 13:43:09 +00:00
Vincent Bernat 8ef6c1627f runtime: correctly detect IPv4 forwarding 
When memory cgroup is absent, there was not attempt to detect if IPv4
forwarding was enabled and therefore, docker was printing a warning
for each command spawning a new container. The test for IPv4
forwarding was guarded by the test for memory cgroup.
Upstream-commit: 64b817a5c12545252d0cbb3d4ce1f23996bb266b
Component: engine
 2013-08-11 11:52:16 +02:00
Colin Rice c746f1a64f Add warning when net.ipv4.ip_forwarding = 0 
Added warnings to api.go, container.go, commands.go, and runtime.go
Also updated APIInfo to return whether IPv4Forwarding is enabled
Upstream-commit: 10190be5d74bc4b13a885f2ba27c2299c868fd19
Component: engine
 2013-08-07 18:28:39 -04:00
Victor Vieux cb4f99ad54 Merge branch 'master' into new_logs 
Upstream-commit: 5756ba9bc48ef428bd73b9b123807097c1519db0
Component: engine
 2013-07-15 13:57:54 +00:00
Victor Vieux 750c01d0af wip 
Upstream-commit: 941e3e2ef09092306a7a287ce62b6fb518af9c56
Component: engine
 2013-07-11 17:18:28 +00:00
Victor Vieux d8be5aafec rebase master 
Upstream-commit: bf7d6cbb4af2e7176c66d2ad74515699b7898fea
Component: engine
 2013-07-08 13:26:29 +00:00