Alexander Morozov
f809037128
Merge pull request #14848 from hqhq/hq_golint_execdriver
...
Fix golint warnings for daemon/execdriver/*
2015-07-28 14:23:22 -07:00
Vincent Batts
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
David Calavera
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
Jessie Frazelle
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
Qiang Huang
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
Srini Brahmaroutu
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
Srini Brahmaroutu
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
Qiang Huang
fed85c3296
Add status string to State field for inspect
...
Fixes : #13579
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-07-28 08:48:27 +08:00
John Howard
47c56e4353
Windows: Factoring out unused fields
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-27 17:44:18 -07:00
Qiang Huang
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
Jessie Frazelle
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
David Calavera
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
Jessie Frazelle
25c42cc0d0
Merge pull request #14759 from vdemeester/pkg-golint
...
golint on some pkg/* packages
2015-07-27 15:19:46 -07:00
Jessie Frazelle
0fe564cbb6
Merge pull request #15051 from LK4D4/32bit_const
...
Use math.MaxInt32 instead of math.MaxUint32
2015-07-27 15:02:40 -07:00
Alexander Morozov
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
Vincent Demeester
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
Vincent Demeester
5170a2c096
Lint fixes on runconfig
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2015-07-27 21:23:15 +02:00
Alexander Morozov
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
Jessie Frazelle
6e1d887722
Merge pull request #13834 from hqhq/hq_memswap_change
...
Set default MemorySwap on Docker side
2015-07-27 10:46:10 -07:00
Jessie Frazelle
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
Jessie Frazelle
2f5dc43ca2
Merge pull request #14852 from rhatdan/relabel
...
Rename internal field Relabel to Mode
2015-07-27 10:31:08 -07:00
Jessie Frazelle
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
Jessie Frazelle
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
David Calavera
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
Antonio Murdaca
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
Sebastiaan van Stijn
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
gs11
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
Arnaud Porterie
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
Jessie Frazelle
935810bd20
Merge pull request #14977 from jfrazelle/fix-lxc
...
fix lxc
2015-07-24 16:43:46 -07:00
David Calavera
94ab0d312f
Revert "Introduce a dedicated unconfined AA policy"
...
This reverts commit 87376c3add .
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-07-24 16:35:51 -07:00
Jessica Frazelle
a38b544ef0
fix memory swappiness lxc
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-07-24 15:46:51 -07:00
Doug Davis
2084eee02c
Merge pull request #14967 from Microsoft/10662-fixpaniconwindowsdaemon
...
Windows: Fixes panic on daemon binary
2015-07-24 16:48:37 -04:00
John Howard
b405e89d5c
Windows: Fixes panic on daemon binary
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-24 12:30:49 -07:00
Aaron Lehmann
4fcb9ac40c
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 >
2015-07-24 11:55:07 -07:00
David Calavera
3a07e7d115
Merge pull request #14958 from LK4D4/fix_valid
...
Fix option validation for log-drivers without it
2015-07-24 09:57:36 -07:00
Alexander Morozov
d68c55bc72
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 >
2015-07-24 09:00:53 -07:00
Shijiang Wei
9f7698a637
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 >
2015-07-24 20:44:13 +08:00
Shijiang Wei
ba5e098052
fix the panic caused by resizing a starting exec
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
2015-07-24 20:43:07 +08:00
Dan Walsh
4cb9479ce4
Rename internel field Relabel to Mode
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com > (github: rhatdan)
2015-07-24 07:14:37 -04:00
Lei
e1c5e9b561
Add VxFS magic number, fixes #14847
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-07-24 16:37:56 +08:00
Tibor Vass
96ce3a194a
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 >
2015-07-23 19:44:46 -04:00
Srini Brahmaroutu
17c19f395f
daemon/graphdriver/btrfs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
2015-07-23 22:48:45 +00:00
Vincent Batts
1e40915e9d
Merge pull request #14854 from rhvgoyal/unmount-base
...
docker: Unmount -init layer root before taking a snapshot
2015-07-23 15:17:07 -04:00
Phil Estes
9dcd0cc1ee
Merge pull request #14887 from Microsoft/10662-stupidtypo
...
Windows: Stupid copy/paste error
2015-07-23 14:49:17 -04:00
David Calavera
ac9fc03c74
Merge pull request #14855 from ewindisch/apparmor-unconfined
...
Introduce a dedicated unconfined AA policy
2015-07-23 10:21:51 -07:00
John Howard
cef5cb2dcb
Windows: Stupid copy/paste error
...
Signed-off-by: John Howard <jhoward@microsoft.com >
2015-07-22 19:30:47 -07:00
Brian Goff
d106a2ea2a
Merge pull request #14613 from stefanberger/nohidevols2
...
Do not hide user provided network mounts [v2]
2015-07-22 16:24:22 -04:00
David Calavera
1c6fe58efc
Merge pull request #14442 from cpuguy83/refactor_logdrvier_reader
...
Refactor log driver reader
2015-07-22 11:54:35 -07:00
Brian Goff
19ba7f9e23
Merge pull request #14753 from flavio/zfs-initialization-errors
...
ZFS driver: raise better errors during init
2015-07-22 14:27:46 -04:00
Stefan Berger
6bd389b9db
Do not hide user provided network mounts [v2]
...
Prevent the docker daemon from mounting the created network files over
those provided by the user via -v command line option. This would otherwise
hide the one provide by the user.
The benefit of this is that a user can provide these network files using the
-v command line option and place them in a size-limited filesystem.
Signed-off-by: Stefan Berger <stefanb@us.ibm.com >
2015-07-22 13:44:21 -04:00