12f522ac65
Merge pull request #8095 from jfrazelle/cp-parse-subcommand-rebase
...
Removed runconfig.ParseSubcommand
2014-09-17 18:04:28 -04:00
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
458b019e62
Merge pull request #7889 from vbatts/vbatts-tarsum_name_collision
...
tarsum: name collision fix
2014-09-17 21:59:39 +03:00
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
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
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
8b97e2c287
Merge pull request #8084 from unclejack/improve_stdcopy
...
stdwriter: improve perf by avoiding buffer growth
2014-09-17 12:47:00 -04:00
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
2f6b1d7f4e
Merge pull request #6 from LK4D4/benchmark_for_8084
...
Benchmark for StdWriter.Write
2014-09-17 18:39:46 +03:00
55cac6c942
Benchmark for StdWriter.Write
...
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2014-09-17 19:24:07 +04:00
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
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
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
459b403c2f
Merge pull request #8083 from unclejack/install_apparmor
...
hack/install.sh: install apparmor when enabled
2014-09-17 08:05:29 -06:00
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
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
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
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
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
f98a1f1f7d
Merge pull request #8019 from thockin/add-host
...
Allow extra lines in /etc/hosts
2014-09-16 17:19:16 -07:00
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
ca39a3e36b
Merge pull request #7110 from tiborvass/merge-6907
...
Docker create (rebase of 6907)
2014-09-17 03:23:50 +04:00
37b3b34afa
Merge pull request #7989 from jlhawn/graphdriver_differ_refactor
...
Refactor use of graphdriver.Differ
2014-09-16 18:58:38 -04:00
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
e49c701092
Resolve conflicts with restart policies
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-16 18:40:25 -04:00
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
1ec283c3eb
Add create to contrib/completion
...
Signed-off-by: Tibor Vass <teabee89@gmail.com>
2014-09-16 18:40:25 -04:00
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
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
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
9c3eedae89
Merge pull request #8074 from unclejack/add_exec_help
...
add exec to the commands list
2014-09-16 18:17:08 -04:00
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
ed957232a1
Merge pull request #8055 from cpuguy83/7792_fix_volume_mount_ordering
...
Fix #7792 - Order mounts
2014-09-17 02:13:35 +04:00
09ad65ebd5
graphdriver interface name change, typo fix
...
Signed-off-by: Josh Hawn <josh.hawn@docker.com>
2014-09-16 15:10:32 -07:00
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
eb21197c6b
Merge pull request #8035 from duglin/Issue7965
...
Add timeout to client - fix for #7965
2014-09-17 01:55:48 +04:00
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
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
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
3ff8d45b35
Merge pull request #8070 from jfrazelle/exec-autocompletions
...
Add exec to autocompletions
2014-09-16 14:07:42 -06:00
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
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
0a6fd743ea
Merge pull request #8063 from jlhawn/tarsum_empty_tar_archive
...
tarsum: correct close and finish reads
2014-09-16 15:41:28 -04:00
c786a8ee5e
Adding docker exec support in CLI.
...
Fixed a bug in daemon that resulted in accessing of a closed pipe.
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
2014-09-16 19:24:25 +00:00
f88e2e8b99
Merge pull request #8054 from estesp/6830-fix-json-strings
...
Proper JSON handling of strings that could be represented as other types
2014-09-16 15:11:25 -04:00
28f09f0632
Merge pull request #8059 from estesp/8057-refactor-regexp-to-package-var
...
Refactor all pre-compiled regexp to package level vars
2014-09-16 15:04:23 -04:00
1b0b1ec657
Proper JSON handling of strings that could be represented as other types
...
Addresses #6830
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2014-09-16 13:51:02 -04:00
23b2c39a40
Return errors in NewDaemonFromDirectory instead of calling Fatal
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-16 10:42:59 -07:00
67c254a60a
DisableNetworkBidge doesn't need to be public anymore
...
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
2014-09-16 10:37:50 -07:00
cd7a5f5c09
Fix for issue 7902.
...
Use utils.RFC3339NanoFixed ("2006-01-02T15:04:05.000000000Z07:00")
instead of time.RFC3339Nano to format our log timestamps - this way
things are aligned, in particular the nano seconds are padded with zeros
Signed-off-by: Doug Davis <dug@us.ibm.com>
2014-09-16 10:28:37 -07:00
Tibor Vass
Oh Jinkyun
unclejack
Vincent Batts
Alexandr Morozov
unclejack
Jessie Frazelle
Alexandr Morozov
Tianon Gravi
Sven Dowideit
Fred Lifton
Tim Hockin
SvenDowideit
Alexander Larsson
Josh Hawn
Brian Goff
Jean-Paul Calderone
Jessica Frazelle
Vincent Batts
Vishnu Kannan
Phil Estes
Doug Davis