d5407b1cee
Merge pull request #4930 from vieux/fix_regression_import
...
Fix regression import
Upstream-commit: cd0a907325153b985f8090c0e79c7f3cedfb4537
Component: engine
2014-03-31 23:12:39 +03:00
baf4b5ebbb
Merge pull request #4881 from barnybug/fish-completions
...
Update fish completions for docker 0.9.1
Upstream-commit: 6ed2aa1db4b36bf01427f90e55ca37aea203f392
Component: engine
2014-03-31 13:57:00 -06:00
0bfaa6adaf
Merge pull request #4927 from crosbymichael/start-hang
...
Make sure to set error reguardless of attach or stdin
Upstream-commit: 5b98b70f292d34f662ea15db090906ad9bbe7ae4
Component: engine
2014-03-31 12:56:38 -07:00
99b81e3c36
add test
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: b430f4f45be27b9565027b5c89b2506577027e88
Component: engine
2014-03-31 19:31:21 +00:00
bf6fa221d1
fix import display
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 9709c31d1b500fb7cfdb02aaf62c7d8c187874cf
Component: engine
2014-03-31 19:21:57 +00:00
6ecba3e563
Merge pull request #4928 from unclejack/testscli-pull_busybox
...
integration-cli: pull busybox before running
Upstream-commit: bce2464e5e0a8e3efdc28aead5e2229c88d0ccc2
Component: engine
2014-03-31 12:16:44 -07:00
8adb937258
integration-cli: pull busybox before running
...
Make sure the busybox image is ready to be used when running the cli
integration tests.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: f7ae3a1381fdc53042bebec085bb3f108bc05da3
Component: engine
2014-03-31 22:07:23 +03:00
62d94b7696
Merge pull request #4174 from vbatts/vbatts-env_file
...
support for `docker run` environment variables file
Upstream-commit: b45c1061bf447358826f4551ebff79af25444139
Component: engine
2014-03-31 12:01:14 -07:00
589014cbfc
env-file: variable behavior
...
trim the front of variables. Error if there are other spaces present.
Leave the value alone.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 500c8ba4b66c35cf2c29aeb81a9392cc406835a4
Component: engine
2014-03-31 14:45:13 -04:00
7fc896339a
--env-file: simple line-delimited
...
match dock functionality, and not try to achieve shell-sourcing compatibility
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: ff4ac7441ba582c8c339b25b400c6756d9646ff1
Component: engine
2014-03-31 14:45:13 -04:00
b8d8d2a7df
env-file: remove the unneeded deprecation markup
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: d9c257732e435cecdcc1ec8452f35e7614e4713f
Component: engine
2014-03-31 14:45:13 -04:00
745a00084d
env-file: update functionality and docs
...
Multiple flags allowed. Order prescribed. Examples provided. Multiline
accounted for.
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 33dde1f7288781a3a36951309f963e6040a1a0f5
Component: engine
2014-03-31 14:45:13 -04:00
a229ff052a
make the --env-file accept multiple flags
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: acf5289dddfbbd69e19714f53575eb5088c618f7
Component: engine
2014-03-31 14:45:13 -04:00
654ceecb5b
Fixing doc references to --env-file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: bcba5246f993a74eece36aa4b25df5b5e486e15b
Component: engine
2014-03-31 14:44:32 -04:00
a99fc1d72c
go fmt
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 4e0014f582617960bad513518d292b64da866f73
Component: engine
2014-03-31 14:44:32 -04:00
d6e8571af8
--env-file instead of --envfile
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: 586e6c5eb9cd21a95d4bbba051249c4b05b2011e
Component: engine
2014-03-31 14:44:32 -04:00
f552bd89e1
pkg/opts: Close the file handle
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: bfaa917a966fab1e2c92e70617320957a8d8b43b
Component: engine
2014-03-31 14:44:32 -04:00
2d9f166bda
support for docker run environment variables file
...
Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com > (github: vbatts)
Upstream-commit: cd51ac92bdf1ce0a1245f5b4565995631512ba64
Component: engine
2014-03-31 14:44:32 -04:00
3205f2e595
Make sure to set error reguardless of attach or stdin
...
Fixes #3364
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 51d9a04f17d1c8c6c1a069227c1417b20283dda2
Component: engine
2014-03-31 18:33:14 +00:00
3a032ba637
Merge pull request #4901 from vieux/split_api_2_pkg
...
Split API into 2 go packages
Upstream-commit: 1805ef1cccabd3c1beccf88cec98d6a06a1c9188
Component: engine
2014-03-31 21:32:05 +03:00
e50dea8a4b
apply Reduce error level form harmless errors
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 7697aad7b0537dade1d598cca5b7b1b420fa47c9
Component: engine
2014-03-31 18:11:53 +00:00
9772d36088
fix tests
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: 185b040e49aa9ab74f8d9254c7ff86b2891e3708
Component: engine
2014-03-31 18:11:53 +00:00
3772f57532
split client in 2 files
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: ae9ed84fdab4db5cec663bbd2d4ba8bcad897dcc
Component: engine
2014-03-31 18:11:53 +00:00
14450304fa
split API into 2 go packages
...
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com > (github: vieux)
Upstream-commit: a7365a6237c45ed05d96ab11f36fde35d675b462
Component: engine
2014-03-31 18:10:02 +00:00
d6a14805b0
Merge pull request #4926 from tianon/add-cli-tests-to-default-bundles
...
Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all)
Upstream-commit: 25f7b3fbb7cba2ac047db0318a99896173fef0ec
Component: engine
2014-03-31 21:09:44 +03:00
5efea63d21
Merge pull request #4752 from crosbymichael/fix-volumes-from-files
...
Allow volumes from to be individual files
Upstream-commit: b936f4f5e1df450cf220f9e14f610a38ebfd6de0
Component: engine
2014-03-31 21:07:05 +03:00
b8be547acb
Add "test-integration-cli" to our DEFAULT_BUNDLES list (make all)
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 2543912e7b5593722a6a22b9ceb6a23f6268e397
Component: engine
2014-03-31 11:55:55 -06:00
38d0326791
Add integration test for volumes-from as file
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 28015f8e579e7bbe396f65b3343188ca03b06cbd
Component: engine
2014-03-31 17:42:34 +00:00
cbbfe30c09
Allow volumes from to be individual files
...
Fixes #4741
Right now volumes from expected a dir and not a file so when the drivers
tried to do the bind mount, the destination was a dir, not a file so it
fails to run.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a57900e35f2c30026a070fdfdbdb0ce99b35e1ff
Component: engine
2014-03-31 17:27:38 +00:00
cacd6c31a1
Merge pull request #4505 from unclejack/cli_integration_tests
...
cli integration tests
Upstream-commit: 7727c817fb5288f0b9d45ca0a4a37afa2e5329e2
Component: engine
2014-03-31 10:26:38 -07:00
837e04c143
Merge pull request #4922 from creack/reduce_error_lvl
...
Reduce error level form harmless errors
Upstream-commit: 883649ffe7a375906d3ecb2b7df4ced5cf129f00
Component: engine
2014-03-31 20:05:25 +03:00
a21def5c37
Reduce error level form harmless errors
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net > (github: creack)
Upstream-commit: a2487aa683dc84938eb94c1ae29f8160d09441ea
Component: engine
2014-03-31 09:07:56 -07:00
a6c72fd1d9
Merge pull request #4900 from WarheadsSE/fix-bip-docs
...
Fix daemon's documentation for -bip flag
Upstream-commit: c8ae307bab1d0acb109fcbd4aea220a9ba3e03ca
Component: engine
2014-03-30 10:38:36 +10:00
e6fb80c434
Merge pull request #4887 from jameshfisher/nat
...
Add missing port NAT configuration
Upstream-commit: eaf2dd08394fdf4ddb934d59fb8163125aee50d8
Component: engine
2014-03-30 10:28:59 +10:00
466e144973
Small tweaks to the hack scripts to make them simpler
...
Please do with this as you please (including rebasing and/or squashing it), especially under clause (c) of the DCO.
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 3fb1fc0b7b225295b3059cb9a2f5fd9af7a73f36
Component: engine
2014-03-29 23:09:45 +02:00
624997be0f
initial version of cli integration tests
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: 6db32fdefdae49843ed9535b3af1099e6bd2755d
Component: engine
2014-03-29 23:09:40 +02:00
9b7d158e2c
Merge pull request #4884 from rhatdan/remount-var-lib-docker
...
Remount /var/lib/docker as --private to fix scaling issue
Upstream-commit: c705e4a80bd93fac7af38f5384ca61cb884bd22f
Component: engine
2014-03-28 17:15:32 -07:00
0b1efc836d
Fix daemon's documentation for -bip flag
...
Upstream-commit: 36dfa0c4ec90404f76a6ec73c89d199e279ee96c
Component: engine
2014-03-28 18:02:17 -04:00
1647b890f4
Merge pull request #4862 from jsimonelis/dockerfile_reference_typofix
...
documentation typo fix -- Dockerfile reference
Upstream-commit: 058cc8818a44fab83f5274397de223f36e6910db
Component: engine
2014-03-28 16:18:45 -04:00
de2c049dbe
Update AUTHORS
...
Upstream-commit: 7d750180e49159ead712843a9cc1c0c58fd5c53c
Component: engine
2014-03-28 15:15:54 -05:00
29e5fe2708
Merge pull request #4836 from atlassian/master
...
Use environmental proxy when doing a ping to the remote repo
Upstream-commit: e13b4fd869c4f6065267acd99957fcec33349212
Component: engine
2014-03-28 10:24:16 -07:00
20901d954f
Merge pull request #4895 from alexlarsson/dm-clean-shutdown
...
devmapper: Ensure we shut down thin pool cleanly.
Upstream-commit: 755cd482588c0e07c4e6c4d123fc82a62bf64a01
Component: engine
2014-03-28 09:49:04 -07:00
8d7581c203
devmapper: Ensure we shut down thin pool cleanly.
...
The change in commit a9fa1a13c3b0a654a96be01ff7ec19e8009b2094
made us only deactivate devices that were mounted. Unfortunately
this made us not deactivate the base device. Which caused
us to not be able to deactivate the pool.
This fixes that by always just deactivating the base device.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 66c5e19f9bd057644fab475499ea45bb428ba2b2
Component: engine
2014-03-28 15:58:14 +01:00
6d04587343
Remount /var/lib/docker as --private to fix scaling issue
...
If an admin mounts all file systems as -rshared (Default on RHEL and Fedora)
we see a scaling problem as the number of container increase.
Basically every new container needs to have it new mounts in /var/lib/docker
shared to all other containers, this ends up with us only able to scale to
around 100 containers, before the system slows down.
By simply bind mounting /var/lib/docker on its and then setting it private,
the scaling issue goes away.
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 792bb41e524615486ef8266b7bf4804b4fe178f1
Component: engine
2014-03-28 09:19:21 -04:00
8972e580e1
Merge pull request #4759 from crosbymichael/comments-in-buildfile
...
Strip comments before parsing line continuations
Upstream-commit: 5b9c8607d90c20282eb65b75112f09634bcba277
Component: engine
2014-03-28 11:16:32 +02:00
1861c25cbb
Merge pull request #4880 from tianon/ignore-down-interfaces
...
Adjust TestOnlyLoopbackExistsWhenUsingDisableNetworkOption to ignore "DOWN" interfaces
Upstream-commit: 10b7ae39b95d3b4455616e35b407895ebdd55e06
Component: engine
2014-03-28 10:54:11 +02:00
1e8741dfed
Merge pull request #4889 from crosbymichael/fix-commit-validation
...
Fix commit and import when no repository is specified
Upstream-commit: 0fb8146afa6001da0673f4178d73a6545aaa8ad2
Component: engine
2014-03-28 10:25:21 +02:00
ae0da14a77
Merge pull request #4442 from ibuildthecloud/hairpin-nat
...
Support hairpin NAT without going through docker server
Upstream-commit: d2327006d659595e88da653e054f826401b05727
Component: engine
2014-03-27 18:09:42 -07:00
da6de365f6
Merge pull request #4450 from alexlarsson/cgroups-systemd
...
Add systemd implementation of cgroups
Upstream-commit: 69ba31e17ea4dab6b040478720955dece5986f6c
Component: engine
2014-03-28 03:05:02 +02:00
1bc1caf27c
Add missing port NAT configuration
...
Missing port translation causes last line to fail
Docker-DCO-1.1-Signed-off-by: James Fisher <jameshfisher@gmail.com > (github: jameshfisher)
Upstream-commit: 64dd77fa0eb73ec4f395848982ccb60bb3bf8fc5
Component: engine
2014-03-27 23:02:44 +00:00
