docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,531 Commits 17 Branches 28 Tags 824 MiB
Commit Graph

4531 Commits

Author SHA1 Message Date
Guillaume J. Charmes 369e39aea1 Merge pull request #2680 from inglesp/patch-1 
Typo in ROADMAP.md
 2013-11-13 09:19:37 -08:00
¨Sven af0b2e38c3 add a little more info about the limitations of ADD wrt ../ and docker build - 2013-11-13 22:55:55 +10:00
inglesp 87b4bb9fcc Typo in ROADMAP.md 2013-11-13 12:32:49 +00:00
Freek Kalter f5e6c2d060 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.
 2013-11-13 13:20:38 +01:00
¨Sven f0f8462d18 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 2013-11-13 22:11:20 +10:00
Tianon Gravi 8523d5518c Update to go1.2rc4 2013-11-12 21:51:12 -07:00
Solomon Hykes 6c4393ccbb Merge branch 'job-create-start-clean' into engine-patch-2 
Conflicts:
	engine/engine.go
	engine/job.go
	server.go
	utils_test.go
 2013-11-13 00:36:20 +00:00
Solomon Hykes 3885ef585b Merge pull request #2612 from tianon/release-script-tweaks 
* Hack: release script tweaks
 2013-11-12 15:04:26 -08:00
Victor Vieux 388057f11a Merge pull request #2648 from dotcloud/docker_kill_exit_code 
Make sure docker kill exit with failure in case of error
 2013-11-12 14:40:17 -08:00
Michael Crosby a06edd77e5 Merge pull request #22 from shykes/shykes-0.6.5-dm-plugin 
Fix ImageTree test
 2013-11-12 12:30:30 -08:00
Guillaume J. Charmes c69e6a90e4 Merge pull request #2663 from viirya/fix_nameserver_regex 
Fix nameserver regex
 2013-11-12 12:29:40 -08:00
Guillaume J. Charmes 08623dc216
Fix ImageTree test 2013-11-12 12:25:35 -08:00
Guillaume J. Charmes 50d80a8938 Merge pull request #17 from alexlarsson/dm-plugin-whiteout-directory 
archive.ApplyLayer() - handle directory whiteouts
 2013-11-12 12:16:30 -08:00
Alexander Larsson 6f3c32eb18 archive.ApplyLayer() - handle directory whiteouts 
When directories are white-outed we can get called with the previously
removed directories. Handle this with os.IsNotExist(error).
 2013-11-12 21:14:54 +01:00
Guillaume J. Charmes 0dd92d8f1c Merge pull request #21 from crosbymichael/pull-parent-layers 
Pull parent layers first before children
 2013-11-12 11:50:20 -08:00
Michael Crosby 7301fbe035 Pull parent layers first before children 2013-11-12 11:48:35 -08:00
Guillaume J. Charmes 4ec05b5dbf Merge pull request #20 from crosbymichael/force-driver-to-implement-differ 
Force driver to implement differ
 2013-11-12 11:48:20 -08:00
Victor Vieux 71c05bb87c Merge pull request #2662 from dotcloud/do_not_cleanup_start_if_running 
on docker start, do not cleanup if already running
 2013-11-12 11:02:10 -08:00
Victor Vieux 637850063c Merge pull request #2614 from dotcloud/prevent_delete_image_running_container 
Runtime: prevent deletion if image is used by a running container
 2013-11-12 11:01:51 -08:00
Victor Vieux dcc9980550 Merge pull request #2657 from dotcloud/fix_docker_images_output 
use utils.ParseRepositoryTag instead of strings.split in docker images
 2013-11-12 11:01:29 -08:00
Victor Vieux e405337926 Merge pull request #2669 from tianon/clarify-test-calls 
Add clarification of multiple "go test" calls in hack/make/*test
 2013-11-12 10:42:24 -08:00
Tianon Gravi 5cdb3aec50 Add clarification of multiple "go test" calls in hack/make/*test 2013-11-12 11:23:06 -07:00
Victor Vieux b314f19db8 Merge branch 'tests/insert' of https://github.com/mrallen1/docker into mrallen1-tests/insert 
Conflicts:
	server.go
 2013-11-12 10:19:29 -08:00
Roberto Gandolfo Hashioka 353243a725 - Improved documentation and typos fixing (Thanks to @jamtur01) 2013-11-12 10:11:52 -08:00
Liang-Chi Hsieh 879aa29cb0 modify test of GetNameserversAsCIDR for its regex change. 2013-11-12 18:18:30 +08:00
Michael Crosby 5d9723002b Allow drivers to implement ApplyDiff in Differ interface 2013-11-11 19:09:57 -08:00
Liang-Chi Hsieh 1e5ba57de3 fix nameserver regex. 2013-11-12 10:53:34 +08:00
Victor Vieux bc6d872841 on docker start, do not cleanup if already running 2013-11-11 18:15:38 -08:00
Roberto Gandolfo Hashioka 981560c436 - Added a doc about Links and Container Naming 2013-11-11 17:38:54 -08:00
Victor Vieux d589cc3622 Merge pull request #2527 from jpoimboe/fedora-iptables-fix 
Fix container networking on Fedora
 2013-11-11 15:12:40 -08:00
Andy Rothfusz 69a9614cb4 Merge pull request #2621 from rogaha/rm_del_all_example 
- Added delete all the containers example (docker rm `docker ps -a -q`)
 2013-11-11 14:55:50 -08:00
Victor Vieux e2ac0e6b80 add wait, stop, start, restart, rm, rmi 2013-11-11 14:47:23 -08:00
Michael Crosby 2c7f50a77d Add ability to exclude files from tar 2013-11-11 14:30:38 -08:00
Solomon Hykes 01dd7e7459 Change crypto export notice to meet Debian requirements 2013-11-11 22:08:37 +00:00
Victor Vieux 84a3600ea8 use utils.ParseRepositoryTag instead of strings.split in docker images 2013-11-11 13:54:17 -08:00
Andy Rothfusz cb9e0aee48 Merge pull request #2646 from fgrehm/contrib-vagrant 
Update contrib/vagrant-docker with projects available
 2013-11-11 13:49:15 -08:00
Andy Rothfusz 52d3137713 Merge pull request #2641 from artagnon/master 
CONTRIBUTING: wrap a couple of long lines
 2013-11-11 13:43:30 -08:00
Victor Vieux 4c7d24bc8b Merge branch 'master' of https://github.com/zilin/docker into zilin-master 
Conflicts:
	container.go
 2013-11-11 12:59:18 -08:00
Victor Vieux 87c8437a90 Merge pull request #2140 from SvenDowideit/2098-run-cidfile-should-return-longid 
Server: always return long id's
 2013-11-11 13:06:19 -08:00
Daniel Mizyrycki 6fab249b21 Merge pull request #2313 from wazboy/master 
Vagrant AWS update
 2013-11-11 13:01:20 -08:00
Victor Vieux da24945070 Merge branch 'master' of https://github.com/aanand/docker into aanand-master 2013-11-11 12:34:16 -08:00
Michael Crosby 4d1a537433 Remove Differ and Changer interfaces 
Add the methods to the Driver interface
to force the drivers to implement the methods
 2013-11-11 12:10:53 -08:00
Tianon Gravi ca113bb1b2 Merge pull request #2613 from tianon/ubuntu-fpm-tweaks 
Update ubuntu packaging script, especially to stop docker group deletion
 2013-11-11 12:01:40 -08:00
Andy Rothfusz 9ff36cb00c Merge pull request #2630 from jamtur01/api_status 
Added status column to API client table
 2013-11-11 11:56:04 -08:00
Mark Allen 62f873aa1f Just return the id; nothing else. 2013-11-11 13:26:24 -06:00
Tianon Gravi 2091b59721 Merge pull request #2653 from tianon/sysvinit-upstart-check 
Update upstart check in sysvinit to be exactly the same as the init_is_upstart function
 2013-11-11 11:00:07 -08:00
Tianon Gravi 88edba7e86 Update upstart check in sysvinit to be exactly the same as the init_is_upstart function from /lib/lsb/init-functions (which isn't available in 12.04 or we'd use it directly) 2013-11-11 11:57:25 -07:00
Solomon Hykes ec6fe9f200 Hack: set NONUKE environment variable to run the tests without cleanup, to investigate temp directories 2013-11-11 18:56:21 +00:00
Tianon Gravi 5fe4c9a39a Merge pull request #2651 from tianon/fix-sysvinit-upstart-logic 
Fix sysvinit upstart detection and give it a pretty message
 2013-11-11 10:39:51 -08:00
Michael Crosby 2fc0084f6b Merge pull request #2633 from danderson/2598-fix-iptables-anydest 
Correctly express "any address" to iptables.
 2013-11-11 10:22:02 -08:00