Commit Graph

12873 Commits

Author SHA1 Message Date
Shishir Mahajan 72f0caa64c Implementation of docker load command: Untarr the incoming tar stream directly into /var/lib/docker/tmp without creating the tar ball
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 315260203c3a683fe7e93aa6c937128d38d52ae4
Component: engine
2015-01-19 15:09:02 -05:00
Tianon Gravi 1e4478b6cf Let's try fixing "netgo" again
Since "go test" doesn't seem to support "-installsuffix" as quite the same perfect solution that "go build" is happy to let it be, let's just switch those crappy old "integration/" tests to use our separate static dockerinit binary so we don't have to worry about compiling the entire test harness statically. 👍

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 232d59baeb13778abc242a602ca434d83e1eb6e8
Component: engine
2015-01-19 12:48:25 -07:00
Arnaud Porterie 51e443fb29 Add documentation for HTTP proxies
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 3a1dbef8232ee4f58cbaf3a2776c27a4d5b04bc4
Component: engine
2015-01-19 11:23:31 -08:00
Michael Crosby eeb5a0ad4a Merge pull request #9968 from HuKeping/master
log: Add restart policy name to the inspect information of container
Upstream-commit: 4c38045be1deed08bc1494261fd9a3e2812e67ad
Component: engine
2015-01-19 11:08:32 -08:00
Jessie Frazelle b098aaedce Merge pull request #9784 from dmcgowan/v2-registry
Client Support for Docker Registry HTTP API V2
Upstream-commit: 8b95ad230e2ee76450ceb9a80aa8e942a56bb397
Component: engine
2015-01-19 10:46:38 -08:00
Michael Crosby 3f7b51a04e Merge pull request #10152 from ashahab-altiscale/9875-cap-add-all
SEND CAPABILITY IDS TO LXC
Upstream-commit: 979a4cdacdea48e401715ad887b43ee0b4bb513a
Component: engine
2015-01-19 10:46:22 -08:00
Michael Crosby 6a9f109b4d Update to libcontainer eb74393a3d2daeafbef4f5f27c0
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6b04d9342c3d76f5979850f93a4afd41afa33227
Component: engine
2015-01-19 10:37:31 -08:00
Jessica Frazelle 6c88325edb Update graphtest so when overlay is tried over a non-supported backing
filesystem it will skip.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f0d79c021d7cd6c78cc830154b6bbee1dcf9ec8b
Component: engine
2015-01-19 10:28:57 -08:00
Doug Davis 5d2fe159f4 Docker run -e FOO should erase FOO if FOO isn't set in client env
See #10141 for more info, but the main point of this is to make sure
that if you do "docker run -e FOO ..." that FOO from the current env
is passed into the container.  This means that if there's a value, its
set.  But it also means that if FOO isn't set then it should be unset in
the container too - even if it has to remove it from the env.  So,
   unset HOSTNAME
   docker run -e HOSTNAME busybox env
should _NOT_ show HOSTNAME in the list at all

Closes #10141

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 9ab73260f8e4662e7321b257c636928892f023cf
Component: engine
2015-01-19 08:00:32 -08:00
James Turnbull a9b7d25bb0 Merge pull request #10138 from ShockwaveNN/patch-1
fix link to introducion on 'Working with Docker Images' page
Upstream-commit: 27602f2a21732656180397cd4e30b9d246b75a0b
Component: engine
2015-01-19 10:53:15 -05:00
James Turnbull 681db1e57f Merge pull request #10167 from bgazzera/master
There was a missing command to re-run the web container.
Upstream-commit: 6286c0711f2abc4a427ba4064b2a5f3d478c4034
Component: engine
2015-01-19 10:50:08 -05:00
James Turnbull e9a3b78432 Merge pull request #10179 from viirya/trivial_typo
Fix typo in document
Upstream-commit: 505e0ca80f50996f020e4d877e5efbd57b575d2f
Component: engine
2015-01-19 10:48:32 -05:00
Liang-Chi Hsieh b9a7e1b9ee Fix typo.
Signed-off-by: Liang-Chi Hsieh <viirya@gmail.com>
Upstream-commit: 1b4a926377524455653019c772355bd71a148045
Component: engine
2015-01-19 18:02:23 +08:00
Yongzhi Pan adb4e7d83e Add usage of port mapping for Boot2docker.
Signed-off-by: Yongzhi Pan <panyongzhi@gmail.com>
Upstream-commit: 9dc2d0b8a35724946139f954f9575411b31695ea
Component: engine
2015-01-19 16:44:13 +08:00
Sven Dowideit 7eb5278658 An initial quick import of documentation from Compose, Machine and Swarm
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
Upstream-commit: 1b2032c82e344b918578ce2de3618597e36fd7d6
Component: engine
2015-01-19 14:23:39 +10:00
Lei Jitang 9f931ee8fa Update the docs for --link accept container id
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 750373875e25455acb046001cb0582873a90bd73
Component: engine
2015-01-19 09:57:44 +08:00
Sebastiaan van Stijn 86e0c72c59 Document that ENV vars are not automatically updated
Unlike the entries in `/etc/hosts`, environment-variables for linked
containers are not automatically updated if the linked container is
restarted.

This adds a note to the documentation in;
https://docs.docker.com/userguide/dockerlinks/#environment-variables
and
https://docs.docker.com/reference/run/#env-environment-variables

To make users aware that this is the case and recommends them to use
the `/etc/hosts` entries in stead.

I added this change because users were expecting environment variables
to be updated automatically as well (https://github.com/docker/docker/issues/10164).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 3fb06dc104bb66c3ec7be8a95a33845310083999
Component: engine
2015-01-19 00:23:57 +01:00
Bruno Gazzera a3290112e7 There was a missing command to re-run the web container.
Signed-off-by: Bruno Gazzera <bgazzera@paginar.com>
Upstream-commit: 44cde56333fe891e087b8aa5ba914345bbdedbc0
Component: engine
2015-01-18 12:17:49 -03:00
Abin Shahab fb6083d3f6 use lxc.auto.mount to ensure proc and sys are readonly
Set lxc.auto.mount = proc:mixed in unprivilged mode. This ensures that lxc mounts sys and proc/sysrq-trigger as readonly.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: d821c63e0d5fe2abe10ff885de6298acc4db956e
Component: engine
2015-01-18 09:27:16 +00:00
Abin Shahab c909cbb34a LXC needs stdin for container to remain up
To run shell(and not exit), lxc needs STDIN. Without STDIN open, it will exit 0.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 79f17dcf7404d0547db68dba8b629c9c1141e47b
Component: engine
2015-01-18 04:07:20 +00:00
Jessie Frazelle 5a9f9786e1 Merge pull request #10143 from cpuguy83/10129_marshal-indent_dockercfg
Make .dockercfg with json.MarshallIndent
Upstream-commit: 467b7c8213901ffd788dba1753ac08291c979ec0
Component: engine
2015-01-17 14:18:45 -08:00
imre Fitos c766335ad5 fix typo 'setup/set up'
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
Upstream-commit: 73baa673c72a49e9cccfde6e844c7dee2e478d8e
Component: engine
2015-01-17 11:21:25 -05:00
Brian Goff 7319c01771 Fix volumes-from re-applying on each start
Fixes #9709
In cases where the volumes-from container is removed and the consuming
container is restarted, docker was trying to re-apply volumes from that
now missing container, which is uneccessary since the volumes are
already applied.

Also cleaned up the volumes-from parsing function, which was doing way more than
it should have been.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: a738df0354cc615c8d0fa3254621b3db811fe0b9
Component: engine
2015-01-17 07:14:25 -05:00
Brian Goff 40a61d0eec Make .dockercfg with json.MarshallIndent
Fixes #10129
Makes the .dockercfg more human parsable.

Also cleaned up the (technically) racey login test.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b8f7526fc6333e5b67282e5b73eee497dd13ec34
Component: engine
2015-01-17 07:05:56 -05:00
Jessie Frazelle b873d45d82 Merge pull request #10154 from tianon/fix-x-usage
Fix "-X" 6l usage ("define string data")
Upstream-commit: 4245952f79106acd0f8125ad05b5f7560f7ae524
Component: engine
2015-01-16 20:55:16 -08:00
Tianon Gravi 6136e835bf Fix "-X" 6l usage ("define string data")
It turns out "-X" is only for strings! :)

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: da01690a0a22ced060d4fb4fc46cb545ff1604df
Component: engine
2015-01-16 21:46:01 -07:00
Abin Shahab 807f07b041 SEND CAPABILITY IDS TO LXC
Sending capability ids instead of capability names ot LXC for --cap-add and --cap-drop.
Also fixed tests.

Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: bff3509e431ce6d68e2accbb842c99d4abe86e05
Component: engine
2015-01-17 04:01:52 +00:00
Jessie Frazelle bba3a8213f Merge pull request #10148 from thaJeztah/fix-deprecation-typo
Fix typo in deprecation message.
Upstream-commit: 78b7a484db5ac876e116eb248f1ba538bcc426a2
Component: engine
2015-01-16 15:16:54 -08:00
Sebastiaan van Stijn 3968c04241 Fix typo in deprecation message.
Because the doc maintainers don't like Cockney.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: bf14bacac3f1cae15ce7b32b5341122c305e630e
Component: engine
2015-01-16 23:36:50 +01:00
Jessie Frazelle 611f8510fe Merge pull request #9941 from SvenDowideit/build-pull-option-docs
Add build --pull and evenets --filter flags to the docs for 1.4
Upstream-commit: 00d19150bb937bcc4572edf1f397d4051abb37c1
Component: engine
2015-01-16 13:49:56 -08:00
Victor Vieux b329952e86 move test to the daemon
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: c6309229a0f5e3d8ee18d7ce80d1d0bd1d193e07
Component: engine
2015-01-16 21:49:46 +00:00
Jessie Frazelle 712286a324 Merge pull request #10125 from estesp/9960-add-backingfs-info
Add backing filesystem info to `docker info` command where applicable
Upstream-commit: eaf3c6f1aca3d2e3bd58300781dd31eec93622b1
Component: engine
2015-01-16 13:41:37 -08:00
Phil Estes 310b2cd524 Add backing filesystem info to docker info command where applicable
Fixes #9960

This adds the output of a "Backing Filesystem:" entry to `docker info`
to overlay, aufs, and devicemapper graphdrivers. The default list
includes a fairly complete list of common filesystem names from
linux/include/uapi/linux/magic.h, but if the backing filesystem is not
recognized, the code will simply show "<unknown>"

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com>
Upstream-commit: 48b1dd0084904678728817d728bb9ab1c0183aad
Component: engine
2015-01-16 14:43:43 -05:00
Derek McGowan ce12855fec Fix failing integration tests
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: f29aacbc4804e3aca1c21b9411e960b2a2543da1
Component: engine
2015-01-16 11:34:45 -08:00
unclejack 0af8067e20 Merge pull request #10134 from unclejack/bump_go_to_1.4.1
bump go to 1.4.1
Upstream-commit: 6a6a89a80686667cab70fa71dbcdfa408b252106
Component: engine
2015-01-16 19:35:47 +02:00
James Turnbull 663b86fdb0 Merge pull request #10127 from fredlf/known-issues
Adds new section for Known Issues to Release Notes.
Upstream-commit: 30468cdbae6deced7d13a4b3e52033100fe593ec
Component: engine
2015-01-16 09:45:34 -05:00
Pavel Lobashov 4f77faa073 fix link to introducion on 'Working with Docker Images' page
Old link go to Table of content page, but by context it should go to 'understaning-docker' pag

Signed-off-by: Pavel Lobashov <shockwavenn@gmail.com>
Upstream-commit: 43b97368422843108a2090633367beaba434245b
Component: engine
2015-01-16 14:16:10 +03:00
HuKeping e26618d2ee restart: add test for recording restart policy name
Add test for recording restart policy name on
- restart=no
- restart=always
- restart=on-failure

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: c3ed49dcdb2d835bf4fbdebe3f07318c945282c8
Component: engine
2015-01-16 17:58:26 +08:00
unclejack f41baa0c49 bump go to 1.4.1
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 933f957e773d5b9da13e32649d0f987b30e87eb5
Component: engine
2015-01-16 09:45:37 +02:00
imre Fitos 3bedb4b915 start docker before checking for updated NAT rule
Signed-off-by: imre Fitos <imre.fitos+github@gmail.com>
Upstream-commit: 457f2123739df7bc896008b6d796353aae7a0429
Component: engine
2015-01-15 21:32:38 -05:00
Fred Lifton ce31e7fa97 Merge pull request #9937 from SvenDowideit/add-https-test
Add a containerised test for the https cert doc
Upstream-commit: 22437eb9609cdbf4ed221d07557e206bc0066e18
Component: engine
2015-01-15 17:53:40 -08:00
Victor Vieux 445d9d9198 don't restrict filters in docker images
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 0e9acf76844a0dcd76bc855b945d0e4b80149195
Component: engine
2015-01-16 01:09:01 +00:00
Fred Lifton fe4979e250 Adds new section for Known Issues to Release Notes.
Docker-DCO-1.1-Signed-off-by: Fred Lifton <fred.lifton@docker.com> (github: fredlf)
Upstream-commit: f6777c7a40efdae161f6ba99223f4d6a625d4762
Component: engine
2015-01-15 16:09:48 -08:00
Sven Dowideit 1964402004 Merge pull request #10104 from thaJeztah/docs-add-note-to-cli-export
Docs: Add note that export doesn't include volume data.
Upstream-commit: 9725433988b7d83bcbbf2af1976995efc0aadd4e
Component: engine
2015-01-16 12:15:46 +13:00
James Turnbull 8333dd3c16 Merge pull request #9840 from nhsiehgit/searchapidocs
updated search api docs to include pagination changes
Upstream-commit: 25a8602cbabaec44d5646923b2ae1564a3ba7f8b
Component: engine
2015-01-15 17:40:04 -05:00
Derek McGowan fb2575c794 Add token cache
Token cache prevents the need to get a new token for every registry interaction.
Since the tokens are short lived, the cache expires after only a minute.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: dd914f91d779f64e20ce86767ab4f84f40b9ef6a
Component: engine
2015-01-15 14:05:06 -08:00
Derek McGowan 45e09641f7 Remove session backup
The v2 session code will no longer update the indexEndpoint value, therefore it is not necessary to save and restore the value for use with v1.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: f11f3f6203da596f50eec0edc3c5dfb8c93bc271
Component: engine
2015-01-15 14:05:06 -08:00
Derek McGowan 5598d30646 Cleanup v2 session to require endpoint
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 9c6f8e14398e794cbe20504556c22a1c83260bd8
Component: engine
2015-01-15 14:05:06 -08:00
Derek McGowan 5fc27fb46a Refactor push and pull to move code out of cmd function
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 750b41ced42bda0ccda405c1aa7c43ded5821e40
Component: engine
2015-01-15 14:05:06 -08:00
Arnaud Porterie 557565cd70 Test pulling image with aliases
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 92d5eafe03eca8ca931ddca5ef7d6e41ca25caad
Component: engine
2015-01-15 14:05:06 -08:00