Commit Graph

7393 Commits

Author SHA1 Message Date
42eaf397ba Merge pull request #5140 from unclejack/build_immediate_cleanup
delete containers during build after every step
Upstream-commit: 897bf5439d83b5255cdcc53e8a888740919b9d04
Component: engine
2014-04-10 10:49:13 -07:00
98f471928f Merge pull request #5069 from tianon/hack-make-ubuntu-man
Add contrib/man to our generated deb
Upstream-commit: 7dd9c208fdb4ea3083783437843ea27c7c8a077b
Component: engine
2014-04-10 08:04:04 -07:00
0c1b844ea4 Merge pull request #5087 from vbatts/vbatts-save_permissions
docker save: fix filemode permissions
Upstream-commit: 4a88e111d094ed40894e304b15e03f90ff920350
Component: engine
2014-04-10 08:00:37 -07:00
39bbc0e47b Merge pull request #5131 from crosbymichael/shm-mode
Change shm mode to 1777
Upstream-commit: 042a50a8fe1e54ce602d1c517091381c209eabf3
Component: engine
2014-04-10 07:50:32 -07:00
b4f2aeb444 Merge pull request #5115 from alexlarsson/fix-libcontainer-network-rhel6
Fix libcontainer network support on rhel6
Upstream-commit: 5b242c95da303ee26d3119678340050670fed45a
Component: engine
2014-04-10 07:45:12 -07:00
9ad3dcddb0 Merge pull request #5133 from crosbymichael/revert-hairpin
Revert "Support hairpin NAT without going through docker server"
Upstream-commit: ec9190cdd253a011881f646c8d6140cb1f0fcf9d
Component: engine
2014-04-10 07:06:35 -07:00
b874685c9d Merge pull request #5050 from SvenDowideit/add-some-words-to-cli
add some more text to the cli docs
Upstream-commit: 49e87d1932e9ac44ecfc2a5cd4257e3b3d9972e0
Component: engine
2014-04-10 07:05:19 -07:00
5f4face051 Merge pull request #5109 from jonathanpa/master
Update mac.rst to add homebrew instructions.
Upstream-commit: 0bc479c48b61ffef9978a7b771ebd8e6cbd7334f
Component: engine
2014-04-10 06:42:54 -07:00
ed316755af add some more text to the cli docs
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com> (github: SvenDowideit)
Upstream-commit: e625cee28dc62d7fbc5172e0e9c01708e2bd7fc4
Component: engine
2014-04-10 12:52:46 +00:00
116769b466 delete containers during build after every step
This commit changes the way docker build cleans up containers.
Containers get cleaned up right away after they've been committed and
they've become an image.

When the build fails, only the last container of the failing step is
left behind.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: 7931be5cba784b36a145af7ed0153ade6474dabd
Component: engine
2014-04-10 14:46:42 +03:00
c176d6dfb2 Update mac.rst to add homebrew instructions.
Explain how to install boot2docker and docker by using homebrew.

Docker-DCO-1.1-Signed-off-by: Jonathan Pares <jonathanpa@users.noreply.github.com> (github: jonathanpa)
Upstream-commit: 057d347eafaea9a0044b70e516ace504904a5ba4
Component: engine
2014-04-10 09:48:36 +02:00
bc56d5d95c Merge pull request #5134 from tianon/fix-mtab-symlink-error
Fix spurious mtab symlink error when /etc doesn't exist yet
Upstream-commit: 14e1a2345d606290ba9405a1b813e3f4bb9c2df1
Component: engine
2014-04-09 17:54:29 -07:00
76697ab9bf Merge pull request #5127 from crosbymichael/update-apparmor
Check for apparmor enabled on host to populate profile
Upstream-commit: 8d25eef5efe3f0aa383d44b1ff91f2b966e746a5
Component: engine
2014-04-09 17:04:13 -07:00
3ae166e5de Merge pull request #5102 from shykes/api-cleanup-tests
Make remote API unit tests easier to read and write
Upstream-commit: 7c37cae17d675aa72a2146e881aaa7e30f8d291e
Component: engine
2014-04-09 10:27:03 -07:00
ea28e6ce0e Fix spurious mtab symlink error when /etc doesn't exist yet
symlink /proc/mounts /var/lib/docker/btrfs/subvolumes/1763d6602b8b871f0a79754f1cb0a31b3928bb95de5232b1b8c15c60fa1017f6-init/etc/mtab: no such file or directory

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 3d9cd1e5f102d5e59011ec4baca2662f3dacbad4
Component: engine
2014-04-09 11:13:54 -06:00
ec4e3dca1c Merge pull request #5104 from crosbymichael/update-dns-vf-docs
Update dns and volumes-from docs
Upstream-commit: 407b11c26b194123693c777986071a17a4faf02b
Component: engine
2014-04-09 06:55:52 -07:00
7b99942ebd Fix libcontainer network support on rhel6
It seems that netlink in older kernels, including RHEL6, does not
support RTM_SETLINK with IFLA_MASTER. It just silently ignores it, reporting
no error, causing netlink.NetworkSetMaster() to not do anything yet
return no error.

We fix this by introducing and using AddToBridge() in a very similar manner
to CreateBridge(), which use the old ioctls directly.

This fixes https://github.com/dotcloud/docker/issues/4668

Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Upstream-commit: 59c1b2880be8fb9d9a632fa42a10097c1580591a
Component: engine
2014-04-09 15:44:18 +02:00
6caf919b33 Revert "Support hairpin NAT without going through docker server"
This reverts commit b39d02b611f1cc0af283f417b73bf0d36f26277a.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 63c303eecdbaf4dc7967fd51b82cd447c778cecc
Component: engine
2014-04-09 11:55:08 +00:00
855754fa1c Change shm mode to 1777
Fixes #5126
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 986cf931c38b8cdc51da44af0313502ca1156cfc
Component: engine
2014-04-09 10:53:32 +00:00
7d69f5cd99 Check for apparmor enabled on host to populate profile
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 87f0d63fb2ede63d263d8e8285b83a7f7d12bbf3
Component: engine
2014-04-09 10:22:17 +00:00
8b91dd2d6d Update dns and volumes-from docs
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: a43a600a2cb516813a045e3b90e8a9ae81d8a783
Component: engine
2014-04-08 19:17:30 -07:00
71e18cf0d0 Merge pull request #5022 from tianon/make-validate
Add "make validate" for both local and CI gofmt and DCO verification
Upstream-commit: 566d49c9cafd5e64024e67d2ff1ebbcad6332cbf
Component: engine
2014-04-08 19:17:30 -06:00
39daf771d4 Make remote API unit tests easier to read and write
Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 1e6f21dc9e7b172b28d364741abb92540938c51a
Component: engine
2014-04-08 18:14:47 -07:00
405300e18f Merge pull request #5101 from unclejack/merge_release_v0.10.0
Merge release v0.10.0
Upstream-commit: b602d6ca40c21622bcdbea32656ad0b6030c179b
Component: engine
2014-04-08 16:09:47 -07:00
233e6b1346 Change version to v0.10.0
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: e8aa24c71a53b27d68e2468aaa3be056596b88ed
Component: engine
2014-04-09 02:02:19 +03:00
405a21d10b Merge pull request #5079 from unclejack/bump_v0.10.0
Bump version to v0.10.0
Upstream-commit: e128a606e39fa63c6b4fd6e53a1d88cf00aad868
Component: engine
2014-04-09 01:56:01 +03:00
cd024a8368 Bump version to v0.10.0
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: dc9c28f51d669d6b09e81c2381f800f1a33bb659
Component: engine
2014-04-09 00:49:33 +03:00
ce3c24cfdd Merge pull request #5090 from crosbymichael/remove-vf
Remove volumesfrom from the config
Upstream-commit: 5fbc47f2536a76677c98e0393bdcecc49a61a1c0
Component: engine
2014-04-08 14:46:07 -07:00
7de0d1325f Make volumes-from a slice instead of string split
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: b4f2821e6d4ba6f6073365a244681df21f5d4472
Component: engine
2014-04-08 21:45:06 +00:00
ecfa4893ce Move volumesfrom to hostconfig
This also migrates the volumes from integration tests into the new cli
integration test framework.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: af9746412b6070063f105ae97eba1f8fbd56bd22
Component: engine
2014-04-08 21:45:06 +00:00
77371c5426 Merge pull request #5095 from crosbymichael/remove-ghost-test
Remove restart ghost test
Upstream-commit: a10c17ad11dbe7da389d9bb2185e26ed56cd2204
Component: engine
2014-04-08 14:40:42 -07:00
6ef9e84239 Merge pull request #5089 from creack/replace_existing_docker_apparmor_profile
Backup current docker apparmor profile and replace it with the new one
Upstream-commit: 9839688db3f3470f71ea14f3f418cbb2300e6732
Component: engine
2014-04-08 14:36:11 -07:00
a1d9737575 Merge pull request #5096 from vieux/remove_double_warning
remove double deprecation warning
Upstream-commit: b28ef0e984c02f05298a64d79a499a52ea2f0c76
Component: engine
2014-04-08 14:23:11 -07:00
fbd324c9f0 remove double deprecation warning
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 9260c06f7a7cb172205dc45af96870ec0d02ebcd
Component: engine
2014-04-08 20:58:19 +00:00
e940d2f8fa Remove restart ghost test
We do not allow ghosts anymore and this test does not add any value
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 77a04357a1b66b9e5b2bae2efc0192b927f926fe
Component: engine
2014-04-08 20:56:30 +00:00
352a05bd56 Merge pull request #5066 from crosbymichael/remove-dns-conf
Move DNS options to hostconfig
Upstream-commit: 795d6b8b150db03c62403ab5fbefa5ca7488c2bf
Component: engine
2014-04-08 13:44:26 -07:00
0ee492d819 Merge pull request #5088 from shykes/deprecate-commit-run
Early deprecation warning for 'docker commit --run'
Upstream-commit: 00e080fef695cb6bf9cc2704d0c9a3ccc3081495
Component: engine
2014-04-08 12:32:11 -07:00
61ed858da5 Merge pull request #5091 from jamtur01/fedora_install
Add Fedora installation to install.sh
Upstream-commit: c6046b40f0dfc624bb0cad78f24ed0c1174af7f1
Component: engine
2014-04-08 13:15:00 -06:00
904747ba78 Early deprecation warning for 'docker commit --run'
Warn users of the planned deprecation of 'docker commit --run', and hide
it from the docs and usage message. The option continues to work.

Note that an alternative to 'commit --run' is being implemented but is
not yet available. We are printing the warning anyway because on
the basis that it never hurts to give more advance warning.

The 'commit --run' flag is a leftover from the very early days of Docker,
and has several problems:

1) It is very user unfriendly. You have to pass a literal json dict
which is poorly documented and changes regularly (see PortSpecs vs
ExposedPorts). The merge behavior is not clear and also changes
regularly. it's not possible to unset a value.

2) It overlaps with the Dockerfile syntax. There are 2 ways to set
a default command, expose a port or change an env variable. Some
things can be done in a Dockerfile but not in --run. Some things
can be done in --run but not in a Dockerfile. It would be better
to push a single syntax, allow using it both in a file and via
the command line, and make improvements in a single place.

3) It exposes data structures which should not be publicly exposed.
There are several planned improvements to Docker which require moving
around the content and schema of the various Config, Image and Container
structures. The less of those we expose in public interfaces, the easier
it is to move things around without a reverse compatibility nightmare.

Docker-DCO-1.1-Signed-off-by: Solomon Hykes <solomon@docker.com> (github: shykes)
Upstream-commit: 168f8aba74d9c2996acec6fe1b93a2301523e305
Component: engine
2014-04-08 12:10:47 -07:00
4dd63976db Removed extra whitespace
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: a2aa902ec194169431fea6784c4a7cdab25aaf24
Component: engine
2014-04-08 12:07:27 -07:00
1a88bac6fb Added Fedora installation method
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net> (github: jamtur01)
Upstream-commit: fa5223dab5b9f5cef2a0a341ee5065fec9c6d663
Component: engine
2014-04-08 12:07:16 -07:00
a63cb994eb Merge pull request #5073 from tianon/update-release-bundles
Update RELEASE_BUNDLES to include integration tests
Upstream-commit: 2204a27df08ffaa4ef3ca9ec158527d4a34440a7
Component: engine
2014-04-08 13:05:00 -06:00
3e9d7eaff6 Merge pull request #5076 from tianon/update-hack-make-test-integration-cli
Update test-integration-cli bundlescript for consistency with other bundlescripts and slightly more verbose logging of which commands were executed
Upstream-commit: cc1328d376170bdbd44ec3754050624d52cd3da3
Component: engine
2014-04-08 12:59:08 -06:00
2f36bb5eb3 Merge pull request #5083 from shin-/4343-http_401_private_push_error
Added specific error message when hitting 401 over HTTP on push
Upstream-commit: 29fd62f396c0f526138fe68792cdebde423c4790
Component: engine
2014-04-08 11:19:17 -07:00
c2ee8e861a Backup current docker apparmor profile and replace it with the new one
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume@charmes.net> (github: creack)
Upstream-commit: 4f828d67f00449182eaada50dfba37e00f8f01ef
Component: engine
2014-04-08 11:09:31 -07:00
d8ba8b0f57 Merge pull request #5085 from tianon/more-readable-crossplatforms-list
Update DOCKER_CROSSPLATFORMS to be more readable
Upstream-commit: a056a9ca223a91be5aaaaa8a61c31b765903a381
Component: engine
2014-04-08 11:08:57 -07:00
313dc27451 Merge pull request #5068 from tianon/fix-abs-volume-check
Fix edge case in bind mount absolute path detection
Upstream-commit: 1bcb9ce69e62476a8ff80d210aad85d86a72dd7b
Component: engine
2014-04-08 20:03:52 +03:00
db9feb7670 docker save: fix filemode permissions
currently the files created are not readable. This makes the files and
directories permissions more sane.

Docker-DCO-1.1-Signed-off-by: Vincent Batts <vbatts@redhat.com> (github: vbatts)
Upstream-commit: 0a6d42e2085b9cd1d057779a5b0a80cd49292c37
Component: engine
2014-04-08 12:39:25 -04:00
792e71d487 Update DOCKER_CROSSPLATFORMS to be more readable
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: cf655ca98d9c230d02454a39e815fc6b11ac5aed
Component: engine
2014-04-08 09:42:47 -06:00
25edfd6bbc Added specific error message when hitting 401 over HTTP on push
Docker-DCO-1.1-Signed-off-by: Joffrey F <joffrey@docker.com> (github: shin-)
Upstream-commit: 8b2bcd9a4bddf1b99ca201d81ac0a67c2b09fbe0
Component: engine
2014-04-08 17:07:29 +02:00