Sven Dowideit
db9f8ba55c
Add a little description of the image tarball format.
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-18 10:40:55 +10:00
Sven Dowideit
c7c78acf81
Merge pull request #8025 from davidpelaez-forks/docs-fix
...
Improved X-Registry-Auth content instructions
2014-09-18 09:54:25 +10:00
Michael Crosby
f8be5f586f
Merge pull request #8097 from erikh/builder_maintainers
...
Add a new MAINTAINERS file for the builder.
2014-09-17 15:42:34 -07:00
Erik Hollensbe
1ff1befd12
Add a new MAINTAINERS file for the builder.
...
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
2014-09-17 15:36:04 -07:00
Michael Crosby
77d30e7112
Merge pull request #8041 from unclejack/lower_allocations_broadcastwriter
...
lower the number of allocations in broadcastwriter
2014-09-17 15:26:44 -07:00
Tibor Vass
12f522ac65
Merge pull request #8095 from jfrazelle/cp-parse-subcommand-rebase
...
Removed runconfig.ParseSubcommand
2014-09-17 18:04:28 -04:00
Oh Jinkyun
9aa71549d6
Removed runconfig.ParseSubcommand
...
Removed runconfig.ParseSubcommand, changed it to runconfig.Parse and editted related tests and modules
Signed-off-by: Oh Jinkyun <tintypemolly@gmail.com>
2014-09-17 14:38:22 -07:00
unclejack
458b019e62
Merge pull request #7889 from vbatts/vbatts-tarsum_name_collision
...
tarsum: name collision fix
2014-09-17 21:59:39 +03:00
Vincent Batts
c5e6362c53
tarsum: name collision fix
...
If a tar were constructed with duplicate file names, then depending on
the order, it could result in same tarsum.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2014-09-17 14:37:46 -04:00
Alexandr Morozov
c171cf0cc3
Merge pull request #8088 from unclejack/integcli-keep_permissions
...
integcli: run inaccessible context test in tmpdir
2014-09-17 22:06:26 +04:00
unclejack
be924087eb
integcli: run build tests in tmpdir
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 20:05:33 +03:00
Tibor Vass
8b97e2c287
Merge pull request #8084 from unclejack/improve_stdcopy
...
stdwriter: improve perf by avoiding buffer growth
2014-09-17 12:47:00 -04:00
Jessie Frazelle
129da8f842
Merge pull request #8085 from tianon/hack-install-location
...
Add "hack/install.sh" to the "PRs welcome" note in the end of the install script
2014-09-17 09:20:33 -07:00
unclejack
2f6b1d7f4e
Merge pull request #6 from LK4D4/benchmark_for_8084
...
Benchmark for StdWriter.Write
2014-09-17 18:39:46 +03:00
Alexandr Morozov
55cac6c942
Benchmark for StdWriter.Write
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-17 19:24:07 +04:00
unclejack
277aa9c674
stdcopy: improve perf by avoiding buffer growth
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 18:06:17 +03:00
unclejack
1f03e60c2a
move stdcopy to pkg/stdcopy
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 18:06:17 +03:00
Tianon Gravi
adb6910095
Add "hack/install.sh" to the "PRs welcome" note in the end of the install script
...
Also, simplified the output method by using `cat >&2 <<EOF ...` instead of multiple lines of `echo >&2 '...'`.
Signed-off-by: Andrew Page <admwiggin@gmail.com>
2014-09-17 08:09:39 -06:00
Tianon Gravi
459b403c2f
Merge pull request #8083 from unclejack/install_apparmor
...
hack/install.sh: install apparmor when enabled
2014-09-17 08:05:29 -06:00
unclejack
9851e8c4c1
use custom marshalling for JSONLog
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 17:03:54 +03:00
Tianon Gravi
bcf7ca0731
Merge pull request #8080 from SvenDowideit/test-for-ext4-fs-kernel-options
...
It seems that we need these 2 options enabled for both aufs and devicema...
2014-09-17 08:01:20 -06:00
unclejack
9ae3134dc9
add the timeutils package
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 14:30:08 +03:00
unclejack
9619ce9dd1
hack/install.sh: install apparmor when enabled
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 12:13:31 +03:00
Sven Dowideit
b7259dc6d4
It seems that we need these 2 options enabled for both aufs and devicemapper drivers when running on EXT4 - so test for them
...
Docker-DCO-1.1-Signed-off-by: Sven Dowideit <SvenDowideit@docker.com> (github: SvenDowideit)
2014-09-17 17:03:58 +10:00
Tianon Gravi
41e625eb7c
Merge pull request #8001 from jfrazelle/fix-key-for-test-release-ubuntu
...
use correct apt-key for test.docker.io/ubuntu
2014-09-17 00:06:57 -06:00
Fred Lifton
b03f506303
Merge pull request #8073 from ClusterHQ/7743-restart-policy-api-doc
...
Add some documentation for the RestartPolicy feature.
2014-09-16 20:06:55 -07:00
David Pelaez
8c2b170c6e
Improved X-Registry-Auth content instructions
...
Hi,
this is a small contribution to fix some slightly unprecise information about the `X-Registry-Auth` header required to pull from private registries through the remote API. After a lot of trial and I error I managed to find that the documentation indications had this issues:
* Apparently single quotes cannot be used and double quotes (regular JSON) is required.
* Also the `auth` key must be passed even if empty or a 403 will result.
* It was not clear what the `serveraddress` had to be.
I added some small clarifications for anyone taking a look at the docs to keep them from the problems I've encountered. Hope this is helpful.
Thanks to all the contributors for bringing so much awesomeness to the linux world. :)
Signed-off-by: David Pelaez Tamayo <hello@davidpelaez.me>
2014-09-16 19:20:47 -05:00
Jessie Frazelle
f98a1f1f7d
Merge pull request #8019 from thockin/add-host
...
Allow extra lines in /etc/hosts
2014-09-16 17:19:16 -07:00
Tim Hockin
68e48b65a6
Allow extra lines in /etc/hosts
...
This adds a --add-host host:ip flag which appends lines to /etc/hosts. This is needed in places where you want the container to get a different name resolution than it would through DNS. This was submitted before as #5525 , closed, and now I am re-opening. It has come up 2 or 3 times in the last couple days.
Signed-off-by: Tim Hockin <thockin@google.com>
2014-09-16 23:38:23 +00:00
Alexandr Morozov
ca39a3e36b
Merge pull request #7110 from tiborvass/merge-6907
...
Docker create (rebase of 6907)
2014-09-17 03:23:50 +04:00
Tibor Vass
37b3b34afa
Merge pull request #7989 from jlhawn/graphdriver_differ_refactor
...
Refactor use of graphdriver.Differ
2014-09-16 18:58:38 -04:00
Alexandr Morozov
ffbd8fe5b9
Merge pull request #8068 from jfrazelle/cleanup-various-fix-me-refs
...
Cleanup various fix me refs
2014-09-17 02:54:54 +04:00
Tibor Vass
e49c701092
Resolve conflicts with restart policies
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-16 18:40:25 -04:00
SvenDowideit
22eb3a3a50
add 'docker create' man page
...
Docker-DCO-1.1-Signed-off-by: SvenDowideit <SvenDowideit@home.org.au> (github: SvenDowideit)
2014-09-16 18:40:25 -04:00
Tibor Vass
1ec283c3eb
Add create to contrib/completion
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-16 18:40:25 -04:00
Tibor Vass
7c85cf5f39
docs fix
...
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-09-16 18:40:24 -04:00
Alexander Larsson
b0cb37fd3b
integration-cli: Add docker create tests
...
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-09-16 18:40:24 -04:00
Alexander Larsson
3a90004f3c
Add "docker create" support
...
This exposes the already existing "create container" operation. It is
very similar to "docker run -d" except it doesn't actually start the
container, but just prepares it. It can then be manually started using
"docker start" at any point.
Docker-DCO-1.1-Signed-off-by: Alexander Larsson <alexl@redhat.com> (github: alexlarsson)
Conflicts:
api/client/commands.go
runconfig/parse.go
server/container.go
Docker-DCO-1.1-Signed-off-by: Tibor Vass <teabee89@gmail.com> (github: tiborvass)
2014-09-16 18:40:24 -04:00
Tibor Vass
9c3eedae89
Merge pull request #8074 from unclejack/add_exec_help
...
add exec to the commands list
2014-09-16 18:17:08 -04:00
unclejack
fccb026221
add exec to the commands list
...
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
2014-09-17 01:13:43 +03:00
Alexandr Morozov
ed957232a1
Merge pull request #8055 from cpuguy83/7792_fix_volume_mount_ordering
...
Fix #7792 - Order mounts
2014-09-17 02:13:35 +04:00
Josh Hawn
09ad65ebd5
graphdriver interface name change, typo fix
...
Signed-off-by: Josh Hawn <josh.hawn@docker.com>
2014-09-16 15:10:32 -07:00
Josh Hawn
dee6b481fe
Refactor use of graphdriver.Differ
...
Some graphdrivers are Differs and type assertions are made
in various places throughout the project. Differ offers some
convenience in generating/applying diffs of filesystem layers
but for most graphdrivers another code path is taken.
This patch brings all of the logic related to filesystem
diffs in one place, and simplifies the implementation of some
common types like Image, Daemon, and Container.
Signed-off-by: Josh Hawn <josh.hawn@docker.com>
2014-09-16 15:10:32 -07:00
Alexandr Morozov
eb21197c6b
Merge pull request #8035 from duglin/Issue7965
...
Add timeout to client - fix for #7965
2014-09-17 01:55:48 +04:00
Brian Goff
0a3211f131
Fix #7792 - Order mounts
...
Docker-DCO-1.1-Signed-off-by: Brian Goff <cpuguy83@gmail.com> (github: cpuguy83)
2014-09-16 14:51:06 -07:00
Jean-Paul Calderone
d758da386a
Add some documentation for the RestartPolicy feature.
...
Signed-off-by: Jean-Paul Calderone <jean-paul@clusterhq.com>
2014-09-16 17:40:56 -04:00
Jessie Frazelle
51b26853ef
Merge pull request #7976 from duglin/Issue7902
...
Fix for issue 7902 - add trailing zeros to timestamps so logs align
2014-09-16 13:55:03 -07:00
Tianon Gravi
3ff8d45b35
Merge pull request #8070 from jfrazelle/exec-autocompletions
...
Add exec to autocompletions
2014-09-16 14:07:42 -06:00
Jessica Frazelle
c9c004d700
Add exec to autocompletions
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-16 13:01:10 -07:00
Alexandr Morozov
00fd008170
Merge pull request #8062 from vishh/run_in_phase2
...
Add support for 'docker exec' - phase 2
2014-09-16 23:56:12 +04:00