b0ed2da441
Merge pull request #10112 from cpuguy83/4393_fix_volume_where_file_exists
...
Error out if file in container at volume path
2015-02-06 19:39:48 -05:00
81f74caee8
Merge pull request #10320 from shishir-a412ed/cleanup_cmd_tag
...
cleanup of docker tag command code
2015-02-06 16:34:48 -08:00
414a37f90a
Merge pull request #10534 from unclejack/aufs_enable_dio
...
daemon/graphdriver/aufs: enable direct io
2015-02-06 18:26:09 -05:00
3807bd9777
Merge pull request #10548 from SvenDowideit/add-webhook-image-list
...
The Hub build webhooks now list the images that have been built
2015-02-06 15:15:16 -08:00
dfa1a84937
Merge pull request #10578 from SvenDowideit/copy-edit-10516-fedora-install
...
Copy edit 10516 fedora install
2015-02-06 15:14:31 -08:00
e706be77a4
Merge pull request #10546 from SvenDowideit/update-boolean-flags-help
...
Documentation on boolean flags is wrong #10517
2015-02-06 15:12:11 -08:00
271a073a04
Merge pull request #10622 from estesp/10618-err-ondup-bind-vols
...
Don't allow duplicate `-v` specifications for the same target
2015-02-06 15:03:56 -08:00
c73e3bf4dc
Error out if file in container at volume path
...
Fixes #4393
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-02-06 18:00:00 -05:00
eb79acd7a0
Merge pull request #10421 from noironetworks/10388-Specifying_confliting_options
...
Specifying -a and -d to docker run should throw an error
2015-02-06 14:58:08 -08:00
76bf543fea
Merge pull request #10556 from estesp/ipv6-extra-hosts
...
Allow IPv6 addresses in ExtraHosts option settings
2015-02-06 14:53:54 -08:00
c2f82bba0a
Merge pull request #10558 from gierschv/doc-remote-url
...
Documents build API "remote" parameter
2015-02-06 14:51:51 -08:00
e4d711f3f0
Merge pull request #10308 from cpuguy83/add_volume_unit_tests
...
Adds unit tests for volumes
2015-02-06 14:51:11 -08:00
7d4bbc2ed8
Merge pull request #10273 from kojiromike/patch-1
...
Distinguish ENV from setting environment inline
2015-02-06 14:42:02 -08:00
e345fe53ba
Merge pull request #10573 from LK4D4/return_attach_to_builder
...
Change verbose builder out back to attach
2015-02-06 14:37:09 -08:00
e4a49ae188
Merge pull request #10424 from LK4D4/fix_non_tailed_log_format
...
Fix logs, so now, old and followed logs has same format without []
2015-02-06 14:35:45 -08:00
9d140fe693
Merge pull request #10105 from LK4D4/remove_tons_of_names
...
Use graphdb.Walk with depth=1 in /containers
2015-02-06 14:33:26 -08:00
b6dc430d99
Merge pull request #10153 from acbodine/api_websocket_test
...
Adds test for api attach via websocket
2015-02-06 14:29:54 -08:00
ffc499dbab
Merge pull request #10215 from taohu/remove-assumption-first-ip-is-bridge-ip
...
Remove the assumption that the first IP is the bridge IP
2015-02-06 14:15:46 -08:00
6d65fa1faa
Merge pull request #10208 from mota/fix-env-writerto
...
Fix env.WriteTo count return
2015-02-06 14:14:16 -08:00
6efecb7b41
Merge pull request #10186 from rhatdan/selinux-build
...
Turn on Security opts including labeling for docker build
2015-02-06 14:11:21 -08:00
0f8f04a774
Fix example about ps and linked containers
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-06 14:05:08 -08:00
2a3225eb82
Test for links names in ps --no-trunc
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-06 14:05:08 -08:00
10c3d9f80f
Use graphdb.Walk with depth=1 in /containers
...
I don't think that it was very useful feature in current implementation,
but when you have a lot of links - your daemon became unusable because
on first call of /containers global graphdb lock will be acquired and it
can take a lot of time: 30m for 15 containers linked to each other.
Links names can be seen with `--no-trunc`, but I think it's useless :)
Fixes #9967
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-06 14:04:21 -08:00
34c804a139
Merge pull request #9705 from acbodine/9311-truncindex-error-duplicate-id-on-ambiguous-id
...
Closes #9311 Handles container id/name collisions against daemon functionalities according to #8069
2015-02-06 14:01:28 -08:00
d1f33d12d4
Don't allow duplicate `-v` specifications for the same target
...
Addresses: #10618
Given that the user has no notification that they tried to bind mount
different directories on the same target in the container, this errors
out in that case, without changing the current code allowing for
--volumes-from to trump -v/VOLUME specifications.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-02-06 17:00:53 -05:00
a982432c16
Merge pull request #10601 from LK4D4/fix_tag_name_in_ps
...
Show right tag for container in ps
2015-02-06 16:59:49 -05:00
2e947ae407
Merge pull request #10605 from glasnt/readme_format
...
Format `awsconfig` sample config correctly
2015-02-06 16:55:58 -05:00
9c63178e86
Merge pull request #10611 from unclejack/systemd_doc_storage_path
...
docs/articles/systemd: correct --storage-driver
2015-02-06 16:52:28 -05:00
02e50999f5
Merge pull request #10612 from vbatts/vbatts-archive_sort
...
pkg/archive: sort files
2015-02-06 16:50:53 -05:00
77815c5492
Merge pull request #10300 from hqhq/hq_add_args_for_checkconfig
...
add args support for check-config.sh
2015-02-06 13:49:09 -08:00
d1f18786ac
Merge pull request #10263 from hqhq/hq_check_memoryswap
...
add check for memoryswap
2015-02-06 13:43:23 -08:00
9491cec224
Merge pull request #10602 from ahmetalpbalkan/dev/ahmetb-homedir-fix
...
Extract $HOME usages into utils.GetHomeDir() (reopen #10358 )
2015-02-06 16:27:59 -05:00
82191cc3f3
Merge pull request #10120 from duglin/TrimSpaces
...
Remove leading/trailing spaces in builder/parser
2015-02-06 16:25:37 -05:00
4f18fc0bd2
Merge pull request #10572 from duglin/DynamicHelpTest
...
Make checking of help text smarter
2015-02-06 16:18:49 -05:00
969ba5c7ed
Make checking of help text smarter
...
As I was reworking https://github.com/docker/docker/pull/9402 I realized
that the new testcase I just added that verified all help text is within
80 characters really should be smarter and ask "docker help" for the list
of commands to check instead of having a hard-coded list. This way
it will catch "docker execwait" automagically once #9402 is merged.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-02-06 13:02:58 -08:00
f9ae2d4fd4
Export $HOME lookup to pkg/homedir
...
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
2015-02-06 11:42:45 -08:00
e45deceb46
Show right tag for container in ps
...
Fixes #10599
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-06 11:32:01 -08:00
899a2dda09
pkg/archive: test that confirms hardlink ordering
...
This test was written against
master(abdfb21e3a
2015-02-06 18:14:38 +01:00
32d6d49539
pkg/archive: sort files
...
sort changes found and exported.
Sorting the files before appending them to the tar archive
would mean a dependable ordering for types like hardlinks.
Also, combine sort logic used
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-02-06 18:13:57 +01:00
3859c48531
Remove leading/trailing spaces in builder/parser
...
Per Erikh's suggestion at:
https://github.com/docker/docker/pull/9989#issuecomment-69832009
this PR will trim spaces in the parser to ensure that the user gets the same
results irrespetive of leading/trailing spaces.
Per @tiborvass's suggestion I added a test to make sure spaces in quotes
are not touched.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-02-06 08:52:18 -08:00
1e6e68361c
Documentation on boolean flags is wrong #10517
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-06 19:52:01 +10:00
eb814e4e70
Do some major rearranging of the fedora/centos/rhel installation docs
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-02-06 19:48:19 +10:00
66839cf3a6
update fedora docs to reflect latest rpm changes
...
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
2015-02-06 19:48:19 +10:00
6081a3ca90
Merge pull request #10523 from SvenDowideit/hide-more-old-docker-api-docs
...
The reference menu is too big to list more than the latest API docs, so ...
2015-02-06 19:26:01 +10:00
0b2f734462
docs/articles/systemd: correct --storage-driver
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2015-02-06 10:52:09 +02:00
df39336213
Format `awsconfig` sample config correctly
...
Reflow change in commit 195f3a3f
2015-02-06 13:45:10 +11:00
68b0ed54cb
Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer
...
For now, docker stats appears to be libcontainer only
2015-02-05 17:52:36 -08:00
6ffb77afd4
Extract $HOME usages into utils.GetHomeDir()
...
Refactored getHomeDir in docker/docker to GetHomeDir in utils
pkg. Currently covers all use cases on the client-side.
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
2015-02-05 16:13:51 -08:00
eda9c14cb9
Merge pull request #10560 from MihaiB/docs-typo
...
docs: fix typo
2015-02-06 00:42:45 +01:00
1c8beeb07a
Merge pull request #10552 from albers/bash-completion
...
Complete signals in bash completion for docker kill
2015-02-05 15:35:03 -08:00
Tibor Vass
Jessie Frazelle
Michael Crosby
Brian Goff
Alexander Morozov
Alexander Morozov
Phil Estes
Doug Davis
Ahmet Alp Balkan
Vincent Batts
Sven Dowideit
Lokesh Mandvekar
Sven Dowideit
unclejack
Katie McLaughlin
Fred Lifton
Ahmet Alp Balkan
James Turnbull