Commit Graph

1048 Commits

Author SHA1 Message Date
3c5e5abec3 Merge pull request #11811 from VladimirAus/11585-3
#11585: README for pkg/signal.
Upstream-commit: ec8f61044a7da10c5ddbf085c27afde4ea95c143
Component: engine
2015-03-26 10:44:09 -07:00
d90880d842 Merge pull request #11702 from jimmypuckett/feature/bitflag_checking_style_11668
Feature/bitflag checking style 11668.  Fixes #11668
Upstream-commit: dd492dc15d462aee110e4d6df6297ad64c5fad56
Component: engine
2015-03-26 08:34:58 -07:00
517a83c6d1 #11585: README for pkg/signal. Signed-off-by: Vladimir Roudakov <v_roudakov@yahoo.com>
Signed-off-by: VladimirAus <v_roudakov@yahoo.com>
Upstream-commit: 9b876b9c03f3ab5c2fecc5bc7a1501970f487b2a
Component: engine
2015-03-26 21:18:27 +10:00
b5975ff15e Removed redundant err == nil check
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com>
Upstream-commit: b38e11b3c4a84e35bfd76bff8133a5338cd69423
Component: engine
2015-03-26 11:36:13 +01:00
b9013b315f Merge pull request #11794 from moo-mou/11790-pkgulimit
Fixes pointer error
Upstream-commit: bc0f1e0e098d49fff458679001fe4e2ae58c03d7
Component: engine
2015-03-25 21:30:37 -07:00
e193f3caea Fixes pointer error
Signed-off-by: Paul Mou <ppymou@gmail.com>
Upstream-commit: 273fdd97edec3ad758dbf94e8268fd57512cee02
Component: engine
2015-03-25 20:45:17 -07:00
0ee1e9f604 Fixes hacks from progressreader refactor
related to #10959

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 0cd6c05d8112e9246b734107d54e2855e3d5fec5
Component: engine
2015-03-25 18:21:02 -07:00
6ebf43180d Merge pull request #11779 from blatyo/add_ulimit_test
Add test for successful Ulimit Parse.
Upstream-commit: 667452ec63b2965ae6291b87f8d10f0a9913a922
Component: engine
2015-03-25 17:34:58 -07:00
5926e0ab7b Add test for successful Ulimit Parse.
Signed-off-by: Allen Madsen <blatyo@gmail.com>
Upstream-commit: a97ca674f06cc7e70cc6defd617afa7775a8480a
Component: engine
2015-03-25 20:03:26 -04:00
940c2dcc3c Fix (*Ulimit).String() function. Closes #11769.
Signed-off-by: Allen Madsen <blatyo@gmail.com>
Upstream-commit: cb168e5622fefc42df1fa0e355aa5922c74329e8
Component: engine
2015-03-25 19:39:05 -04:00
6200bccb4a Removed redundant elses
Signed-off-by: Anes Hasicic <anes.hasicic@gmail.com>
Upstream-commit: 1b6065de8f46edc8f36f6b3734fe64175e413dc3
Component: engine
2015-03-25 23:34:00 +01:00
04fe859915 listenbuffer: add docs
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
Upstream-commit: 67bd859481a9d5c7a2ccf4c593e65d473ab3f106
Component: engine
2015-03-25 03:11:34 +00:00
6eeff65133 listenbuffer: add test
Signed-off-by: Simon Eskildsen <sirup@sirupsen.com>
Upstream-commit: b6b8032a1759905adbb68355e994b0405054bcc0
Component: engine
2015-03-25 03:11:33 +00:00
4ab99c503e Changing bitflag checking style to preferred style. Fixes #11668
Signed-off-by: Jimmy Puckett <jimmy.puckett@spinen.com>
Upstream-commit: ec5e22efe3fb88f2fa2eb5e9a37161940f86bcfa
Component: engine
2015-03-24 21:09:25 -04:00
e0fdaa87e8 Moved pidfile from utils to pkg
Fixes #10958 by moving utils.daemon to pkg.pidfile.
Test cases were also added.
Updated the daemon to use the new pidfile.

Signed-off-by: Rick Wieman <git@rickw.nl>
Upstream-commit: 772833274fd84b3c960ccab14258b7e5a00b18cd
Component: engine
2015-03-24 23:59:32 +01:00
cd0df47776 Merge pull request #11712 from 4gh/test_httputils
add tests for pkg/httputils
Upstream-commit: 439e0ab23f57f61ac8fcb1796dfc489a4305e2be
Component: engine
2015-03-24 13:56:31 -07:00
80a1056333 Merge pull request #11663 from arthurbarr/master
Fix #11589 by adding README and comments to exported functions
Upstream-commit: 28b96cc61357d03cca8d93cd8f27bb5fc0247c2b
Component: engine
2015-03-24 14:45:05 -06:00
0e96e605fc Fix #11589 by adding README and comments to exported functions
Signed-off-by: Arthur Barr <arthur.barr@uk.ibm.com>
Upstream-commit: 557cca536f82a25f110399fcd2964e07f5d51dcf
Component: engine
2015-03-24 17:30:19 +00:00
1e47557825 Refactor pkg/common, Fixes #11599
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: b80fae735684406d848b16a0f148a746e17ed25f
Component: engine
2015-03-24 18:19:59 +01:00
2db48ea0b7 add tests for pkg/httputils
closes #11597

Signed-off-by: Frank Herrmann <fgh@4gh.tv>
Upstream-commit: 2770a88413a98fcb3dd6e36e91c5041e5fe082eb
Component: engine
2015-03-24 16:27:09 +00:00
5999274fa2 Fix minor typo
Fix minor typo and make the comments of version-comparison functions
uniform.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 96d8c3584cedddfc69c01bda3f512d495b21ac47
Component: engine
2015-03-25 00:46:22 +08:00
8ed1ac3b2b Merge pull request #11634 from robertabbott/testutils_refactor
Refactors pkg/testutils
Upstream-commit: f586145cf178b9290034a6bbd1964e110a25377e
Component: engine
2015-03-23 17:30:51 -07:00
7074731d32 Merge pull request #11636 from robertabbott/refactor_networkfs
Refactor pkg/networkfs
Upstream-commit: d5eea4e8b04074b709d1bbe19b5336504df44446
Component: engine
2015-03-23 16:58:29 -07:00
c1aef62402 Merge pull request #11422 from vbatts/vbatts-overlay_dir_mtime_changes
pkg/archive: ignore mtime changes on directories
Upstream-commit: 9d00d8137f9b6075284a89bb832c4a828e19a9fb
Component: engine
2015-03-23 15:24:05 -07:00
30a3ccd5cd Disable ANSI emulation in certain windows shells
This disables recently added ANSI emulation feature in certain Windows
shells (like ConEmu) where ANSI output is emulated by default with builtin
functionality in the shell.

MSYS (mingw) runs in cmd.exe window and it doesn't support emulation.

Cygwin doesn't even pass terminal handles to docker.exe as far as I can
tell, stdin/stdout/stderr handles are behaving like non-TTY. Therefore not
even including that in the check.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: b38ff8c83d82b7958c62c07a8b82e4b85f0311c0
Component: engine
2015-03-23 18:38:43 +00:00
8814588380 Merge pull request #10347 from unclejack/bufreader_reset
reset bufReader to avoid extreme growth of buffers
Upstream-commit: c4603de56a635086772364af52a62548ad15c2fc
Component: engine
2015-03-23 10:07:43 -07:00
950464de97 Merge pull request #11395 from mitchcapper/master
Change windows default permissions to 755 not 711, read access for all p...
Upstream-commit: 56acb1aac87c489674b708d0d2b2128fa7944f66
Component: engine
2015-03-23 09:59:40 -07:00
4b8e196164 Refactor pkg/networkfs
Solves #11591

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: a91b2431a303f919b0737d95639d8e445124cb23
Component: engine
2015-03-22 23:53:47 -07:00
4361d07cff Refactors pkg/testutils
Solves #11579.

Signed-off-by: bobby abbott <ttobbaybbob@gmail.com>
Upstream-commit: 5de1e7bc3a823e1a4fa35ddf75401d233b3e4692
Component: engine
2015-03-22 22:31:46 -07:00
bac420baa9 Merge pull request #11566 from tiborvass/carry-10864
Carry 10864: ANSI terminal emulation for windows
Upstream-commit: e09ead98ef41d14d7e3d8784a0edf29d4afd60f5
Component: engine
2015-03-22 18:21:32 -07:00
5b307a9ba4 winconsole: cleanup
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 01a43174dae3b88e264f3139e1a4bf7ee666957f
Component: engine
2015-03-22 15:47:54 -04:00
62b8050640 Change windows default permissions to 755 not 711, read access for all poses little security risk and prevents breaking existing Dockerfiles
Signed-off-by: Mitch Capper <mitch.capper@gmail.com>
Upstream-commit: b7dc9040f04fe8dacd2f14c6b93d1b0bb6bde333
Component: engine
2015-03-20 21:54:33 -07:00
cc303ee343 Reduce memory allocation and remove channels
Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
Upstream-commit: 816d602059f9fd0e0df816c5a55e7f1dc437c8d9
Component: engine
2015-03-19 18:07:56 -07:00
9bfef356fa Fix panic with vi in busybox
Following bugs are fixed:
1.Handle out of bound cursor movements: vi in busybox sets cursor
to (999,999) expecting it to be set to right, bottom correctly.

2.Correctly determine redirected non-terminal file.

Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
Upstream-commit: cb7a65c55e192558376e542319a4b7e5445c2bcf
Component: engine
2015-03-18 13:10:57 -07:00
c6028dad54 pkg/ioutils: avoid huge Buffer growth in bufreader
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: e5ea2b235720db8dec7689b410de1830f707284a
Component: engine
2015-03-18 19:51:55 +02:00
b9849b445a pkg/ioutils: add tests for BufReader
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: 028f7987fe455d958d08db98ae267d9fd4cf3813
Component: engine
2015-03-18 19:32:46 +02:00
892ed3cf26 pkg/archive: ignore mtime changes on directories
on overlay fs, the mtime of directories changes in a container where new
files are added in an upper layer (e.g. '/etc'). This flags the
directory as a change where there was none.

Closes #9874

Signed-off-by: Vincent Batts <vbatts@redhat.com>
Upstream-commit: 2ce37f6616762900aa941c0644dece9cdbf90124
Component: engine
2015-03-17 10:53:34 -04:00
d6d379e87a Add ability to refer to image by name + digest
Add ability to refer to an image by repository name and digest using the
format repository@digest. Works for pull, push, run, build, and rmi.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
Upstream-commit: a2b0c9778feac970524b98ef7a91b5528fdeb9d5
Component: engine
2015-03-17 10:10:42 +00:00
5f00f97ea0 Merge pull request #9882 from ibuildthecloud/labels
Proposal: One Meta Data to Rule Them All => Labels
Upstream-commit: b6ac111abfbed628a80b67f0b092a248083b354c
Component: engine
2015-03-16 20:20:05 -07:00
f6d69b904a Merge pull request #11420 from estesp/reexec-path-fix
Fix relative path execution of docker daemon in reexec.Self()
Upstream-commit: f41ba82eb97379948aa88eb80eefd7a96c37e1ec
Component: engine
2015-03-16 14:57:25 -07:00
2781401caa fix various problems with iptables.Exists
This modifies iptables.Exists so that it must be called with an explicit
table and chain.  This allows us (a) to generate an appropriate command
line for "iptables -C", which was not previously possible, and (b) it
allows us to limit our strings.Contains() search to just the table and
chain in question, preventing erroneous matches against unrelated rules.

Resolves #10781

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: 3559b4177e611920d87c4dae607c641efb645783
Component: engine
2015-03-16 17:14:45 -04:00
6c2adcb2c5 Use syscall consts, check for errors,
Also rename func for non-windows specific names.

Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
Upstream-commit: 45262c4cb057e78ba98d02b5e0121ed402779c7f
Component: engine
2015-03-16 14:04:56 -07:00
0a4df30772 Move windows console specific implementation in sub package
Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
Upstream-commit: 898d2763c5430efaf808d7ca8c97b6d792c46c46
Component: engine
2015-03-16 14:04:53 -07:00
78e67ff2df ANSI terminal emulation for windows
It is implemented by intercepting and interpreting the output
escape sequence by calling win32 console apis.

In addition the input from win32 console is translated to linux keycodes

Signed-off-by: Sachin Joshi <sachin_jayant_joshi@hotmail.com>
Upstream-commit: d8c3090dd9abe3f0d95f99c9d8c7660922e9a719
Component: engine
2015-03-16 14:04:49 -07:00
7741ef02eb Fix relative path execution of docker daemon in reexec.Self()
After the new libcontainer API, the reexec.Self() output of the daemon
binary is used as the libcontainer factory InitPath.  If it is relative,
it can't be found at container start time.  This patch solves the
problem by making sure that we return a rooted/absolute path if a
relative path is used.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 334aea3441d9e499b7f999098a16abcb81d16a68
Component: engine
2015-03-16 16:52:00 -04:00
2479608ad5 Merge pull request #10977 from robertabbott/10959-progressreader
Moves progressreader from utils to its own package
Upstream-commit: 8ae20d8eba127361bc07260580e2d3b8e3628c3e
Component: engine
2015-03-16 12:45:33 -07:00
f923b4fab0 Merge pull request #11323 from delftswa2014/utils-daemon-windows
Make utils_daemon and volumes.go cross-platform compileable (Windows).
Upstream-commit: 6485d885a061a49b0f8d7aa27ec44afcccf56a98
Component: engine
2015-03-16 12:14:30 -07:00
b06c1f22f7 Make utils_daemon and volumes cross-platform compileable.
Signed-off-by: Rik Nijessen <riknijessen@gmail.com>
Upstream-commit: 1ec2eac50db2c98e00a488664625a22bf3757066
Component: engine
2015-03-16 11:46:07 +01:00
b3678f8418 Merge pull request #11076 from hqhq/hq_use_warning_in_sysinfo
use type WARN for warning
Upstream-commit: 82f390e139e611b97911c19dd1be2a98264cf4b9
Component: engine
2015-03-15 21:13:23 -07:00
58d45ba275 Set labels on container create
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: abb5e9a0777469e64fe2c7ecfa66ea01083d2071
Component: engine
2015-03-13 10:02:04 -07:00