Commit Graph
13363 Commits
Author SHA1 Message Date
Jessie Frazelle 87475d58c1 Merge pull request #10556 from estesp/ipv6-extra-hosts
Allow IPv6 addresses in ExtraHosts option settings
Upstream-commit: 76bf543fea18138a17a2a373aaed88bef68f69f7
Component: engine
2015-02-06 14:53:54 -08:00
Jessie Frazelle 35392998b3 Merge pull request #10558 from gierschv/doc-remote-url
Documents build API "remote" parameter
Upstream-commit: c2f82bba0a7d365ae4712804d9aed50dff788898
Component: engine
2015-02-06 14:51:51 -08:00
Alexander Morozov ae96fd855d Merge pull request #10308 from cpuguy83/add_volume_unit_tests
Adds unit tests for volumes
Upstream-commit: e4d711f3f02635a02152125848c722a12ec401eb
Component: engine
2015-02-06 14:51:11 -08:00
Steve Koch 72669b3feb Add link to user guide to end of 14.04 section
Adding instructions to exit the test shell and a link to the user guide (as is done in the following sections for 12.04 and 13.04/10

Signed-off-by: Steven Koch <sjkoch@unm.edu>
Upstream-commit: 823cb1281060981a537b4d36315bf0a02074b2a2
Component: engine
2015-02-06 15:50:51 -07:00
Michael Crosby 4c675886ca Merge pull request #10273 from kojiromike/patch-1
Distinguish ENV from setting environment inline
Upstream-commit: 7d4bbc2ed8305a730267e861bfe71ac7dbd3e373
Component: engine
2015-02-06 14:42:02 -08:00
Michael Crosby 079f594f83 Merge pull request #10573 from LK4D4/return_attach_to_builder
Change verbose builder out back to attach
Upstream-commit: e345fe53ba1e8f84cef2396e332860a87fcd65da
Component: engine
2015-02-06 14:37:09 -08:00
Michael Crosby 440786c4fd Merge pull request #10424 from LK4D4/fix_non_tailed_log_format
Fix logs, so now, old and followed logs has same format without []
Upstream-commit: e4a49ae1885a7f80e713d1d1fc852f6e4214dfe6
Component: engine
2015-02-06 14:35:45 -08:00
Michael Crosby 2793f9f606 Merge pull request #10105 from LK4D4/remove_tons_of_names
Use graphdb.Walk with depth=1 in /containers
Upstream-commit: 9d140fe693a221cd19857c1232da66c52df51c9b
Component: engine
2015-02-06 14:33:26 -08:00
Alexander Morozov 01d71dc709 Merge pull request #10153 from acbodine/api_websocket_test
Adds test for api attach via websocket
Upstream-commit: b6dc430d995acd34958c2b1b7becd2e0f473c5a7
Component: engine
2015-02-06 14:29:54 -08:00
Michael Crosby 10fe3fe6e5 Merge pull request #10215 from taohu/remove-assumption-first-ip-is-bridge-ip
Remove the assumption that the first IP is the bridge IP
Upstream-commit: ffc499dbabdef0cdfeb5e71b96b445efa6f12c2e
Component: engine
2015-02-06 14:15:46 -08:00
Alexander Morozov a251ace79f Merge pull request #10208 from mota/fix-env-writerto
Fix env.WriteTo count return
Upstream-commit: 6d65fa1faa4770b5e7930da8f9e8bd82be539475
Component: engine
2015-02-06 14:14:16 -08:00
Alexander Morozov de53eceaad Merge pull request #10186 from rhatdan/selinux-build
Turn on Security opts including labeling for docker build
Upstream-commit: 6efecb7b41d1c80e98131307ae428a2f1f57d1ea
Component: engine
2015-02-06 14:11:21 -08:00
Alexander Morozov 2d864c1626 Fix example about ps and linked containers
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 0f8f04a77492ddf37ca9c163ef0c3ddaf8a93a40
Component: engine
2015-02-06 14:05:08 -08:00
Alexander Morozov 13f02d612c Test for links names in ps --no-trunc
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2a3225eb82274d245c25fc6191945dde1f25f668
Component: engine
2015-02-06 14:05:08 -08:00
Alexander Morozov 419a4ce664 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>
Upstream-commit: 10c3d9f80fa1584ea37eb0465748d35341d9d227
Component: engine
2015-02-06 14:04:21 -08:00
Michael Crosby dfd79f3c67 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
Upstream-commit: 34c804a139cc086e9fa6d3f99442f083b6d5e1e7
Component: engine
2015-02-06 14:01:28 -08:00
Phil Estes b33f390dce 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)
Upstream-commit: d1f33d12d4126aae80c51ab1075a5b8323a5f957
Component: engine
2015-02-06 17:00:53 -05:00
Tibor Vass 29804755f7 Merge pull request #10601 from LK4D4/fix_tag_name_in_ps
Show right tag for container in ps
Upstream-commit: a982432c16ffb3c823530e00b84b7c7676802f24
Component: engine
2015-02-06 16:59:49 -05:00
Tibor Vass a8eec7f547 Merge pull request #10605 from glasnt/readme_format
Format `awsconfig` sample config correctly
Upstream-commit: 2e947ae407252b9389ead7ee7d234bcfa6207342
Component: engine
2015-02-06 16:55:58 -05:00
Tibor Vass 225cdeb86f Merge pull request #10611 from unclejack/systemd_doc_storage_path
docs/articles/systemd: correct --storage-driver
Upstream-commit: 9c63178e8678afb5d4f1305003d1dd01e4f3a43b
Component: engine
2015-02-06 16:52:28 -05:00
Tibor Vass f888d788f6 Merge pull request #10612 from vbatts/vbatts-archive_sort
pkg/archive: sort files
Upstream-commit: 02e50999f56e7f02d670494b101e677bc1001987
Component: engine
2015-02-06 16:50:53 -05:00
Alexander Morozov 695e4a4343 Merge pull request #10300 from hqhq/hq_add_args_for_checkconfig
add args support for check-config.sh
Upstream-commit: 77815c5492a20afc390b70ada662c3dc58e682c7
Component: engine
2015-02-06 13:49:09 -08:00
Michael Crosby 24564a4544 Merge pull request #10263 from hqhq/hq_check_memoryswap
add check for memoryswap
Upstream-commit: d1f18786ac009fedb716373ebc2ea6d646d3d8f2
Component: engine
2015-02-06 13:43:23 -08:00
Tibor Vass 5d044af03b Merge pull request #10602 from ahmetalpbalkan/dev/ahmetb-homedir-fix
Extract $HOME usages into utils.GetHomeDir() (reopen #10358)
Upstream-commit: 9491cec22494ad3e180ce6933ed72df6d344b342
Component: engine
2015-02-06 16:27:59 -05:00
Tibor Vass eba231efa0 Merge pull request #10120 from duglin/TrimSpaces
Remove leading/trailing spaces in builder/parser
Upstream-commit: 82191cc3f3b3ea49da6287abdb9c2ba6eb6d253c
Component: engine
2015-02-06 16:25:37 -05:00
Tibor Vass 0461a4d805 Merge pull request #10572 from duglin/DynamicHelpTest
Make checking of help text smarter
Upstream-commit: 4f18fc0bd2bed615ddc4c9b0e96d11f2810705d9
Component: engine
2015-02-06 16:18:49 -05:00
Doug Davis a8f9224e85 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>
Upstream-commit: 969ba5c7edfdca1d97a836e9549d80ce547a86a0
Component: engine
2015-02-06 13:02:58 -08:00
Ahmet Alp Balkan 62119ca587 Export $HOME lookup to pkg/homedir
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: f9ae2d4fd4c5b4afb7a2299b93a800f718b63a2a
Component: engine
2015-02-06 11:42:45 -08:00
Alexander Morozov 915f96f67c Show right tag for container in ps
Fixes #10599

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e45deceb462351f841aa077819fdef3166381c50
Component: engine
2015-02-06 11:32:01 -08:00
Vincent Batts 084e9ad0b5 pkg/archive: test that confirms hardlink ordering
This test was written against
master(abdfb21e3a761efdd70614de42905ff7911c5372) as a failing test, but
works with this patch set.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 899a2dda097a57a12f8794ded4a706781173aa5d
Component: engine
2015-02-06 18:14:38 +01:00
Vincent Batts 6910db2df7 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>
Upstream-commit: 32d6d49539f5876e6ef75f00db917d8a3aaa0569
Component: engine
2015-02-06 18:13:57 +01:00
Doug Davis 7b03f17d1a 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>
Upstream-commit: 3859c485317a395de1e8eb48270d0e3b1207a204
Component: engine
2015-02-06 08:52:18 -08:00
Sven Dowideit f3b4b47f92 Documentation on boolean flags is wrong #10517
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 1e6e68361c6cc42ab92288e0a0132b14ef6c9426
Component: engine
2015-02-06 19:52:01 +10:00
Sven Dowideit 20a29795dd Do some major rearranging of the fedora/centos/rhel installation docs
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: eb814e4e703b4676e0cb410052d1145ee9f8628e
Component: engine
2015-02-06 19:48:19 +10:00
Lokesh Mandvekar f31f8c4059 update fedora docs to reflect latest rpm changes
Signed-off-by: Lokesh Mandvekar <lsm5@fedoraproject.org>
Upstream-commit: 66839cf3a6718f844e71d2561cc706c95f5629ec
Component: engine
2015-02-06 19:48:19 +10:00
Sven Dowideit 88b86ea3ea 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 ...
Upstream-commit: 6081a3ca90f7994ae19d22009e3691de03afad14
Component: engine
2015-02-06 19:26:01 +10:00
unclejack cdd7eba595 docs/articles/systemd: correct --storage-driver
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 0b2f734462df3062acefe4bc4bd14d0604bae286
Component: engine
2015-02-06 10:52:09 +02:00
Chen Hanxiao c62d5ec226 nat: enable upper case proto
We only accepted lower case proto: tcp, udp.
This patch will enable us to use upper case
of proto such as: EXPOSE 1234/TCP

Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com>
Upstream-commit: 270642643452b440b159216d843ea4fc2239ff4f
Component: engine
2015-02-06 14:07:17 +08:00
Katie McLaughlin 1cdd0ecffc 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>
Upstream-commit: df3933621372e6f974801717cbb9fe3846efbfd6
Component: engine
2015-02-06 13:45:10 +11:00
Fred Lifton 8eee87ed67 Merge pull request #10574 from SvenDowideit/docker-stats-limited-to-libcontainer
For now, docker stats appears to be libcontainer only
Upstream-commit: 68b0ed54cb7ed9e4b66e8a9e0708577b32088de2
Component: engine
2015-02-05 17:52:36 -08:00
Derek McGowan e071644a3f Update verification message logic
Only show the verification message if all the tarsum checks pass and the image manifest is verified.
No longer return an error when a tarsum verification fails, just reset the verification flag.
Tarsum verification is less meaningful without a verified manifest and therefore it should not cause an error.
Updated the verified image test to pull an image which expected to have a verified manifest and contents.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 6088df20c33afafa523b9dd9b0acdd3b987c4534
Component: engine
2015-02-05 17:46:55 -08:00
Ahmet Alp Balkan 63b6feced2 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>
Upstream-commit: 6ffb77afd4c3705322417f0673d254038f01a187
Component: engine
2015-02-05 16:13:51 -08:00
James Turnbull 9c086aa5c5 Merge pull request #10560 from MihaiB/docs-typo
docs: fix typo
Upstream-commit: eda9c14cb9d3bd6a99ea8badbdb0446cd4c1faf9
Component: engine
2015-02-06 00:42:45 +01:00
Jessie Frazelle 5d2a3cc9ae Merge pull request #10552 from albers/bash-completion
Complete signals in bash completion for docker kill
Upstream-commit: 1c8beeb07af9b779fc635aacce908227e7a25293
Component: engine
2015-02-05 15:35:03 -08:00
Ian Babrou b9f1d0a0b4 Checking EXT4_FS_SECURITY and EXT4_FS_POSIX_ACL for overlay
Signed-off-by: Ian Babrou <ibobrik@gmail.com>
Upstream-commit: a6c6d8bb91a9e2fc2f9bd3da78382112794d17fe
Component: engine
2015-02-05 17:41:13 +03:00
Dan Walsh d61c0e9f91 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)
Upstream-commit: 8a8dcf1930cbd3354994938d5f8e420fb3e66d95
Component: engine
2015-02-05 12:33:22 +01:00
Harald Albers a2390c36ad Bash completion for docker kill
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 532513153f64abdda87332b3cf76863dd07bf0ff
Component: engine
2015-02-05 09:42:33 +01:00
James Turnbull a99f7cd89b Merge pull request #10521 from SvenDowideit/docs-not-ready-yet
remove swarm, machine and compose from the 1.5.0 release docs
Upstream-commit: abdfb21e3a761efdd70614de42905ff7911c5372
Component: engine
2015-02-05 03:42:14 +01:00
Fred Lifton f4d8ef933c Merge pull request #10575 from SvenDowideit/elide-dhe-docs
The DHE documentation will not be published with 1.5.0
Upstream-commit: e13a0de7aad0e38725868f8e12fc57cc73ed316f
Component: engine
2015-02-04 18:16:42 -08:00
Fred Lifton 7f4431424b Merge pull request #10576 from SvenDowideit/devicemapper-spelling-fix
Fix a small spelling error in the dm.blkdiscard docs
Upstream-commit: 6dd2364dc2c6ba0d95a5dc52dae447c80d9af5d0
Component: engine
2015-02-04 17:42:31 -08:00