Commit Graph
7117 Commits
Author SHA1 Message Date
Rovanion Luckey 68795e371e All caps variables in normal bash should be avoided not to accidentally collide with environment variables.
Docker-DCO-1.1-Signed-off-by: Rovanion Luckey <rovanion.luckey@gmail.com> (github: Rovanion)
Upstream-commit: b24be254fa042e62e1a08af9105ac92da13a6336
Component: engine
2014-03-09 11:08:11 +01:00
Fabio Falci 7ed3338517 Remove manual http cookie management
Since docker uses cookiejar it doesn't need to manage cookies manually
anymore.
Managing cookie was duplicating it.

Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: df9b99aca0b8a65da866aa5696b9f45df3b92e50
Component: engine
2014-03-09 02:25:19 +00:00
Sven Dowideit a1038a6e80 Merge pull request #4508 from walterl/patch-1
Fixed installmirrors ref
Upstream-commit: d9f47c41c3a451efd18e59d7aedd383db849d56f
Component: engine
2014-03-09 10:15:47 +10:00
Scott Collier dd4dea6b01 Adding options to docker restart documentation
URL of page is: http://docs.docker.io/en/latest/reference/commandline/cli/#restart

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: 694c8e7dfca16fabf63e6fdcdce4151c8440a7a3
Component: engine
2014-03-08 17:23:06 -06:00
Johannes 'fish' Ziemke 46c0bc2613 Add authenticated TLS support for API
Docker-DCO-1.1-Signed-off-by: Johannes 'fish' Ziemke <github@freigeist.org> (github: discordianfish)
Upstream-commit: c000cb64712349141596318dea2a8de2462c8f81
Component: engine
2014-03-09 00:06:44 +01:00
James Turnbull 195571688e Merge pull request #4528 from tomfotherby/patch-1
Correct Docker run --host param to --hostname
Upstream-commit: 198f8d788483d2d69626dba2f0ef710225197b6c
Component: engine
2014-03-08 17:53:55 -05:00
Scott Collier 13e7bd4fb6 Adding the new options to the docker ps documentation.
URL of documentation page is: http://docs.docker.io/en/latest/reference/commandline/cli/#ps

Docker-DCO-1.1-Signed-off-by: Scott Collier <emailscottcollier@gmail.com> (github: scollier)
Upstream-commit: 59acb8c83d3f21ae82c540774653ccd0a46f1a1f
Component: engine
2014-03-08 16:32:00 -06:00
Tianon Gravi c6b9b33a59 Merge pull request #4540 from unclejack/debootstrap_upgrade_packages
Run dist-upgrade after repo updates in mkimage-debootstrap
Upstream-commit: 68217729a3d08ac30ad81ce1cd14c69e96e6b983
Component: engine
2014-03-08 10:10:11 -07:00
unclejack 063107f17f upgrade packages after debootstrap
This makes mkimage-debootstrap upgrade packages after retrieving
updated lists of packages.

Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: d04f4d836c6b2a9266350a1b0e284949dcc6510a
Component: engine
2014-03-08 18:41:50 +02:00
unclejack 7391576547 Merge pull request #4535 from vieux/fix_string_command
fix string in docker images
Upstream-commit: a5c6e08bd61948e973da1d6ffd7b8f55ad44bd22
Component: engine
2014-03-08 17:02:25 +02:00
Victor Vieux ddfc798df3 handle capital
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 7da37fec13a0097284ffbbe05514de477cd98677
Component: engine
2014-03-07 23:40:45 +00:00
Michael Crosby f3cb62633e Bump to version 0.9.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 0ab7b6952a092eec2690967b2ab36e0e604150a4
Component: engine
2014-03-07 15:38:10 -08:00
Michael Crosby d1c9fbd745 Merge branch 'master' into bump_v0.9.0
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ccdf27e502f5b690023fef4145d859059e82c468
Component: engine
2014-03-07 15:37:29 -08:00
Michael Crosby a38b9b106f Merge pull request #4534 from creack/fix_race_kill
Fix Race when killing the daemon
Upstream-commit: d8425d98e61500efa5c404f7450ed4876c7c407a
Component: engine
2014-03-07 18:11:51 -05:00
Sven Dowideit b5b438daae Merge pull request #4524 from gurjeet/patch-3
Correct typo
Upstream-commit: 65283afc8bbbc272d1812d6978d8ff81b5e5922a
Component: engine
2014-03-08 08:43:16 +10:00
Victor Vieux c65746a97c fix string in docker images
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: bc086a9cd61b2d15fbef9db3cb53c7f3650fda48
Component: engine
2014-03-07 20:07:17 +00:00
Guillaume J. Charmes 3a9e0a7416 Fix Race when killing the daemon
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com> (github: creack)
Upstream-commit: b845ff355a3342ee3fee99196d22194706763182
Component: engine
2014-03-07 11:51:28 -08:00
Victor Vieux 5b857edcb5 Merge pull request #4529 from pmorie/typo
Fix typo in devmapper driver_test
Upstream-commit: 27eae50224a8ce68e0379aca0c6d85081c6374a3
Component: engine
2014-03-07 11:01:04 -08:00
Guillaume J. Charmes a29949a7bc Merge pull request #4516 from tianon/fix-static-dockerinit
Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
Upstream-commit: f27ad07139dc166124ee36f003eb968cd6461651
Component: engine
2014-03-07 10:15:49 -08:00
Guillaume J. Charmes cb3ba7d537 Merge pull request #4519 from crosbymichael/back-to-pivot-root
Use env var to toggle pivot root or ms_move
Upstream-commit: 5b0ca89e2a9c5c1a33d246933deff061eda089a2
Component: engine
2014-03-07 10:12:00 -08:00
Paul Morie 926a18e3d9 Fix typo in devmapper driver_test
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com> (github: pmorie)
Upstream-commit: b3e7df48dfbf3d2300877d1e524132624e9493c3
Component: engine
2014-03-07 12:20:25 -05:00
Tom Fotherby f8687ad662 Correct Docker run --host param to --hostname
Upstream-commit: d61938d2b879fe0ccbf46b4a7ca8dd2eb537eee9
Component: engine
2014-03-07 16:41:11 +00:00
Gurjeet Singh b1cd97bc5d Correct typo
Upstream-commit: 6d9a7d6bc3edb8294e05a9903d5fa97239ed12e2
Component: engine
2014-03-07 08:45:08 -05:00
Sven Dowideit 3dd923dd6c Merge pull request #4522 from liubin0329/patch-1
removing redundant dot
Upstream-commit: 3e5102c11e272fd7adf79e6de4d378ff0429c9bd
Component: engine
2014-03-07 23:20:02 +10:00
bin liu 4948f76f10 removing redundant dot
Maybe it's a typo
Upstream-commit: 29079f03cfb0653316b07c58d24f4d547b3de1cc
Component: engine
2014-03-07 18:19:18 +08:00
Tianon Gravi cb49f77b2a Note within the RELEASE-CHECKLIST that "origin" is assumed to be upstream
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 661cf32e4f996385ec7791e93ea8edea80fd2e37
Component: engine
2014-03-06 23:29:08 -07:00
Tianon Gravi cddbaa4e89 Clarify how to update the docs branch in the RELEASE-CHECKLIST with concrete instructions
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0a819380c52cbfcc9d674475913267a33b249e00
Component: engine
2014-03-06 23:16:26 -07:00
Tianon Gravi 0bfbe83abf Resync the DCO text with upstream at http://developercertificate.org/
```
Everyone is permitted to copy and distribute verbatim copies of this
license document, but changing it is not allowed.
```

Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: aceb10b1e51d1d9016b25fa5275e5a4f02772c57
Component: engine
2014-03-06 22:32:58 -07:00
Tianon Gravi fa19c6a895 Add new "DOCKER_CLIENTONLY" build variable to allow skipping of the dockerinit compilation, especially for Homebrew / Mac OS X client-only compilation
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: a40bb2aabc1c0aba8b4de82dc353fae322b8831d
Component: engine
2014-03-06 21:22:25 -07:00
Michael Crosby 957f74b876 Add env var to toggle pivot root or ms_move
Use the  DOCKER_RAMDISK env var to tell the native driver not to use
a pivot root when setting up the rootfs of a container.
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 36dd124b16a76704a88142fa96bb4bb6260dd821
Component: engine
2014-03-06 19:30:52 -08:00
Tianon Gravi 2e92b6ef1e Fix dynbinary so that dockerinit can still be properly static even if it has to link against libapparmor for Ubuntu
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: be344cf0d8e4f9881724f49398603a6e3109bc89
Component: engine
2014-03-06 19:55:22 -07:00
Victor Vieux 3398dcb261 improve alpha sort in mflag
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 3729ece2ea1c4aad286b7535a7c137045a9da107
Component: engine
2014-03-07 02:20:59 +00:00
Michael Crosby 6f0ad9195c Revert "Revert "libcontainer: Use pivot_root instead of chroot""
This reverts commit 82f797f14096430c3edbace1cd30e04a483ec41f.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: c38635020accaffa6868f19f308042be051132a0
Component: engine
2014-03-06 17:19:59 -08:00
Michael Crosby 3e4d7be838 Revert "Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE""
This reverts commit bd263f5b15b51747e3429179fef7fcb425ccbe4a.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 557e4fef4418a251dd3a6817b97e5c1be055cbf3
Component: engine
2014-03-06 17:19:47 -08:00
unclejack 9ba4572a15 Merge pull request #4512 from crosbymichael/no-pivot-root
No pivot root because of ramdisk
Upstream-commit: 78dc1ede5202c8867e011582af8752810f817e9f
Component: engine
2014-03-07 02:54:03 +02:00
unclejack 1eac63153d Merge pull request #4511 from crosbymichael/ensure-native-containers-die
Ensure that native containers die with the parent
Upstream-commit: f244d9763e175ab59e3827a5e873f92d907776a8
Component: engine
2014-03-07 02:49:10 +02:00
Michael Crosby d96ead6498 Revert "libcontainer: Use MS_PRIVATE instead of MS_SLAVE"
This reverts commit 757b5775725fb90262cee1fa6068fa9dcbbff59f.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: bd263f5b15b51747e3429179fef7fcb425ccbe4a
Component: engine
2014-03-06 16:41:03 -08:00
Michael Crosby cf4ed6c883 Revert "libcontainer: Use pivot_root instead of chroot"
This reverts commit 5b5c884cc8266d0c2a56da0bc2df14cc9d5d85e8.

Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 82f797f14096430c3edbace1cd30e04a483ec41f
Component: engine
2014-03-06 16:32:06 -08:00
Michael Crosby c896586b70 Ensure that native containers die with the parent
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: ea9bce8724303656c87c05e9049272258c9827b3
Component: engine
2014-03-06 16:30:56 -08:00
unclejack fe7e822dde Merge pull request #4509 from crosbymichael/kill-all
Remove the ghosts and kill everything
Upstream-commit: 1695c77c436e65a9f553b365714b56f78891bef5
Component: engine
2014-03-07 01:35:38 +02:00
Michael Crosby 936f96cce5 Remove the ghosts and kill everything
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
Upstream-commit: 772ef99d2816b629d084e11fe7fba5953687b620
Component: engine
2014-03-06 15:30:26 -08:00
James Turnbull 5af40cdb6e Merge pull request #4510 from vieux/fix_param_doc
Fix name parameter
Upstream-commit: eda43fc70fb771d9a55355db3f278e36987700fe
Component: engine
2014-03-06 17:55:57 -05:00
Andy Rothfusz 6f1e791920 Merge pull request #4475 from ubermuda/patch-1
Added Docker-PHP to the list of client libs
Upstream-commit: 44fc1dfca25dbd873c9d99eda73eba317796ec53
Component: engine
2014-03-06 14:54:33 -08:00
Victor Vieux a45e674934 Fix name parameter
Docker-DCO-1.1-Signed-off-by: Victor Vieux <victor.vieux@docker.com> (github: vieux)
Upstream-commit: 476c290b079d94b1da02c6e72ed15b7f9bd7fce5
Component: engine
2014-03-06 22:51:44 +00:00
unclejack 1f7c2a04c8 Merge pull request #4488 from crosbymichael/return-correct-lxc-pid
Return correct process pid for lxc
Upstream-commit: e4ebe6a12f5067602ab76aa0763dc4b291e5046f
Component: engine
2014-03-07 00:14:08 +02:00
unclejack 81ffbaf8cc Merge pull request #3959 from cpuguy83/3958_add_ability_to_remove_running_container_in_single_command
Add ability to force removal of running container via docker rm -f
Upstream-commit: e388b6aba5e7d75fecf87223abcd3c1deffd27f0
Component: engine
2014-03-07 00:05:57 +02:00
Guillaume J. Charmes ecf60ced9e Merge pull request #4506 from creack/fix_apparmor
Use CGO for apparmor profile switch
Upstream-commit: b722aa21b7ddfd558c2a36c8301d61b011221197
Component: engine
2014-03-06 13:37:34 -08:00
Walter Leibbrandt ec7a1fa7d6 Fixed installmirrors ref
Nested inline markup is not (yet) possible: http://stackoverflow.com/a/9645684
Upstream-commit: 188dea9e0e8b968b28a288192c357343dcc5834c
Component: engine
2014-03-06 23:33:08 +02:00
Guillaume J. Charmes 415acc0f7a Merge pull request #7 from tianon/fix-hack-tags
Update build tags such that we can properly compile on all platforms
Upstream-commit: 2128eb52eda1a65e725a9a98f500a468778092f0
Component: engine
2014-03-06 12:49:05 -08:00
Tianon Gravi 24c5efffe2 Update build tags such that we can properly compile on all platforms (especially for packagers), and updated hack/PACKAGERS.md to mention the DOCKER_BUILDTAGS variable that will need to be set for binaries that might be used on AppArmor (such as Debian and especially Ubuntu)
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com> (github: tianon)
Upstream-commit: 0b23393ba1901df3d08916fa977707db58699eca
Component: engine
2014-03-06 13:39:17 -07:00