bfeed894f7
Merge pull request #4252 from SvenDowideit/mention-scratch-image
...
lets talk about the other way to make base images
Upstream-commit: 93b98c9fe33a86f7ab8add97a6a6de3769cef65b
Component: engine
2014-02-20 17:12:36 -08:00
d2c232c678
Merge pull request #4265 from unclejack/explain_networkmanager_and_dns_problems
...
docs: explain DNS warnings & how to fix them
Upstream-commit: 7aa403df757db37dcbda34d938bfd6ad57c6a27d
Component: engine
2014-02-21 10:48:35 +10:00
33417515da
Merge pull request #3845 from alexlarsson/tar-caps
...
Implement capabilitiy bit storage in layers
Upstream-commit: a6909084e9692024c2859d46c123fb67a8f3d2ad
Component: engine
2014-02-20 12:01:34 -08:00
c7ecc00d6b
docs: explain DNS warnings & how to fix them
...
This explains how to fix the DNS warnings on Ubuntu and why they're
shown.
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com > (github: unclejack)
Upstream-commit: cae554b32e8c3341767e0efe7b9a8977a499d826
Component: engine
2014-02-20 19:53:05 +02:00
e100a37878
Site ver for Webmaster tools
...
Docker-DCO-1.1-Signed-off-by: James Turnbull <james@lovedthanlost.net > (github: jamtur01)
Upstream-commit: ef826621585a62d9b563e8ab2fd72f731b14817c
Component: engine
2014-02-20 08:51:39 -05:00
7d5d3a982f
archive: Handle capabilities in tar files
...
If a file has a security.capability set, we push this to the tar file.
This is important to handle in e.g. layer files or when copying files
to containers, as some distros (e.g. Fedora) use capability bits as
a more finegrained version of setuid bits, and thus if the capabilites
are stripped (and setuid is not set) the binaries will fail to work.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 3b9953903b12eaca76655311bd44533768f6f3da
Component: engine
2014-02-20 09:23:34 +01:00
8cd94e7ac6
archive: Detect file changes to capability bits
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 87ca750cdc3114a340af1c5bc9394cc5f6242677
Component: engine
2014-02-20 09:23:34 +01:00
91e61d4022
archive: extract xattrs from tarfiles
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: c8428d77fdde41786aa5c0c4e64e0e762f873676
Component: engine
2014-02-20 09:23:34 +01:00
3d478c1043
Archive: Add Add Lgetxattr and Lsetxattr implementations
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: d19e998e7a99d24122da3e98d9886e3b7b4b3501
Component: engine
2014-02-20 09:23:34 +01:00
c8d7265499
lets talk about the other way to make base images
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 9f1c69ca7b1b2afd96b4d154431395ee48ada97d
Component: engine
2014-02-20 13:49:15 +10:00
d6638f24e8
Merge pull request #4231 from thschroeter/correct-port-range-in-os-x-install
...
Correct port range in OS X installation doc
Upstream-commit: d45538f2431ed385bedcf5e11a9104fdee096073
Component: engine
2014-02-20 10:26:11 +10:00
97d9349a9d
Merge pull request #4225 from cpuguy83/4208-update_docs_to_better_explain_docker_run
...
Doc: Add basics for controlling a container's lifecycle
Upstream-commit: 16c2031137c5619a67130aa7d4a4f97289d8e808
Component: engine
2014-02-19 13:31:31 -08:00
f154030fbe
Merge pull request #4226 from metalivedev/updatedocdoc
...
Update Docs doc
Upstream-commit: f1167096ca053e44a478a0cfc760f9fdf951a2c1
Component: engine
2014-02-19 10:36:34 -08:00
98d4bbe0f6
update links
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 196702fbf9905426e590c0dbcb6101e72c62aac6
Component: engine
2014-02-19 10:32:43 -08:00
3337013302
Package coverage when running integration tests
...
If coverpkg is missing on `go test` command, only the current package
will be covered. That's the case of unit tests. For integration tests
we need to explicitly declare each package.
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com > (github: fabiofalci)
Upstream-commit: b3d5e9527a050a0c7252f0125a8a26a6fc5175f1
Component: engine
2014-02-19 16:59:51 +00:00
569ad8a8f4
Correct port range in OS X installation doc
...
Docker-DCO-1.1-Signed-off-by: Thomas Schroeter <thschroeter@gmail.com > (github: thschroeter)
Upstream-commit: 8a289a8a54480b968a6924536e084d749e567cf0
Component: engine
2014-02-19 11:21:29 +00:00
83c5ea4b47
Update the documentation docs with new branch information.
...
Docker-DCO-1.1-Signed-off-by: Andy Rothfusz <github@developersupport.net > (github: metalivedev)
Upstream-commit: 05c692d64ec9cabe6c16385300405406ebe63f40
Component: engine
2014-02-18 19:21:12 -08:00
2894395a09
Add basics for controlling a container's lifecycle
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 6dc2f5513648c42b2e71e55c4a4ea6cd3073ce55
Component: engine
2014-02-18 22:11:29 -05:00
ee616cd9b4
we moved the repo
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: e2da84ee63b759173d4919481eeb0c3ddf58cfb5
Component: engine
2014-02-19 11:35:58 +10:00
983d302f63
Merge pull request #4173 from SvenDowideit/add-most-spacing-to-headers
...
add a little space above h2->h6 - it gets a bit dense in there when there are lots of steps
Upstream-commit: ba3cbeb86bafbb6d7553f8954b0bf8d1e2d3f97f
Component: engine
2014-02-18 16:55:10 -08:00
0cb5ef58f2
Merge pull request #4011 from crosbymichael/add-netlink-functions
...
Add more netlink functions
Upstream-commit: 113629efb17dbb6af277d62259181899d0d031c9
Component: engine
2014-02-18 19:37:52 -05:00
c8dd504e3a
Change version to v0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 97ed268a8281231cdab88b166e2fe3faf7ccb296
Component: engine
2014-02-18 16:01:04 -08:00
1261c18d3f
Merge remote-tracking branch 'origin/release' into merge_release_v0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: 961023b8731ffc7f01de751fbb6fd27752d701fe
Component: engine
2014-02-18 16:00:38 -08:00
a4ead08188
Merge pull request #4210 from cpuguy83/4208-update_docs_to_better_explain_docker_run
...
Add extra info regarding docker run funcationality
Upstream-commit: 13086739656d7866ac5da76aef4fa4d5fa378df0
Component: engine
2014-02-18 15:44:26 -08:00
f51c1fe9ad
Bump to version 0.8.1
...
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com > (github: crosbymichael)
Upstream-commit: a1598d1e1c157388f3b07415729de28f4d205e49
Component: engine
2014-02-18 12:36:05 -08:00
f1f31be89b
Merge pull request #4114 from SvenDowideit/update-sshd-example
...
update the sshd example to use just a Dockerfile
Upstream-commit: 836a49a46e6ff51a0ef73eb170935f0d138b932e
Component: engine
2014-02-18 12:12:52 -08:00
24eab2e417
Add extra info regarding docker run funcationality
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com > (github: cpuguy83)
Upstream-commit: 349adf4d4df63cd35ecfd74aa21de01629964ea5
Component: engine
2014-02-18 15:08:09 -05:00
b1aa1c1a6a
Merge pull request #4147 from float64/patch-1
...
Env Clarification
Upstream-commit: 3a2fa54857d23e0070c7818eb9752ef263e0a9fe
Component: engine
2014-02-18 12:07:39 -08:00
18d6994efa
Merge pull request #2980 from SvenDowideit/1439-add-registry-repository-terms
...
my attempt to disentagle repository and registry
Upstream-commit: 57c4f7185d18db964f90b10c494eaf271f4d8aa9
Component: engine
2014-02-18 11:26:45 -08:00
c7021aec80
Merge pull request #4145 from SvenDowideit/redo-python-example
...
touch up the examples
Upstream-commit: c14c539c6c16e604817ea0b4bf8bd7dc58e2a5ac
Component: engine
2014-02-18 11:08:45 -08:00
883b90f698
Merge pull request #4205 from tianon/fix-dyntest
...
Fix dyntest problems finding dockerinit
Upstream-commit: 277262d9c7ff802092f8cef7172462e4ddd4da02
Component: engine
2014-02-18 11:50:16 -07:00
27672a2f55
Add "Conflicts" to our lxc-docker package to make it more clear that we can't/shouldn't be installed alongside either "docker" or "docker.io"
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6d1c0a91f89887bd0d73b161b1ffe8b9cc10365e
Component: engine
2014-02-18 11:24:33 -07:00
b0d22755b4
Fix dyntest problems finding dockerinit
...
Docker-DCO-1.1-Signed-off-by: Andrew Page <admwiggin@gmail.com > (github: tianon)
Upstream-commit: 6ccb30a0e5d1146dddaec340643d3950e6f992ef
Component: engine
2014-02-18 11:23:37 -07:00
d71035c5b7
Reword - one sentence :-)
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
Upstream-commit: 311cb5ca45c15c32408d54194470536e73ae016d
Component: engine
2014-02-18 16:04:47 +01:00
983d3e7de3
Updated environment description
...
.. to make it even more clear that this env variables are there because of the --link option.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
Upstream-commit: c1dfc63845cdf08d7609e1890f45d01f10326bda
Component: engine
2014-02-18 12:47:44 +01:00
e867f9248c
Reworded description of the environment variables
...
Removed the "test now..." b/c the code example is only about inspection
of env-variables.
Test follows in the next section.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
Upstream-commit: d73d3b03e4216bf6cf44b393108dd520acac9670
Component: engine
2014-02-18 12:36:14 +01:00
efed40e022
Fixed misspelling
...
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
Upstream-commit: 8a3cb0c65e7940e928e31d6e64cce5d81d9975a6
Component: engine
2014-02-18 11:38:23 +01:00
e8870b2f18
Env Clarification
...
Clarified that the env variables here are an example output of env. The user should not set them to the example values.
Docker-DCO-1.1-Signed-off-by: Matthias Kühnle <git.nivoc@neverbox.com > (github: float64)
Upstream-commit: a7f1b74dd812fbc86beefea6fcd3ba4c4abaa7e2
Component: engine
2014-02-18 11:36:46 +01:00
90a166ff8b
try out @metalivedev's suggestion, including FQIN
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: a049e93a4c164de25ce1fc1113f2929aa0aa0b5b
Component: engine
2014-02-18 20:16:09 +10:00
3700ea5ec4
my attempt to disentagle repository and registry (Issue #1439 )
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: 940c381dd5898df4dd863a2d76a122b6610f2940
Component: engine
2014-02-18 20:16:08 +10:00
f829291e78
archive: Fix the storing of setuid bits, etc
...
In commit 3dfc910d7774d57c533b067fbe59d6b24dd803cd we changed from
syscall.Chmod() to os.Chmod(), but these take a different form of the
Mode argument. The sycall one takes the raw linux form, wheras
os.Chmod takes the os.FileMode form, and they differ for the higher
bits (setuid, setgid, etc). The raw tar header uses a form which
is compatible with the syscalls, but not the go calls.
We fix this by using hdr.FileInfo() which properly converts the mode
to what go expects.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com > (github: alexlarsson)
Upstream-commit: 5ba24629610c27f08b54ff4c1f000ad6d787c156
Component: engine
2014-02-18 09:53:30 +01:00
5633a3d1c6
Merge pull request #4196 from mahata/fixTypo
...
Fix typo in 'Using Supervisor with Docker' example
Upstream-commit: ef844adc3e2ba7ae702109c1bae54668a6a74aac
Component: engine
2014-02-17 22:48:54 -05:00
92abc1e651
Fix typo in 'Using Supervisor with Docker' example
...
Docker-DCO-1.1-Signed-off-by: Yasunori Mahata <mahata777@gmail.com > (github: mahata)
Upstream-commit: 68de32888b6bad84cd37ccd165b0e7bb013574af
Component: engine
2014-02-17 19:43:56 -08:00
ca7b056023
suggested improvements
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 29f7e1bfcbe6654d962a55eb5006e248284b9e0c
Component: engine
2014-02-18 13:23:28 +10:00
32cc7c3201
update a new movie: http://asciinema.org/a/7658
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@fosiki.com > (github: SvenDowideit)
Upstream-commit: b05602a0fe6d9b9731cee0008fbac27250f361bd
Component: engine
2014-02-18 13:23:28 +10:00
244da2b520
swap busybox for ubuntu, its quicker..
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: f535a58959809dbb613bf529019f26cc6ae0c6f9
Component: engine
2014-02-18 13:23:28 +10:00
5f957db92e
rejig the helloflask example as more advanced, and move it to the end
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au > (github: SvenDowideit)
Upstream-commit: 3036b5a196fdbb744f94299c82dc44078361bdae
Component: engine
2014-02-18 13:23:28 +10:00
bf1c684667
Fix remote tar ADD behavior
...
Docker-DCO-1.1-Signed-off-by: Guillaume J. Charmes <guillaume.charmes@docker.com > (github: creack)
Upstream-commit: 98ce0cdb4f80550462675ee3bbb927451bb76585
Component: engine
2014-02-17 17:08:17 -08:00
587e65afdf
Merge pull request #4159 from crosbymichael/move-volumes
...
Move volumes out of container.go and into volumes.go
Upstream-commit: a3bc3bb8c338f3fb40202681dd8bd933851a651b
Component: engine
2014-02-17 16:43:20 -08:00
bd991a8a29
Merge pull request #4162 from crosbymichael/movelinks
...
Move links functionality into pkg
Upstream-commit: e9db157bee3719e9c23779446dd23f84a870c92b
Component: engine
2014-02-17 16:34:47 -08:00
