6adb64e113
Merge pull request #14773 from runcom/cleanup-links
...
Cleanup links top level pkg
2015-07-29 20:17:44 -04:00
8724e8953d
Merge pull request #15040 from vbatts/vbatts-double-decompress-fix
...
archive, graphdriver: double decompress fix
2015-07-29 16:48:02 -07:00
4a71323ec3
Merge pull request #15098 from calavera/backwards_compat_kill_error
...
Keep backwards compatibility in kill api.
2015-07-29 16:42:36 -07:00
de50082000
Merge pull request #15134 from calavera/swappiness_big_int
...
Use pointer for MemorySwappiness.
2015-07-29 16:31:15 -07:00
2ae174e491
Merge pull request #15138 from ewindisch/apparmor-fix-test-plus-unconfined
...
Fix the proc integration test & include missing AA profile
2015-07-29 15:32:13 -07:00
75f8bdd970
Merge pull request #13542 from kvasdopil/freebsd-work
...
Make docker build on FreeBSD
2015-07-29 15:15:37 -07:00
6a274e48dc
Merge pull request #14843 from MHBauer/demonlogger-lint
...
golint fixes for daemon/logger/*
2015-07-29 18:09:46 -04:00
0e0c7e521c
Cleanup links top level pkg
...
- Move top level pkg links under daemon
- Refactor code accordingly
- golint pkg
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-29 23:39:18 +02:00
4e25d2982b
Use *int64 for MemorySwappiness.
...
So we marshal/unmarshal its value properly when it's empty.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-29 14:14:04 -07:00
5832715052
Fix the proc integration test & include missing AA profile
...
Integration tests were failing due to proc filter behavior
changes with new apparmor policies.
Also include the missing docker-unconfined policy resolving
potential startup errors. This policy is complain-only so
it should behave identically to the standard unconfined policy,
but will not apply system path-based policies within containers.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-29 17:08:51 -04:00
1d6e443119
/graph fix lin errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-29 20:59:36 +00:00
ccbe539e86
golint fixes for daemon/logger/*
...
- downcase and privatize exported variables that were unused
- make accurate an error message
- added package comments
- remove unused var ReadLogsNotSupported
- enable linter
- some spelling corrections
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-07-29 13:09:39 -07:00
0bab97fcba
Merge pull request #15076 from hqhq/hq_merge_daemon_test
...
Merge daemon_unit_test.go to daemon_test.go
2015-07-29 14:53:34 -04:00
c09c497c71
Merge pull request #15111 from Microsoft/fix-archive-copy-log
...
Fix log to logrus
2015-07-29 14:48:19 -04:00
26c03d561a
make docker compile on freebsd
...
Signed-off-by: Alexey Guskov <lexag@mail.ru>
2015-07-29 21:25:56 +03:00
0a2ec227f8
Merge pull request #15128 from ankushagarwal/logging
...
Doc fixes in daemon/logger, update NewCopier method
2015-07-29 14:20:34 -04:00
dfcdde4d98
Merge pull request #14930 from brahmaroutu/lint_daemon_graphdriver_devmapper
...
daemon/graphdriver/devmapper/ fix lint errors/warnings
2015-07-29 13:29:57 -04:00
41d85c014d
Doc fixes in logger, update NewCopier method
...
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-07-29 10:05:46 -07:00
2bf73c4b1a
Fix log to logrus
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-29 09:58:07 -07:00
d7661cb48b
Merge pull request #15099 from ewindisch/apparmor-restore-en
...
Restore AppArmor generation + fixes
2015-07-29 09:36:59 -07:00
6bca8ec3c9
Replace GenerateRandomID with GenerateNonCryptoID
...
This allow us to avoid entropy usage in non-crypto critical places.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-28 22:31:01 -07:00
972a94b449
daemon/graphdriver/devmapper/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-29 01:43:34 +00:00
3edc88f76d
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>
2015-07-28 17:45:51 -04:00
f809037128
Merge pull request #14848 from hqhq/hq_golint_execdriver
...
Fix golint warnings for daemon/execdriver/*
2015-07-28 14:23:22 -07:00
273f50c741
graphdriver/*: expect uncompressed tar for ApplyDiff
...
The `ApplyDiff` function takes a tar archive stream that is
automagically decompressed later. This was causing a double
decompression, and when the layer was empty, that causes an early EOF.
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-07-28 16:36:39 -04:00
621e3d8587
Keep backwards compatibility in kill api.
...
Return an error when the container is stopped only in api versions
equal or greater than 1.20 (docker 1.8).
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-28 12:25:36 -07:00
e06df594f5
Merge pull request #14863 from brahmaroutu/lint_daemon_graphdriver_aufs
...
daemon/graphdriver/aufs fix lint errors/warnings
2015-07-28 11:46:40 -07:00
ada852aa70
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>
2015-07-28 15:36:29 +08:00
55885daa56
daemon/graphdriver/aufs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-28 06:17:05 +00:00
12460f41a4
daemon/graphdriver/graphtest/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-28 06:01:00 +00:00
47c56e4353
Windows: Factoring out unused fields
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-27 17:44:18 -07:00
3d17c3bb66
Fix golint warnings for daemon/execdriver/*
...
Addresses: #14756
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-28 08:43:22 +08:00
7886056d74
Merge pull request #15059 from calavera/fix_overlay_comments_typo
...
Fix typo in overlay's create godoc.
2015-07-27 15:40:22 -07:00
5bac5302e5
Fix typo in overlay's create godoc.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-27 15:37:26 -07:00
25c42cc0d0
Merge pull request #14759 from vdemeester/pkg-golint
...
golint on some pkg/* packages
2015-07-27 15:19:46 -07:00
0fe564cbb6
Merge pull request #15051 from LK4D4/32bit_const
...
Use math.MaxInt32 instead of math.MaxUint32
2015-07-27 15:02:40 -07:00
eb45602d2f
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>
2015-07-27 13:11:16 -07:00
18c7c67308
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>
2015-07-27 21:26:21 +02:00
5170a2c096
Lint fixes on runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-27 21:23:15 +02:00
4dbdd98b41
Merge pull request #14547 from duglin/ErrDeadExec
...
Return 404 on exec-inspect when container is dead but exec is still around
2015-07-27 10:46:32 -07:00
6e1d887722
Merge pull request #13834 from hqhq/hq_memswap_change
...
Set default MemorySwap on Docker side
2015-07-27 10:46:10 -07:00
33bd41df94
Merge pull request #14118 from mountkin/fix-rmi-force
...
raise an error if rmi -f with multiple tags and running container
2015-07-27 10:42:07 -07:00
2f5dc43ca2
Merge pull request #14852 from rhatdan/relabel
...
Rename internal field Relabel to Mode
2015-07-27 10:31:08 -07:00
303345dc6a
Merge pull request #14875 from brahmaroutu/lint_daemon_graphdriver_btrfs
...
daemon/graphdriver/btrfs fix lint errors/warnings
2015-07-27 10:28:50 -07:00
70842ea942
Merge pull request #14899 from mountkin/fix-exec-resize-panic
...
fix the panic caused by resizing a starting exec
2015-07-27 10:27:29 -07:00
e89aec0dfb
Merge pull request #15010 from runcom/14947-fix-inspect-time-RFC3339Nano
...
Format times in inspect command with a template as RFC3339Nano
2015-07-27 10:08:21 -07:00
c9207bc0aa
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>
2015-07-26 15:25:08 +02:00
6b2b6cb3fc
Merge pull request #14940 from coolljt0725/add_vxfs_magic_number
...
Add VxFS magic number, fixes #14847
2015-07-25 23:25:48 +02:00
547d6c6656
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>
2015-07-25 14:08:38 +02:00
542685d856
Merge pull request #14976 from calavera/revert_unconfined_aa_policy
...
Revert "Introduce a dedicated unconfined AA policy"
2015-07-24 17:31:28 -07:00
Tibor Vass
Arnaud Porterie
Jessie Frazelle
Antonio Murdaca
David Calavera
Eric Windisch
Srini Brahmaroutu
Morgan Bauer
Alexey Guskov
Ankush Agarwal
John Howard
Alexander Morozov
Srini Brahmaroutu
Alexander Morozov
Vincent Batts
Qiang Huang
Vincent Demeester
Sebastiaan van Stijn
gs11