4126b923f8
Merge pull request #15076 from hqhq/hq_merge_daemon_test
...
Merge daemon_unit_test.go to daemon_test.go
Upstream-commit: 0bab97fcba8d2b4be1650fef381926e6b0259cc5
Component: engine
2015-07-29 14:53:34 -04:00
abf825af14
Merge pull request #15111 from Microsoft/fix-archive-copy-log
...
Fix log to logrus
Upstream-commit: c09c497c71e3fbcec6fee6ee0f4eb5097fc1b4b7
Component: engine
2015-07-29 14:48:19 -04:00
a14f132348
Merge pull request #15128 from ankushagarwal/logging
...
Doc fixes in daemon/logger, update NewCopier method
Upstream-commit: 0a2ec227f89d602f73867cae14bab0294d32fe20
Component: engine
2015-07-29 14:20:34 -04:00
307e5a8a1e
Merge pull request #14930 from brahmaroutu/lint_daemon_graphdriver_devmapper
...
daemon/graphdriver/devmapper/ fix lint errors/warnings
Upstream-commit: dfcdde4d9832adb5bbee146cdf5fac2cc5926b4f
Component: engine
2015-07-29 13:29:57 -04:00
9da89dbbd1
Doc fixes in logger, update NewCopier method
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: 41d85c014defd96cda06abac73554d9f9d1de0d8
Component: engine
2015-07-29 10:05:46 -07:00
a7dc60d0d3
Fix log to logrus
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2bf73c4b1a3b195ee426e74d221a9df032aaa89e
Component: engine
2015-07-29 09:58:07 -07:00
7b7157591c
Merge pull request #15099 from ewindisch/apparmor-restore-en
...
Restore AppArmor generation + fixes
Upstream-commit: d7661cb48b93978b4b30d2c60f3201d685af7f95
Component: engine
2015-07-29 09:36:59 -07:00
67bf5ba305
Replace GenerateRandomID with GenerateNonCryptoID
...
This allow us to avoid entropy usage in non-crypto critical places.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 6bca8ec3c9ccc169c53b3d7060fe5c8ba8670aac
Component: engine
2015-07-28 22:31:01 -07:00
581a7026d5
daemon/graphdriver/devmapper/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 972a94b449ea6a68f041c47fe7bda35b5ac765a2
Component: engine
2015-07-29 01:43:34 +00:00
e9b83a5a26
Restore AppArmor profile generation
...
Will attempt to load profiles automatically. If loading fails
but the profiles are already loaded, execution will continue.
A hard failure will only occur if Docker cannot load
the profiles *and* they have not already been loaded via
some other means.
Also introduces documentation for AppArmor.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 3edc88f76df6a3bc9d887de8157ec71730c9057a
Component: engine
2015-07-28 17:45:51 -04:00
a011b8f810
Merge pull request #14848 from hqhq/hq_golint_execdriver
...
Fix golint warnings for daemon/execdriver/*
Upstream-commit: f8090371280a23c430342a43ca99bb777c5f2318
Component: engine
2015-07-28 14:23:22 -07:00
fb177a237a
Merge pull request #14863 from brahmaroutu/lint_daemon_graphdriver_aufs
...
daemon/graphdriver/aufs fix lint errors/warnings
Upstream-commit: e06df594f5a449572d6807788f30a0240048b6a2
Component: engine
2015-07-28 11:46:40 -07:00
6f54df793f
Merge daemon_unit_test.go to daemon_test.go
...
daemon_test.go supposted to be unit test for daemon, so
don't see reason why we need another daemon_unit_test.go.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: ada852aa701e1ba34fd29589401b114309a2f74f
Component: engine
2015-07-28 15:36:29 +08:00
7f7157de05
daemon/graphdriver/aufs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 55885daa56a0278ed5b412497b3bf99f52d6c52e
Component: engine
2015-07-28 06:17:05 +00:00
39dd67d7c5
daemon/graphdriver/graphtest/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 12460f41a462b441d40db1a70165f7854f3fb77a
Component: engine
2015-07-28 06:01:00 +00:00
5acbf86531
Windows: Factoring out unused fields
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 47c56e4353792e16f994a35ea4063768bee6590e
Component: engine
2015-07-27 17:44:18 -07:00
f2ac9ec822
Fix golint warnings for daemon/execdriver/*
...
Addresses: #14756
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 3d17c3bb663a5d7a65bd39a5ef32cb4668b48c53
Component: engine
2015-07-28 08:43:22 +08:00
dde2806e53
Merge pull request #15059 from calavera/fix_overlay_comments_typo
...
Fix typo in overlay's create godoc.
Upstream-commit: 7886056d74f902a82b56e1f3bf1a27cc70952bbe
Component: engine
2015-07-27 15:40:22 -07:00
b123b9f21b
Fix typo in overlay's create godoc.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 5bac5302e59f0759545910ef748cc9a6f87db5c5
Component: engine
2015-07-27 15:37:26 -07:00
3d5c90498b
Merge pull request #14759 from vdemeester/pkg-golint
...
golint on some pkg/* packages
Upstream-commit: 25c42cc0d0a83325817e5fdb8fa654c9e5ab54d5
Component: engine
2015-07-27 15:19:46 -07:00
fc3779e694
Merge pull request #15051 from LK4D4/32bit_const
...
Use math.MaxInt32 instead of math.MaxUint32
Upstream-commit: 0fe564cbb6768c315da4f9476e8e035bac96d465
Component: engine
2015-07-27 15:02:40 -07:00
905c09e034
Use math.MaxInt32 instead of math.MaxUint32
...
I think it was original intention, because even half of a comment was about
MaxInt32.
Fix #15038
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: eb45602d2fa0fac8a694d2afb1c59ef60b0e1f77
Component: engine
2015-07-27 13:11:16 -07:00
2db54e3ac2
Lint on pkg/* packages
...
- pkg/useragent
- pkg/units
- pkg/ulimit
- pkg/truncindex
- pkg/timeoutconn
- pkg/term
- pkg/tarsum
- pkg/tailfile
- pkg/systemd
- pkg/stringutils
- pkg/stringid
- pkg/streamformatter
- pkg/sockets
- pkg/signal
- pkg/proxy
- pkg/progressreader
- pkg/pools
- pkg/plugins
- pkg/pidfile
- pkg/parsers
- pkg/parsers/filters
- pkg/parsers/kernel
- pkg/parsers/operatingsystem
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 18c7c67308bd4a24a41028e63c2603bb74eac85e
Component: engine
2015-07-27 21:26:21 +02:00
b61648e148
Lint fixes on runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 5170a2c096ff64d4bfbe0fab296ec6777c412bc3
Component: engine
2015-07-27 21:23:15 +02:00
1b5a1d2d53
Merge pull request #14547 from duglin/ErrDeadExec
...
Return 404 on exec-inspect when container is dead but exec is still around
Upstream-commit: 4dbdd98b4142dbda1c6028c17a9a0d6dd8cdce04
Component: engine
2015-07-27 10:46:32 -07:00
820dfff766
Merge pull request #13834 from hqhq/hq_memswap_change
...
Set default MemorySwap on Docker side
Upstream-commit: 6e1d887722d2ce56c67f2d85b78a69672952e3a7
Component: engine
2015-07-27 10:46:10 -07:00
6356a946a6
Merge pull request #14118 from mountkin/fix-rmi-force
...
raise an error if rmi -f with multiple tags and running container
Upstream-commit: 33bd41df94a3fa81e3b011602008a31a57a5ca68
Component: engine
2015-07-27 10:42:07 -07:00
58f2d2b582
Merge pull request #14852 from rhatdan/relabel
...
Rename internal field Relabel to Mode
Upstream-commit: 2f5dc43ca204c5d6e48abf5f64a46e150f3d0bfd
Component: engine
2015-07-27 10:31:08 -07:00
7e7519f5f0
Merge pull request #14875 from brahmaroutu/lint_daemon_graphdriver_btrfs
...
daemon/graphdriver/btrfs fix lint errors/warnings
Upstream-commit: 303345dc6a5179684bfe5f78ad9b3d73aba93d0e
Component: engine
2015-07-27 10:28:50 -07:00
6f66e6db3b
Merge pull request #14899 from mountkin/fix-exec-resize-panic
...
fix the panic caused by resizing a starting exec
Upstream-commit: 70842ea942326b2a3be3b504a7f5038ba68f07f1
Component: engine
2015-07-27 10:27:29 -07:00
704cf2735f
Merge pull request #15010 from runcom/14947-fix-inspect-time-RFC3339Nano
...
Format times in inspect command with a template as RFC3339Nano
Upstream-commit: e89aec0dfb2dd4a5decc11ea008f3ab179e8d5f8
Component: engine
2015-07-27 10:08:21 -07:00
0fccf757d0
Format times in inspect command with a template as RFC3339Nano
...
In 1.6.2 we were decoding inspect API response into interface{}.
time.Time fields were JSON encoded as RFC3339Nano in the response
and when decoded into interface{} they were just strings so the inspect
template treated them as just strings.
From 1.7 we are decoding into types.ContainerJSON and when the template
gets executed it now gets a time.Time and it's formatted as
2015-07-22 05:02:38.091530369 +0000 UTC.
This patch brings back the old behavior by typing time.Time fields
as string so they gets formatted as they were encoded in JSON -- RCF3339Nano
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: c9207bc0aa57745876a3422d2cbc290be7c53da8
Component: engine
2015-07-26 15:25:08 +02:00
3ff45b92dd
Merge pull request #14940 from coolljt0725/add_vxfs_magic_number
...
Add VxFS magic number, fixes #14847
Upstream-commit: 6b2b6cb3fc1a047e701b7884d98c89338144fb0a
Component: engine
2015-07-25 23:25:48 +02:00
f26f8b4a2b
Clarify error message when container name is already in use. Signed-off-by: Gustav Sinder <gustav.sinder@gmail.com>
...
Signed-off-by: gs11 <gustav.sinder@gmail.com >
Upstream-commit: 547d6c6656f161c3ad60c85ac0f19cf3d80571c7
Component: engine
2015-07-25 14:08:38 +02:00
d3667a22b6
Merge pull request #14976 from calavera/revert_unconfined_aa_policy
...
Revert "Introduce a dedicated unconfined AA policy"
Upstream-commit: 542685d856cad45b602e018baf36d7b268cbdfdc
Component: engine
2015-07-24 17:31:28 -07:00
6574e4057c
Merge pull request #14977 from jfrazelle/fix-lxc
...
fix lxc
Upstream-commit: 935810bd20cca725d52c10ca7759353681af961e
Component: engine
2015-07-24 16:43:46 -07:00
61a71388a8
Revert "Introduce a dedicated unconfined AA policy"
...
This reverts commit 87376c3add7dcd48830060652554e7ae43d11881.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 94ab0d312fedaf063a6487c6b1b8b7b97221d24a
Component: engine
2015-07-24 16:35:51 -07:00
11ea6871f4
fix memory swappiness lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
Upstream-commit: a38b544ef082bcea76c4ea13e19d935ac09d3498
Component: engine
2015-07-24 15:46:51 -07:00
eb95ca4553
Merge pull request #14967 from Microsoft/10662-fixpaniconwindowsdaemon
...
Windows: Fixes panic on daemon binary
Upstream-commit: 2084eee02c49fba22b2396abc626c1e6c7fc8ec2
Component: engine
2015-07-24 16:48:37 -04:00
fe5b9c1f61
Windows: Fixes panic on daemon binary
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: b405e89d5cd89d132efef1194a815e670ad15554
Component: engine
2015-07-24 12:30:49 -07:00
4d9279a3fb
Improve documentation and golint compliance of registry package
...
* Add godoc documentation where it was missing
* Change identifier names that don't match Go style, such as INDEX_NAME
* Rename RegistryInfo to PingResult, which more accurately describes
what this structure is for. It also has the benefit of making the name
not stutter if used outside the package.
Updates #14756
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 4fcb9ac40ce33c4d6e08d5669af6be5e076e2574
Component: engine
2015-07-24 11:55:07 -07:00
a7cda977e7
Merge pull request #14958 from LK4D4/fix_valid
...
Fix option validation for log-drivers without it
Upstream-commit: 3a07e7d115626a4658a6c0d222c467c033cf66c3
Component: engine
2015-07-24 09:57:36 -07:00
ffc7323b60
Fix option validation for log-drivers without it
...
There is no option validation for "journald" log-driver, so it makes no
sense to fail in that case.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d68c55bc72625bce226971ef6e760530e9a15ce3
Component: engine
2015-07-24 09:00:53 -07:00
42a4333b5d
raise an error if rmi -f with multiple tags and running container
...
Fixes https://github.com/docker/docker/issues/14116
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: 9f7698a63731cd1000c664894e7f48942be16821
Component: engine
2015-07-24 20:44:13 +08:00
a1d7796250
fix the panic caused by resizing a starting exec
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: ba5e0980527d3477cb85925e07eecb28dfe50e08
Component: engine
2015-07-24 20:43:07 +08:00
7f686f0d54
Rename internel field Relabel to Mode
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
Upstream-commit: 4cb9479ce490408daae2ffc2b7d28ad181ce24c3
Component: engine
2015-07-24 07:14:37 -04:00
26ba48c09d
Add VxFS magic number, fixes #14847
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: e1c5e9b5610e46bf9526dafcbfba3332fe1983e0
Component: engine
2015-07-24 16:37:56 +08:00
12234c67d4
cli: new daemon command and new cli package
...
This patch creates a new cli package that allows to combine both client
and daemon commands (there is only one daemon command: docker daemon).
The `-d` and `--daemon` top-level flags are deprecated and a special
message is added to prompt the user to use `docker daemon`.
Providing top-level daemon-specific flags for client commands result
in an error message prompting the user to use `docker daemon`.
This patch does not break any old but correct usages.
This also makes `-d` and `--daemon` flags, as well as the `daemon`
command illegal in client-only binaries.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 96ce3a194aab2807fdd638825b9ea7cb9ba55c36
Component: engine
2015-07-23 19:44:46 -04:00
ef42dd327d
daemon/graphdriver/btrfs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 17c19f395f4d88c70f33119e01a077ca1fdb5c1d
Component: engine
2015-07-23 22:48:45 +00:00
7fa69a889f
Merge pull request #14854 from rhvgoyal/unmount-base
...
docker: Unmount -init layer root before taking a snapshot
Upstream-commit: 1e40915e9d626ba8a00170941886fefab96fa682
Component: engine
2015-07-23 15:17:07 -04:00
