Commit Graph

831 Commits

Author SHA1 Message Date
3c26a4792f Update vendored go-ansiterm for Windows console
This update fixes Windows client console bugs and increases VT100
compatibility. With this change, nano and emacs become usable, and bash
works better.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: ecf528fcb6d236eae9b1e187152c774393c199fe
Component: engine
2015-08-06 20:48:02 -07:00
658ec62413 Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e35a5ae463507debc25fc372622cf7b0b27b6d36
Component: engine
2015-08-06 14:23:25 -07:00
e46c794117 revert apparmor changes back to how it was in 1.7.1, but keep tests
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ed248207d74ac59fb190be31dee96c6a8cef68da
Component: engine
2015-08-06 12:49:25 -07:00
9733f459f8 Use docker daemon for intergation test daemon start
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: b8a8ac9b58404d04a5483de4ea75bf2de3dd5fe1
Component: engine
2015-08-06 16:20:57 +08:00
9d9a4fd0c0 Merge pull request #15252 from coolljt0725/14765_enable_golint_3
Enable golint in pkg/archive
Upstream-commit: 8534090476b6eae66f1eca81e8bc0e0c61ed7197
Component: engine
2015-08-05 19:27:48 -04:00
245054e124 Merge pull request #15001 from fmoliveira/master
Adding support for elementary OS distro in install script.
Upstream-commit: a8e67849b98e14ac11e2114ba477e239a617be05
Component: engine
2015-08-05 16:14:47 -07:00
9416fd6ce9 Windows: Workaround for CI
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: ac120567e8015a6a98f0aa7ac71f3ce2d5f36031
Component: engine
2015-08-05 11:20:30 -07:00
a1cfc26eb3 Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs
daemon/graphdriver/zfs fix lint errrors/warnings
Upstream-commit: 2c3cd949c8db8f8bacccbd79c3f5650c8b32cabc
Component: engine
2015-08-04 18:41:02 -07:00
ff1d8010b3 Merge pull request #15302 from LK4D4/update_libcontainer
Update runc to v0.0.3
Upstream-commit: 7b077c16d6f657309b48b05b941d3b09a705c827
Component: engine
2015-08-04 18:40:32 -07:00
57bb897892 Adding support to forked distributions in installer script.
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br>
Upstream-commit: f618de15436941c91cc1b82a56518a4e338c7b76
Component: engine
2015-08-04 21:33:48 -03:00
40a95ce695 only sign the files that were changed in the last 2 hours
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: efd47654dd923577b6694f8ef3dddb3ac3b51816
Component: engine
2015-08-04 13:16:57 -07:00
f031716448 Merge pull request #14840 from HuKeping/golint-pkg-sysinfo
Fix golint warning on pkg/sysinfo
Upstream-commit: 23dab01ed245c5a5132a2deb7ea26c0a984ec198
Component: engine
2015-08-04 20:57:39 +02:00
cc6eee4f4a daemon/graphdriver/zfs fix lint errrors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: e27c904b99e49e82f8d527e78161118d2b800523
Component: engine
2015-08-04 18:30:55 +00:00
772d6ad7e5 Update runc to v0.0.3
This fixes criu behavior with mounted cgroups.
It includes also update of go-systemd dependecy.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a4ddf0e3624c9e05172d1ad7841f87720a4c9c87
Component: engine
2015-08-04 10:47:59 -07:00
3ba45e7906 Enable golint in pkg/arcive
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: ba332b7d12fba16e8c604728a44986886eeb07d6
Component: engine
2015-08-04 09:52:54 +08:00
78c95b1e80 Include apparmor/docker only when it exists.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 408cffac942f7c3efa3a51bdcfac694298ae0c17
Component: engine
2015-08-03 17:34:04 -07:00
3e038be591 Fix preallocated bridge networks
- Because of a bug, all the statically preallocated
  bridge networks have /24 as network mask.

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: dab0447ae0c6d1355cf4708743973121cd55462a
Component: engine
2015-08-03 16:37:01 -07:00
3700154a99 Merge pull request #15114 from hqhq/hq_exedriver_win_lint
Fix golint warnings for daemon/execdriver/windows
Upstream-commit: ff3adb135deef895e4726a720b8f72d631eb0177
Component: engine
2015-08-03 16:28:47 -07:00
4244c48345 daemon/graphdriver/vfs fix lint errors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 3e7f9c636a4c74610a0da72937e54fb5a8000c25
Component: engine
2015-08-03 17:46:42 +00:00
4cc2a3f443 Merge pull request #15215 from dmcgowan/notary-update
Notary updates
Upstream-commit: 67bca8ab8adf1e99c2be7f9b170a140b4c27ab3d
Component: engine
2015-08-03 09:06:09 -07:00
5947da9f2e Merge pull request #15013 from coolljt0725/14756_enbale_golint_1
Enable golint, part of #14756
Upstream-commit: dce1488ae56df8c4fe8cac4dde1858745f7f8cbf
Component: engine
2015-08-02 22:14:18 -04:00
0711faa61b Fix golint warnings for daemon/execdriver/windows
Addresses: #14756

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: f9b5eb0cacf87b9e1c5b2aaea30c9774cf60897a
Component: engine
2015-08-03 09:54:02 +08:00
e840b8ec78 Enable golint part of #14756
pkg/broadcastwriter
pkg/graphdb
pkg/httputils
pkg/ioutils

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 27a8f9937ece67015d06b219bb8aa5cc4f6b7d32
Component: engine
2015-08-03 09:45:05 +08:00
cd1228889c Fix golint warning on pkg/sysinfo
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 7390cc5300d260a853c68d6eb25493fefaecca43
Component: engine
2015-08-01 18:24:49 +08:00
cb79d90bc2 Vendor latest notary
Use updated notary to pick up updates from security review

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: d594c6fcd8fbe295a87cfc2af70456be4e58c24d
Component: engine
2015-07-31 17:32:35 -07:00
da82af9892 Merge pull request #15185 from aboch/vnd_lbn_1.8
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
Upstream-commit: 9e9f3aa36b5286556c8f99557d8bcc66946598d3
Component: engine
2015-07-31 08:58:41 -07:00
6d44ed4263 Merge pull request #15175 from MHBauer/cliconfig-lint
additional lint fix and enable linter for cliconfig package
Upstream-commit: b48d744b07c5894a7c958f99320ea8a8b608308a
Component: engine
2015-07-30 23:07:19 -04:00
36d21e417b Vendor docker/distribution to 7dc8d4a26b689bd4892f2f2322dbce0b7119d686
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 0cce1fb37ffbcb209826fdc98c3148fc5b1e2abd
Component: engine
2015-07-30 21:14:39 -04:00
3f5b1423ad Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 91274625ba43b5d059ac239bd3ca53006158b7a7
Component: engine
2015-07-30 17:28:40 -07:00
d1ebdf9030 fix regression
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b0af811272c7cf9d7694ab5a21ded776a46a7d7a
Component: engine
2015-07-30 16:38:51 -07:00
1c2351b5fa Merge pull request #15103 from Djelibeybi/fix14924
Seperate lsb_dist detection from dist_version detection
Upstream-commit: 5b65284649c6cb614a40d6112096ac28a3488e75
Component: engine
2015-07-30 16:21:35 -07:00
58be23597e lint fix and enable linter for cliconfig package
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: e809919e2645bc21f7b42fa97134065707f2d15f
Component: engine
2015-07-30 14:37:37 -07:00
c7e78a7a31 Merge pull request #14844 from WeiZhang555/golint-api
fix golint errors/warnings of pkg api/
Upstream-commit: 2f1a7c903f163b3d85c96683971aaad4a24585d7
Component: engine
2015-07-30 16:02:06 -04:00
cebd8dac4d fix golint errors/warnings of pkg api/
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: cfeab585c0e831ef073c689c065a52b84ae08761
Component: engine
2015-07-30 09:46:25 +08:00
639fd1d44b Add back golint for daemon/execdriver/native
It's broken by #15099 Fix it.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: e34f562a77276516b81756e9ea620a1625c49093
Component: engine
2015-07-30 08:58:54 +08:00
c5fec26f40 Merge pull request #15138 from ewindisch/apparmor-fix-test-plus-unconfined
Fix the proc integration test & include missing AA profile
Upstream-commit: 2ae174e491a366c4663b4f6ecee83cd6f64bcc3f
Component: engine
2015-07-29 15:32:13 -07:00
22c6edd13b Merge pull request #14843 from MHBauer/demonlogger-lint
golint fixes for daemon/logger/*
Upstream-commit: 6a274e48dc645f0ea02ae8bf59ce08ff22cfd663
Component: engine
2015-07-29 18:09:46 -04:00
c5f3d6fd5b Remove container AA profile from packaging
Signed-off-by: Eric Windisch <eric@windisch.us>
Upstream-commit: 0f4e5f71491abc0e7c4f4effe1f3c59aa9bf6a33
Component: engine
2015-07-29 17:47:38 -04:00
c53f933e8d Fix for #14924. Seperates lsb_dist detection from dist_version detection
so that the latter can be distro specific.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 5c6446f335a9f9010cabe93104f6feced0166dd8
Component: engine
2015-07-30 07:30:51 +10:00
e1b2148585 /graph fix lin errors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 1d6e44311916b26e1cd128e96ea9f0e5ede5f9df
Component: engine
2015-07-29 20:59:36 +00:00
90287c6171 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>
Upstream-commit: ccbe539e86dfbb8749c09763ddfd73bf10ac57cc
Component: engine
2015-07-29 13:09:39 -07:00
86cfb16a84 Merge pull request #14784 from brahmaroutu/lint_api_client
fix golint errors/warnings
Upstream-commit: e77ea5aa7aee20bc29b65efd92e9960b58db3435
Component: engine
2015-07-29 14:04:45 -04:00
61d8e3e275 Merge pull request #15015 from runcom/14911-fix-install-script-debian81
Fix install script to handle debian 8.1 apt repo string
Upstream-commit: 1cfae07a6e04cc0158142afa37a1a758f83aeecb
Component: engine
2015-07-29 10:45:50 -07: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
36ee6380c9 api/client fix golint errors/warnings
Addresses #14756

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 929f2c2f4074e66bb1e942a338e4d2a815096d45
Component: engine
2015-07-29 17:20:54 +00:00
4c4cfdbd2e Merge pull request #14785 from brahmaroutu/lint_api_server
fix golint errors/warnings
Upstream-commit: 2cd058ce4f022f98be22c780a703d93b51722d19
Component: engine
2015-07-29 13:09:31 -04:00
ec5ef287b8 fix linnt
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: c2c9e99d845a412717513d91c1886b2da5c4f9a9
Component: engine
2015-07-29 10:05:30 -07:00
d50c9449dd Merge pull request #15064 from jfrazelle/14590-fix-sudo
sh -c the cat repo for yum
Upstream-commit: 0c330a7823443ebffd9bae47dc5e4e8df1c5fa70
Component: engine
2015-07-29 10:02:27 -04:00
5876286f87 sh -c the cat repo for yum
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 93d134c61f90a366065b28c2b48021361c00cd76
Component: engine
2015-07-28 20:25:26 -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