Commit Graph

10886 Commits

Author SHA1 Message Date
f066184384 add ID and Hostname in docker info
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 9a85f60c75f2017b14ed5e7f2bae5dc4961cb74c
Component: engine
2014-11-17 19:23:41 +00:00
884eb7da74 Fix the documentation and integration test for container resize
Closes #8728

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 91fb9b2f5a07232cecfcde38a98c3ec6410239b7
Component: engine
2014-11-17 18:38:08 +00:00
e7d027944d Remove obsolete comments
In the below comment line, already codes for log exists so
following comment is obsolete.
// TODO log

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: d5098fde9a64fdec2098c7a0c6bd777f88f7d4c9
Component: engine
2014-11-17 23:27:03 +09:00
8ac9679df7 Update AUTHORS file
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ab7a6544b09c0b061e35aa7df766ef7adc1fd2fe
Component: engine
2014-11-16 23:41:25 -08:00
89f15328f3 Merge pull request #8699 from shuai-z/fix-portalloc
Fix corner cases in ipallocator and portallocator
Upstream-commit: 34cb92e2d49e2c141a67cd5df73a54c1655b2842
Component: engine
2014-11-16 22:10:40 -08:00
d9d0e279e9 Fix misspelling
Fix misspelling from independant to independent

Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
Upstream-commit: bdaa76e8cf3baeeaa645d91aed168028301f537f
Component: engine
2014-11-17 04:23:22 +09:00
18dd4cded4 Merge pull request #8335 from duglin/Issue5198
Add --log-level support - Issue #5198
Upstream-commit: 61e4b4e1d015032e6e7ee17658023c4101be3e36
Component: engine
2014-11-15 10:53:31 -08:00
40988ed79f Add --log-level support
Next steps, in another PR, would be:
- make all logging go through the logrus stuff
- I'd like to see if we can remove the env var stuff (like DEBUG) but we'll see

Closes #5198

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 2facc0467336a80f48c765dbdbd803055a431aa9
Component: engine
2014-11-15 09:00:48 -08:00
75da15eccc devmapper: Call UdevWait() even in failure path
Currently we set up a cookie and upon failure not call UdevWait(). This
does not cleanup the cookie and associated semaphore and system will
soon max out on total number of semaphores.

To avoid this, call UdevWait() even in failure path which in turn will
cleanup associated semaphore.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: edc6df256d21eb1d1aa36b241dcc6d4b83d58d75
Component: engine
2014-11-15 09:41:27 -05:00
35f4af009d Add windows/(386,amd64) to cross platforms list
Edited make scripts to append .exe to windows binary

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: b7703a992e14255a5972bf157d0c2cfc0da3d53f
Component: engine
2014-11-14 18:20:54 -08:00
cd6fd83f37 Fix input volume path check on Windows
used path package instead of path/filepath so that --volumes and
--device parameters to always validate paths as unix paths instead of
OS-dependent path convention

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 5a38680bd2283c87848d2e7f62a14f0261291c7c
Component: engine
2014-11-14 18:20:54 -08:00
a64d9e402a Use USERPROFILE path on Windows as home directory
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: d4dbb708320e59efa91b077303c87f9e9513cd91
Component: engine
2014-11-14 18:20:54 -08:00
deefafa9d6 Remove unused sysinfo parameter to runconfig.Parse
Removing dead code.

Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: e45b0f92711ff190cff4b61b2ea80cdd53203a16
Component: engine
2014-11-14 18:20:54 -08:00
46e167f95c Refactor pkg/archive with a platform-independent stat struct
pkg/archive contains code both invoked from cli (cross platform) and
daemon (linux only) and Unix-specific dependencies break compilation on
Windows. We extracted those stat-related funcs into platform specific
implementations at pkg/system and added unit tests.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 2180aa4f6f2ad4d8f284d63ee29e93547263976e
Component: engine
2014-11-14 18:20:54 -08:00
39256638f6 Extract mknod, umask, lstat to pkg/system
Some parts of pkg/archive is called on both client/daemon code. To get
it compiling on Windows, these funcs are extracted into files with
build tags.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 3d2fae353f6ddc819d3a3c4db80887a40ac6f5f0
Component: engine
2014-11-14 18:20:54 -08:00
179af9eeb6 Extract TreeSize to daemon build
TreeSize uses syscall.Stat_t which is not available on Windows.
It's called only on daemon path, therefore extracting it to daemon
with build tag 'daemon'

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: b64c9b521ab4e4082ed874a23a493f4a266304d5
Component: engine
2014-11-14 18:20:53 -08:00
c976d3fdc2 Consolidate tmpdir implementations, include Windows
Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 376ae7780bf04d89ad1532f1c2a752535fa7ac7d
Component: engine
2014-11-14 18:20:53 -08:00
2e7196248a Extract client signals to pkg/signal
SIGCHLD and SIGWINCH used in api/client (cli code) are not
available on Windows. Extracting into separate files with build
tags.

Signed-off-by: Ahmet Alp Balkan <ahmetb@microsoft.com>
Upstream-commit: 91a86670aac52d916c81a818aff3dfcf445da83e
Component: engine
2014-11-14 18:20:53 -08:00
4c601bc6dd Refactor pkg/term package for Windows tty support
Signed-off-by: John Gossman <johngos@microsoft.com>
Upstream-commit: 975b6e598d44408c865993bbb650cc7117133ffc
Component: engine
2014-11-14 18:20:53 -08:00
aa1451c42e Merge pull request #9151 from tonistiigi/aufs-clipping-fix
Fix AUFS silent mount errors on many layers
Upstream-commit: 8682bac309cc46ca31fa35d93a8045061aba5b0f
Component: engine
2014-11-14 17:35:07 -08:00
4faf5170e1 Merge pull request #9164 from vbatts/vbatts-dm_removedevice
pkg/devicemapper: cleanup removeDevice differences
Upstream-commit: c89062bafc2262c5efeee905bafb72be57873478
Component: engine
2014-11-14 16:56:02 -08:00
b34358b506 pkg/devicemapper: defer udev wait during removal
Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: cef27e1d6c0bd302e1c58e9478a0fba99fd3a2d0
Component: engine
2014-11-14 15:17:33 -05:00
3a9fe771ef fix missing layers when exporting a full repository
Therer is a bug in the 'skip' decision when exporting a repository
(`docker save repo`)

Only the layers of the first image are included in the archive (the
layers of the next images are missing)

Signed-off-by: Anthony Baire <Anthony.Baire@irisa.fr>
Upstream-commit: b37fdc5dd1db196209ebb860c88a37d67bb2cf98
Component: engine
2014-11-14 14:41:35 +01:00
9599d52c6f Merge pull request #8999 from yoheiueda/test-unit-without-parallel
Make test-unit runnable without parallel
Upstream-commit: 7b7af6dbaeadb86c018a877af15c662786bc90c1
Component: engine
2014-11-14 15:39:51 +02:00
4a789162b2 Merge pull request #9156 from pixelistik/patch-1
Fix typo "infortmation" in docs for `docker run`
Upstream-commit: 70a3f4e8e20faa2404172412a9f7bb9dfb288c37
Component: engine
2014-11-14 08:02:12 -05:00
6f95500247 Merge pull request #9011 from vbatts/vbatts-btrfs_information
btrfs: information for the information gods
Upstream-commit: 870a695375b0035b2012dc25da55ca952b58c973
Component: engine
2014-11-13 20:47:07 -08:00
4798207faf pkg/devicemapper: cleanup removeDevice differences
Fixes failure on RemoveDevice when host is AUFS, and running
devicemapper test docker-in-docker

https://gist.github.com/tonistiigi/59559cbfb3f2df26b29c

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: c9a76622086cf6019b3ec71ae53fc71c0396a1ef
Component: engine
2014-11-13 22:43:03 -05:00
bb5bcd8e79 Merge pull request #9131 from vieux/empty_lines_dockerinfo
Do not display empty lines in docker info if the key doesn't exists
Upstream-commit: 967354d48818eebf9ce706bbd4914a20a0375de8
Component: engine
2014-11-13 19:08:32 -08:00
f5a6597726 Do not display empty lines in docker info if the key doesn't exists
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 4f5be9da86ffed40b810bb1840c19526a9156ab3
Component: engine
2014-11-14 02:50:34 +00:00
4567691298 Merge pull request #9107 from ashahab-altiscale/9062-linked-container
Share network namespace of containers with lxc
Upstream-commit: 5c863f983df6ebc913890bd6095cc47d8a3a624b
Component: engine
2014-11-13 18:25:38 -08:00
658637c073 Merge pull request #8964 from jlhawn/image_checksum
Compute TarSum on storage of image layer content
Upstream-commit: 039aa2741fa95ecb21e35a20d60d72018d8296c9
Component: engine
2014-11-13 18:07:20 -08:00
4189659614 Merge pull request #8869 from jlhawn/tarsum_version
Finalize TarSum Version 1 w/ refactor
Upstream-commit: 3aa2245914ea73f19838adbb09d0617984fbeb11
Component: engine
2014-11-14 01:12:22 +02:00
0e182a21a4 Fix typo "infortmation" in docs for docker run
Upstream-commit: cbf2879349bd6cc3b43f89733a9b81f55bd0c495
Component: engine
2014-11-13 23:26:49 +01:00
5dc5f5a90b Dockerfile: buildtags for old btrfs
Since the build uses ubuntu 14.04, which has an old btrfs, include the
buildtags needed for this old version to not break the build.

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: d7c37b5a28de6e7c0a9270815c092a45d8d7fef7
Component: engine
2014-11-13 16:44:00 -05:00
baecd1f7fb btrfs: build tag to enable showing version info
be default it is on, with build tags to disable the version info

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 25154682a5cd57aa4fc3ef88baeee3ce1f204060
Component: engine
2014-11-13 16:43:53 -05:00
e6274cf281 Merge pull request #9152 from duglin/DockerBuildEnvs
Allow a few more DOCKER_* env vars to pass thru Makefile
Upstream-commit: b0d219eef0311450306ff5a48ecb0ecee1ce49cc
Component: engine
2014-11-13 12:52:36 -08:00
aec65b5d89 Merge pull request #9064 from recursive-madman/patch-1
Proposed fix for #8979
Upstream-commit: 06899e08109b5d1c8e7fa69afed7cc117f9589a9
Component: engine
2014-11-13 12:24:22 -08:00
d79900f1e3 Merge pull request #9104 from tiborvass/issecure-check-in-new-endpoint
registry: refactor registry.IsSecure calls into registry.NewEndpoint
Upstream-commit: 447a1a9bad0a9f928e4a30853679255cb02d254f
Component: engine
2014-11-13 14:59:26 -05:00
007506732f Merge pull request #8930 from vbatts/vbatts-mount_freebsd_fields
pkg/mount: adding fields supported by freebsd
Upstream-commit: b9fb9787b6db5332944d9d0f1fc42eae77d34b7d
Component: engine
2014-11-13 11:54:16 -08:00
3b4007ccd1 Merge pull request #8897 from vbatts/vbatts-mount_sharedsubtree
pkg/mount: sharedsubtree options and testing
Upstream-commit: e4105e4535de0ddb1a0e3ddbc646429c5c8ab5ec
Component: engine
2014-11-13 11:26:29 -08:00
6e188415a0 Allow a few more DOCKER_* env vars to pass thru Makefile
I was trying to just build the Docker client but DOCKER_CLIENTONLY wasn't
getting passed thru from the shell to the container building docker.

So, this PR passes this var (via the -e option) on the docker run command
so we pick it up from the devs shell when running "make ...".

While in there I pulled all of the "-e" options into a new Makefile variable
so its easy to see just the list of env vars we pass along.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 912b0f0f73346bf93c4feb32c84c62c18ee62dbc
Component: engine
2014-11-13 11:25:11 -08:00
e61d8cd073 Fix AUFS silent mount errors on many layers
Fixes #1171
Fixes #6465

Data passed to mount(2) is clipped to PAGE_SIZE if its bigger. Previous 
implementation checked if error was returned and then started to append layers 
one by one. But if the PAGE_SIZE clipping appeared in between the paths, in the 
permission sections or in xino definition the call would not error and 
remaining layers would just be skipped(or some other unknown situation).

This also optimizes system calls as it tries to mount as much as possible with 
the first mount.


Signed-off-by: Tõnis Tiigi <tonistiigi@gmail.com> (github: tonistiigi)
Upstream-commit: 6d97339ca23ada27812572016ad4ff9ccffa8b09
Component: engine
2014-11-13 20:13:13 +02:00
37ee14abc3 Merge pull request #8644 from tamsky/pull-7698-docfix
Add mention of e2fsprogs to runtime dependencies.
Upstream-commit: 70e3cdcdd9dba29fcbed71c772749655d5907be6
Component: engine
2014-11-13 11:07:13 -07:00
56d604e1ed Merge pull request #8960 from LK4D4/add_nf_filter_check
Add check for IP_NF_FILTER
Upstream-commit: abceeb2ef5b3dad2ae0a7ca658f15aef406e8560
Component: engine
2014-11-13 11:03:29 -07:00
9224549fdb Remove reference to 'ifaceName' from configureBridge comment.
The argument ifaceName was removed in a much earlier commit.

Signed-off-by: Sami Wagiaalla <swagiaal@redhat.com>
Upstream-commit: a01f1e707eb682ec60d489a4171d2c82de79ee57
Component: engine
2014-11-13 10:19:56 -05:00
2e493e1f52 registry: parse INDEXSERVERADDRESS into a URL for easier check in isSecure
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: fbe10c83d81843412fd3485a8d6bb75849de97d4
Component: engine
2014-11-13 07:02:24 -08:00
a56997089b Corrected description of --sig-proxy
Signal proxy does work only in non-TTY mode (--tty=false). Man pages and
commands should not lie about it.

Signed-off-by: Michal Minar <miminar@redhat.com>
Upstream-commit: e71f241c4b8006f097e4c63f7b3ea28d4591ddee
Component: engine
2014-11-13 10:50:06 +01:00
22cdb1d809 Cleanup:change latest to graph.DEFAULTTAG
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 3c3968692d3024fde90637dbdfe56f08de100cdd
Component: engine
2014-11-13 16:21:34 +08:00
fdd71c9652 Put mock registry address in insecureRegistries for unit tests
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 78e859f3c35d1f31e7d6f3ded9a414dc0fbb8eaa
Component: engine
2014-11-12 20:34:03 -06:00
166cb2e350 registry: refactor registry.IsSecure calls into registry.NewEndpoint
Signed-off-by: Tibor Vass <teabee89@gmail.com>
Upstream-commit: 4455f517605f1fd7279bbe9547915f15c037997d
Component: engine
2014-11-12 20:34:03 -06:00