docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-05 00:14:17 +03:00
Code Activity
47,845 Commits 92 Branches 28 Tags
c16b77e4a204da17037641db2eadff84035cee92
Commit Graph

47845 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Rothfusz
077c2496ed Merge pull request #2681 from SvenDowideit/add-instruction-path-limitations 
add a little more info about the limitations of ADD wrt ../ and docker build
 2013-11-13 10:56:35 -08:00
Guillaume J. Charmes
46ab7d1e8a Merge pull request #15 from alexlarsson/dm-plugin-explicit-init 
Remove devicemapper lazy initialization
 2013-11-13 10:46:24 -08:00
Tianon Gravi
b94e9ed0de Merge pull request #2652 from tianon/upstart-defaults-too 
Add /etc/default/docker support to upstart, too (mirroring sysvinit)
 2013-11-13 10:42:41 -08:00
Guillaume J. Charmes
e3597624dd Merge pull request #23 from crosbymichael/ignore-dir-sizes 
Ignore dir sizes in TreeSize func
 2013-11-13 10:40:03 -08:00
Ryan Seto
02884ee429 Add more depth to the upstart example in host_integration.rst 
I found that the original example wasn't starting the docker container when docker is started.  So, I modified it using information I found from https://groups.google.com/forum/#!msg/docker-user/OWz8EOpiXuo/L_uxGFQuYlkJ

Also, upstart wasn't starting docker if it wasn't running ahead of time.  So, I added a change to the docker upstart script to solve this.
 2013-11-13 13:34:34 -05:00
Michael Crosby
a4f14528c2 Ignore dir sizes in TreeSize func 2013-11-13 10:33:24 -08:00
Jérôme Petazzoni
8145e57cee Add warning about SYS_BOOT capability with pre-3.4 kernels and pre-0.8 LXC. 2013-11-13 10:29:29 -08:00
Solomon Hykes
c964494d31 Merge pull request #2673 from shykes/engine-patch-2 
* Engine: expand the engine API with 'create' and 'start' jobs Edit
 2013-11-13 10:14:56 -08:00
Solomon Hykes
c6e83b8779 Merge pull request #2656 from shykes/export-restrictions-debian 
Change crypto export notice to meet Debian requirements
 2013-11-13 09:37:23 -08:00
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
Xiuming Chen
0013aa7d9f Minor code simplification for Containers api 2013-11-13 01:29:00 -08:00
Liang-Chi Hsieh
1d7f22c0d4 use Binds key in hostConfig to detect volumes mounted from external. 2013-11-13 15:08:46 +08:00
Liang-Chi Hsieh
6a693176d6 skip the volumes mounted when deleting the volumes of container. 2013-11-13 14:58:24 +08: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