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
4,069 Commits 12 Branches 296 Tags
0f14533ff9a9a83bb7eed0ae67f4746ff0885c19
Commit Graph

4069 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume J. Charmes
0f14533ff9 Merge pull request #2704 from shykes/fix-auto-pull 
Fix the brittle errorstring-to-httperror recognition code
Upstream-commit: 84ed18827a5903c7df61146a8fd716e8245830e7
Component: engine
 2013-11-14 16:15:46 -08:00
Solomon Hykes
d641b4b09e Fix the brittle errorstring-to-httperror recognition code which in turn is required by autopull (the client issues a pull if container creation returns 404) 
Upstream-commit: 693ff4d2ae5f0d723469340f67bb55f7aa3e824b
Component: engine
 2013-11-14 23:54:28 +00: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
Andy Rothfusz
43fe95ed51 Merge pull request #2691 from SvenDowideit/add-instruction-path-limitations 
except URL-based ADDs
Upstream-commit: c7aaf831d7ae6ddd0a897c6f687d479904536107
Component: engine
 2013-11-14 11:12:08 -08:00
¨Sven
7b5ae8dd36 thankyou @tomdz - I forgot about URL based ADDs 
Upstream-commit: e42144674fb6eeb76bcda822105b049f7fb6ab30
Component: engine
 2013-11-14 14:53:55 +10:00
Andy Rothfusz
d8cd1b4245 Merge pull request #2688 from dhrp/doc-layout-dotcloud-to-docker-inc 
Updated documentation footer to say "Docker Inc." instead of dotCloud. And added Read the Docs.
Upstream-commit: 61abc3f8ac89bd3b238a7ceaf26fa004c462848b
Component: engine
 2013-11-13 18:31:21 -08:00
Andy Rothfusz
e96e8ebc75 Merge pull request #2661 from rogaha/links_docs 
- Added a doc about Links and Container Naming
Upstream-commit: 5fc56b6b47ede3f6c86177fa315743196854412b
Component: engine
 2013-11-13 18:15:25 -08:00
Thatcher Peskens
687d57d2f0 Updated documentation footer to say "Docker Inc." instead of dotCloud. And added link to Read the Docs for giving them credit to hosting us. (Thanks Read The Docs!) 
Upstream-commit: 9ab85f4d1220d04a3b682d5612ff27db5983f5d3
Component: engine
 2013-11-13 16:09:23 -08:00
Andy Rothfusz
de14ff2222 Merge pull request #2679 from FreekKalter/master 
fix error in python webapp example
Upstream-commit: 3cf23b93eaf0b51983204bb28182eb39c0791559
Component: engine
 2013-11-13 13:35:01 -08:00
Guillaume J. Charmes
048409a651 Merge pull request #2676 from tianon/go1.2rc4 
Update to go1.2rc4
Upstream-commit: 3ba6835ead266a9f365b897ca29db8de2278e994
Component: engine
 2013-11-13 11:45:56 -08:00
Guillaume J. Charmes
240d1e68ec Merge pull request #2686 from shykes/gofmt 
gofmt
Upstream-commit: dc13b9473f19dec441f02de8aa79ca61b5d8b2ee
Component: engine
 2013-11-13 11:35:37 -08:00
Solomon Hykes
cea9cd6554 gofmt 
Upstream-commit: b00d5f018541bf141dc4732ad6d71d23b8c28b43
Component: engine
 2013-11-13 19:25:55 +00:00
Andy Rothfusz
8a1c75284e Merge pull request #2660 from SvenDowideit/2601-remote-api-json-case 
update the API docs to reflect the change in the case of the /index/search reposnse
Upstream-commit: 8e71391572adeaa6e5d0f980e71168ba8ef98b46
Component: engine
 2013-11-13 11:17:54 -08:00
Andy Rothfusz
cbc18a2e03 Merge pull request #2681 from SvenDowideit/add-instruction-path-limitations 
add a little more info about the limitations of ADD wrt ../ and docker build
Upstream-commit: 077c2496ed39b6682924b1da9d388e5a21453310
Component: engine
 2013-11-13 10:56:35 -08:00
Tianon Gravi
6b9d5c5bd5 Merge pull request #2652 from tianon/upstart-defaults-too 
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
Upstream-commit: b94e9ed0de0817d07ad590e5d32262016f25e6e8
Component: engine
 2013-11-13 10:42:41 -08:00
Solomon Hykes
95762ca3a4 Merge pull request #2673 from shykes/engine-patch-2 
* Engine: expand the engine API with 'create' and 'start' jobs Edit
Upstream-commit: c964494d315ea672e2a4987cbfd9c9e8852553b8
Component: engine
 2013-11-13 10:14:56 -08:00
Solomon Hykes
2a405d59e4 Merge pull request #2656 from shykes/export-restrictions-debian 
Change crypto export notice to meet Debian requirements
Upstream-commit: c6e83b8779f6792163548f216f6402f691e3ee61
Component: engine
 2013-11-13 09:37:23 -08:00
Guillaume J. Charmes
0f9abe6bf6 Merge pull request #2680 from inglesp/patch-1 
Typo in ROADMAP.md
Upstream-commit: 369e39aea1b87dc85b829937bea2f7c48436ba99
Component: engine
 2013-11-13 09:19:37 -08:00
¨Sven
59d38006c9 add a little more info about the limitations of ADD wrt ../ and docker build - 
Upstream-commit: af0b2e38c3b2688cd4c2e831847bf4601d8fc149
Component: engine
 2013-11-13 22:55:55 +10:00
inglesp
6d93aad6a7 Typo in ROADMAP.md 
Upstream-commit: 87b4bb9fcc41806da4ed3151e74511120c099115
Component: engine
 2013-11-13 12:32:49 +00:00
Freek Kalter
172689d6bb fix error in python webapp example 
When getting the private port used by a container using
`docker port` returns 0.0.0.0:49353, stript just the portnumber of the address with awk to used it in the rest of the example code.
Upstream-commit: f5e6c2d060d5eb052929c4ab14bf3256b260afc4
Component: engine
 2013-11-13 13:20:38 +01:00
¨Sven
b5a0f0ad5b update the v1.7 API to reflect the case change in the /index/search response, and note that its to align better with the registry server response that its proxying 
Upstream-commit: f0f8462d18cf2efc44ee48cfdd2706e8a4a800d6
Component: engine
 2013-11-13 22:11:20 +10:00
Tianon Gravi
c52a89950a Update to go1.2rc4 
Upstream-commit: 8523d5518c500903c19a53f73c653318e4db38f9
Component: engine
 2013-11-12 21:51:12 -07:00
Solomon Hykes
a48718c85a Merge branch 'job-create-start-clean' into engine-patch-2 
Conflicts:
	engine/engine.go
	engine/job.go
	server.go
	utils_test.go
Upstream-commit: 6c4393ccbbec0fa66f9fc7e326b5a2809615c3a1
Component: engine
 2013-11-13 00:36:20 +00:00
Solomon Hykes
cd79a08f60 Merge pull request #2612 from tianon/release-script-tweaks 
* Hack: release script tweaks
Upstream-commit: 3885ef585bf132a04e174f32e6bb7e86d7730c32
Component: engine
 2013-11-12 15:04:26 -08:00
Victor Vieux
5c6b4b612c Merge pull request #2648 from dotcloud/docker_kill_exit_code 
Make sure docker kill exit with failure in case of error
Upstream-commit: 388057f11a20fd8b4bfd7d1b0d9f0cb18a72afa8
Component: engine
 2013-11-12 14:40:17 -08:00
Guillaume J. Charmes
071e45dc12 Merge pull request #2663 from viirya/fix_nameserver_regex 
Fix nameserver regex
Upstream-commit: c69e6a90e49d27916a8294044510b968206ab4a2
Component: engine
 2013-11-12 12:29:40 -08:00
Victor Vieux
9c96f5d03b Merge pull request #2662 from dotcloud/do_not_cleanup_start_if_running 
on docker start, do not cleanup if already running
Upstream-commit: 71c05bb87c4f005ce8f87caa512d4a85896543fb
Component: engine
 2013-11-12 11:02:10 -08:00
Victor Vieux
6ba500a617 Merge pull request #2614 from dotcloud/prevent_delete_image_running_container 
Runtime: prevent deletion if image is used by a running container
Upstream-commit: 637850063c7c218db83857e5fd01c3a472094a8d
Component: engine
 2013-11-12 11:01:51 -08:00
Victor Vieux
b17fc3fb8e Merge pull request #2657 from dotcloud/fix_docker_images_output 
use utils.ParseRepositoryTag instead of strings.split in docker images
Upstream-commit: dcc9980550d46ca43878566f00d5259fce05b1ca
Component: engine
 2013-11-12 11:01:29 -08:00
Victor Vieux
89853bca87 Merge pull request #2669 from tianon/clarify-test-calls 
Add clarification of multiple "go test" calls in hack/make/*test
Upstream-commit: e40533792669bec52f696f1c68bb72fdcebbac1c
Component: engine
 2013-11-12 10:42:24 -08:00
Tianon Gravi
78d1d60f74 Add clarification of multiple "go test" calls in hack/make/*test 
Upstream-commit: 5cdb3aec507d9df7bb98366f04c4303a2172cbd5
Component: engine
 2013-11-12 11:23:06 -07:00
Victor Vieux
111d9154c1 Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert 
Conflicts:
	server.go
Upstream-commit: b314f19db8f2180292691f20f28783042b80495e
Component: engine
 2013-11-12 10:19:29 -08:00
Roberto Gandolfo Hashioka
9bdd66f858 - Improved documentation and typos fixing (Thanks to @jamtur01) 
Upstream-commit: 353243a7254705f92c3d775eec1f9cfe14fa4170
Component: engine
 2013-11-12 10:11:52 -08:00
Liang-Chi Hsieh
5ec9c64577 modify test of GetNameserversAsCIDR for its regex change. 
Upstream-commit: 879aa29cb09c641bbd510eed03647f8f85f0d559
Component: engine
 2013-11-12 18:18:30 +08:00
Liang-Chi Hsieh
31cff767cd fix nameserver regex. 
Upstream-commit: 1e5ba57de372bd13b0231e969dbb62a7fa8d7b52
Component: engine
 2013-11-12 10:53:34 +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
Roberto Gandolfo Hashioka
c75d132f03 - Added a doc about Links and Container Naming 
Upstream-commit: 981560c43631e1b09b6f90945d2d5e58345cabd2
Component: engine
 2013-11-11 17:38:54 -08:00
Victor Vieux
b60d444c4f Merge pull request #2527 from jpoimboe/fedora-iptables-fix 
Fix container networking on Fedora
Upstream-commit: d589cc36227702e40038704ab048efff23bc71d9
Component: engine
 2013-11-11 15:12:40 -08:00
Andy Rothfusz
1e55bfad23 Merge pull request #2621 from rogaha/rm_del_all_example 
- Added delete all the containers example (docker rm `docker ps -a -q`)
Upstream-commit: 69a9614cb4654616baf9fb849275d6ec74a13a33
Component: engine
 2013-11-11 14:55:50 -08:00
Victor Vieux
b55bba158e add wait, stop, start, restart, rm, rmi 
Upstream-commit: e2ac0e6b806c094fd8a3b706653623c0c2aee861
Component: engine
 2013-11-11 14:47:23 -08:00
Solomon Hykes
e57467c180 Change crypto export notice to meet Debian requirements 
Upstream-commit: 01dd7e74592b7b45c56d1187e7dcfaac39e67be1
Component: engine
 2013-11-11 22:08:37 +00:00
Victor Vieux
a30846b548 use utils.ParseRepositoryTag instead of strings.split in docker images 
Upstream-commit: 84a3600ea82d1a3ea235f1193092206c1f0c011a
Component: engine
 2013-11-11 13:54:17 -08:00
Andy Rothfusz
30fca0b017 Merge pull request #2646 from fgrehm/contrib-vagrant 
Update contrib/vagrant-docker with projects available
Upstream-commit: cb9e0aee485ea5b244cd1153644e7c558cd4b9a7
Component: engine
 2013-11-11 13:49:15 -08:00
Andy Rothfusz
23b6b1b409 Merge pull request #2641 from artagnon/master 
CONTRIBUTING: wrap a couple of long lines
Upstream-commit: 52d3137713c3083c28676c020bf90e95c6d44d03
Component: engine
 2013-11-11 13:43:30 -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
Daniel Mizyrycki
846d1113e1 Merge pull request #2313 from wazboy/master 
Vagrant AWS update
Upstream-commit: 6fab249b21a2555f58c4de468f1f63bb284dc021
Component: engine
 2013-11-11 13:01:20 -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
Tianon Gravi
223e45f83c Merge pull request #2613 from tianon/ubuntu-fpm-tweaks 
Update ubuntu packaging script, especially to stop docker group deletion
Upstream-commit: ca113bb1b2403c73281911700959236e6cea1e4d
Component: engine
 2013-11-11 12:01:40 -08:00