Ben Firshman
c12d1d73f0
Remove containers in scripts
...
So we don't clutter up Docker with loads of stopped containers.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-09 10:49:37 -08:00
Jeffrey Morgan
ba9c90b256
Merge pull request #129 from kitematic/jmorgan_fix_app_sync
...
Putting back App object removal
2014-12-09 10:49:12 -08:00
Jeffrey Morgan
8058c39120
Merge pull request #129 from kitematic/jmorgan_fix_app_sync
...
Putting back App object removal
2014-12-09 10:49:12 -08:00
Jeff Morgan
2e6750b1d5
Putting back App object removal
2014-12-09 10:48:59 -08:00
Jeff Morgan
6456650154
Putting back App object removal
2014-12-09 10:48:59 -08:00
Ben Firshman
e794e79209
Merge pull request #665 from benlangfeld/support-env-file
...
Support env file
2014-12-09 18:42:31 +00:00
Michael Crosby
64ebffe7b6
Merge pull request #9467 from icecrime/9401-restrict_add_chown_scope
...
Reduce permissions changes scope after ADD/COPY
2014-12-09 10:40:23 -08:00
Jeff Morgan
f4e16f8136
Merge branch 'master' into jmorgan_bump_0.4.1
2014-12-09 10:38:47 -08:00
Jeff Morgan
a80257cdc5
Merge branch 'master' into jmorgan_bump_0.4.1
2014-12-09 10:38:47 -08:00
Jeffrey Morgan
7be8baba6e
Merge pull request #128 from kitematic/jmorgan_fix_appdelete
...
Fixing but where app would not be deleted
2014-12-09 10:38:27 -08:00
Jeffrey Morgan
46c128b295
Merge pull request #128 from kitematic/jmorgan_fix_appdelete
...
Fixing but where app would not be deleted
2014-12-09 10:38:27 -08:00
Jeff Morgan
37cbb3d118
Fixing but where app would not be deleted
2014-12-09 10:37:07 -08:00
Jeff Morgan
aeffbc305d
Fixing but where app would not be deleted
2014-12-09 10:37:07 -08:00
Michael Crosby
86efd1a102
Merge pull request #9447 from ashahab-altiscale/7687-lxc-cap-add-cap-drop
...
LXC CAP ADD CAP DROP IN TEMPLATE
2014-12-09 10:35:52 -08:00
Jeff Morgan
fd5d54a313
bump version
2014-12-09 10:05:40 -08:00
Jeff Morgan
9a4a6eec42
bump version
2014-12-09 10:05:40 -08:00
Tianon Gravi
ca2ebaeafe
Merge pull request #9581 from vbatts/vbatts-fix_gh9138
...
contrib: fix the docker-device-tool
2014-12-09 09:30:37 -08:00
Ben Firshman
05ab691caf
Merge pull request #53 from bfirsh/do-not-use-boot2docker-iso-on-disk
...
Don't use boot2docker ISO on disk
2014-12-09 16:11:17 +00:00
Ben Firshman
e3d7f6f46d
Merge pull request #58 from ndeloof/patch-1
...
Azure provider uses .pem file to authenticate
2014-12-09 16:10:54 +00:00
shishir-a412ed
2597bffe9a
Added description for 'docker run' command, -c/--cpu-shares flag
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
2014-12-09 09:55:56 -05:00
James Turnbull
c587a3faf6
Merge pull request #9558 from philips/fixup-typo-in-systemd-article
...
docs: docker.service not services
2014-12-09 23:10:17 +11:00
James Turnbull
74b29e8b45
Merge pull request #9559 from philips/use-dropins-in-systemd-article
...
docs: use systemd drop-ins instead of copying
2014-12-09 23:09:52 +11:00
Olivier Gambier
a8ecb17d7e
Merge pull request #833 from stevvooe/next-generation
...
Address bug in inmemory filesystem WriteAt method
2014-12-09 00:56:32 -08:00
Nicolas De loof
2c11b726af
Azure provider uses .pem file to authenticate
...
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com >
2014-12-09 08:36:46 +01:00
Stephen J Day
45c29be442
Address bug in inmemory filesystem WriteAt method
2014-12-08 21:08:07 -08:00
Brian Bland
cacf33ab62
Uses random paths with slashes for storagedriver tests, adds edge cases
...
This replaces only using flat filenames, to better test nested file
behaviors.
Fixed inmemory/mfs.go and filesystem/driver.go after finding bugs with
the new tests and test behavior.
2014-12-08 19:26:29 -08:00
Ben Firshman
8c5da29ab5
Merge pull request #57 from bfirsh/remove-go-get-from-build-instructions
...
Remove go get from build instructions
2014-12-09 01:49:30 +00:00
Ben Firshman
6e27d2de18
Remove go get from build instructions
...
No we're building inside Docker, you don't need a GOPATH
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-08 17:48:48 -08:00
Victor Vieux
c6815ee1fe
add test and remove unused funcs
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-09 01:39:39 +00:00
Victor Vieux
d1d8bd5356
add a few tests
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-09 01:23:02 +00:00
Ben Firshman
d432ac6b9f
Merge pull request #55 from bfirsh/build-and-test-using-docker
...
Build and test using Docker
2014-12-09 01:20:32 +00:00
Ben Firshman
e42afabd03
Build and test using Docker
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-08 16:46:40 -08:00
Ben Firshman
415c3f2c0c
Don't use boot2docker ISO on disk
...
This was a hack for the DockerCon demo. We do want some way of
caching the boot2docker image, but this certainly isn't the way.
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
2014-12-08 16:26:57 -08:00
Victor Vieux
ab4ca301ab
add simple api tests
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-09 00:19:50 +00:00
Victor Vieux
ebe77641c7
prevent panic in random strategy if no node
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-09 00:19:24 +00:00
Victor Vieux
21ee7e1a13
error when name already exists in docker run
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-09 00:18:22 +00:00
Brian Bland
9e38ca2231
Runs s3 storagedriver tests against all regions (excluding gov)
2014-12-08 16:16:36 -08:00
unclejack
f568b282fe
Merge pull request #9573 from crosbymichael/flush-stdin
...
Flush stdin from within chroot archive
2014-12-09 01:54:01 +02:00
Fred Lifton
03d1622ab8
Merge pull request #9522 from SvenDowideit/add-some-cap-add-examples
...
Add some cap add examples
2014-12-08 15:50:25 -08:00
Ben Langfeld
98b6d7be78
Add support for 'env_file' key
...
Signed-off-by: Ben Langfeld <ben@langfeld.me >
2014-12-08 23:42:09 +00:00
Michael Crosby
d1535131d2
Flush stdin from within chroot archive
...
This makes sure that we don't buffer in memory and that we also flush
stdin from diff as well as untar.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2014-12-08 15:41:07 -08:00
Tibor Vass
c9285a08b1
Merge pull request #9539 from flynn/chroot-untar-empty-archive-slow
...
Fix chroot untar for zero padded archive from slow reader
2014-12-08 17:59:21 -05:00
Alexander Morozov
0d94196999
Merge pull request #9567 from jfrazelle/8333-net-link-error
...
Throw error when container links to --net host container
2014-12-08 14:36:44 -08:00
Ben Firshman
fbc2e92924
Merge pull request #44 from MSOpenTech/master
...
Fixed Remove() method in Azure driver
2014-12-08 22:24:14 +00:00
Ben Firshman
54de0cf03f
Merge pull request #49 from bfirsh/add-badges-and-irc-channel
...
Add Travis badge and IRC channel to readme
2014-12-08 22:20:36 +00:00
Victor Vieux
541cb74e84
error when docker run without -d
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-08 21:43:03 +00:00
Andrea Luzzardi
b101b6a36a
Merge pull request #159 from docker/improve-readme-consistency
...
Improve readme consistency
2014-12-08 13:37:18 -08:00
Ben Firshman
a12cf826cd
Merge pull request #585 from alunduil/add-tests-to-sdist
...
Add tests to sdist.
2014-12-08 21:34:47 +00:00
Ben Firshman
d18cfa1c98
Merge pull request #661 from bfirsh/add-entrypoint-to-dockerfile
...
Add fig as entrypoint to Dockerfile
2014-12-08 21:32:06 +00:00
Victor Vieux
e4655e1128
update node_ip
...
Signed-off-by: Victor Vieux <vieux@docker.com >
2014-12-08 21:26:28 +00:00