clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-08-26 18:17:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
13,042 Commits 9 Branches 112 Tags
76bf543fea18138a17a2a373aaed88bef68f69f7
Commit Graph

13042 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jessie Frazelle 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
Jessie Frazelle c2f82bba0a Merge pull request #10558 from gierschv/doc-remote-url 
Documents build API "remote" parameter
 2015-02-06 14:51:51 -08:00
Alexander Morozov e4d711f3f0 Merge pull request #10308 from cpuguy83/add_volume_unit_tests 
Adds unit tests for volumes
 2015-02-06 14:51:11 -08:00
Michael Crosby 7d4bbc2ed8 Merge pull request #10273 from kojiromike/patch-1 
Distinguish ENV from setting environment inline
 2015-02-06 14:42:02 -08:00
Michael Crosby 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
Michael Crosby 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
Michael Crosby 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
Alexander Morozov 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
Michael Crosby 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
Alexander Morozov 6d65fa1faa Merge pull request #10208 from mota/fix-env-writerto 
Fix env.WriteTo count return
 2015-02-06 14:14:16 -08:00
Alexander Morozov 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
Alexander Morozov 0f8f04a774 Fix example about ps and linked containers 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-02-06 14:05:08 -08:00
Alexander Morozov 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
Alexander Morozov 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
Michael Crosby 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
Tibor Vass 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
Tibor Vass 2e947ae407 Merge pull request #10605 from glasnt/readme_format 
Format `awsconfig` sample config correctly
 2015-02-06 16:55:58 -05:00
Tibor Vass 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
Tibor Vass 02e50999f5 Merge pull request #10612 from vbatts/vbatts-archive_sort 
pkg/archive: sort files
 2015-02-06 16:50:53 -05:00
Alexander Morozov 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
Michael Crosby d1f18786ac Merge pull request #10263 from hqhq/hq_check_memoryswap 
add check for memoryswap
 2015-02-06 13:43:23 -08:00
Tibor Vass 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
Tibor Vass 82191cc3f3 Merge pull request #10120 from duglin/TrimSpaces 
Remove leading/trailing spaces in builder/parser
 2015-02-06 16:25:37 -05:00
Tibor Vass 4f18fc0bd2 Merge pull request #10572 from duglin/DynamicHelpTest 
Make checking of help text smarter
 2015-02-06 16:18:49 -05:00
Doug Davis 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
Ahmet Alp Balkan f9ae2d4fd4 Export $HOME lookup to pkg/homedir 
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
 2015-02-06 11:42:45 -08:00
Alexander Morozov 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
Vincent Batts 899a2dda09 pkg/archive: test that confirms hardlink ordering 
This test was written against
master(abdfb21e3a) as a failing test, but
works with this patch set.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-02-06 18:14:38 +01:00
Vincent Batts 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
Doug Davis 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
Sven Dowideit 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
unclejack 0b2f734462 docs/articles/systemd: correct --storage-driver 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-02-06 10:52:09 +02:00
Katie McLaughlin df39336213 Format awsconfig sample config correctly 
Reflow change in commit 195f3a3f removed newlines in the config format.

This change reverts the sample config to the original formatting, which
matches the actual config format of a `awsconfig` file.

Signed-off-by: Katie McLaughlin <katie@glasnt.com>
 2015-02-06 13:45:10 +11:00
Fred Lifton 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
Ahmet Alp Balkan 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
James Turnbull eda9c14cb9 Merge pull request #10560 from MihaiB/docs-typo 
docs: fix typo
 2015-02-06 00:42:45 +01:00
Jessie Frazelle 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
Dan Walsh 8a8dcf1930 Turn on Security opts including labeling for docker build 
Currently docker build is not passing HostConfig to daemon.Create.
this patch creates the default HostConfig and passes it to daemon.Create.
This will cause the SELinux labeling to turn on for docker build.  Basically
it causes a SecurtyOpt field to be created.  In the future this might also
allow us to use seccomp and UserNamespace with docker build.

Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-02-05 12:33:22 +01:00
Harald Albers 532513153f Bash completion for docker kill 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-02-05 09:42:33 +01:00
James Turnbull abdfb21e3a Merge pull request #10521 from SvenDowideit/docs-not-ready-yet 
remove swarm, machine and compose from the 1.5.0 release docs
 2015-02-05 03:42:14 +01:00
Fred Lifton e13a0de7aa Merge pull request #10575 from SvenDowideit/elide-dhe-docs 
The DHE documentation will not be published with 1.5.0
 2015-02-04 18:16:42 -08:00
Fred Lifton 6dd2364dc2 Merge pull request #10576 from SvenDowideit/devicemapper-spelling-fix 
Fix a small spelling error in the dm.blkdiscard docs
 2015-02-04 17:42:31 -08:00
Fred Lifton e19f2c0e52 Merge pull request #10506 from SvenDowideit/v1.5.0-release-notes 
Add an initial list of new features in Docker Engine 1.5.0
 2015-02-04 17:22:11 -08:00
Qiang Huang 0c0f0d5ab4 update docs for memory and memoryswap 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-02-05 09:12:56 +08:00
Qiang Huang 72f356be6a add check for memoryswap when create 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-02-05 09:05:27 +08:00
Sven Dowideit fcb975cfd1 Fix a small spelling error in the dm.blkdiscard docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:57:33 +10:00
Sven Dowideit 16a15ea581 Add an initial list of new features in Docker Engine 1.5.0 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:37:15 +10:00
Sven Dowideit a7a9ce2635 remove swarm, machine and compose from the 1.5.0 release docs 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:30:57 +10:00
Sven Dowideit 9867dfa617 The DHE documentation will not be published with 1.5.0 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-05 10:26:53 +10:00
Sven Dowideit 1cc774b4fa Merge pull request #10508 from SvenDowideit/ctrl-backslash-used-to-generate-a-stacktrace 
Remove docker attach generates a stacktrace on ctrl-\ docs, as i can't trigger it
 2015-02-05 10:21:00 +10:00