Commit Graph

854 Commits

Author SHA1 Message Date
427a5313d8 Merge pull request #15183 from jfrazelle/test-install-script
add file to test install script
Upstream-commit: e82358586d62413c598b81df4c2d9af6045ee53d
Component: engine
2015-08-12 09:49:35 -07:00
090c29f3a8 Merge pull request #15377 from jfrazelle/do-not-keep-old-experimental-debs
do not keep old debs for experimental
Upstream-commit: 13873e6841367dc5d00f641e9a5eac967e7aa203
Component: engine
2015-08-11 16:35:55 -07:00
313dca405d fix oracle linux install
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0eade329dc1b75424dfc71a110d1848498b3d153
Component: engine
2015-08-11 16:33:14 -07:00
988c46b306 add file to test install script
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 83416f68deb6ff94ffa1803b90bb9a9cd4e2ca78
Component: engine
2015-08-11 16:31:58 -07:00
c0287afaeb minor cosmetic change to client output on pull
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8bd632276069d7057406aa6ea151296cf5bbbd2f
Component: engine
2015-08-10 21:54:03 -07:00
817f075302 make windows cross compile static daemon work
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: e62745922feb580b3687571bb4c52db3de5157f7
Component: engine
2015-08-10 16:16:58 -07:00
2db4446de9 Merge pull request #15445 from hqhq/hq_use_docker_daemon
Change all docker -d to docker daemon
Upstream-commit: 51249a3aa09b8e1ade07ed6be0029a190b978b05
Component: engine
2015-08-10 10:35:19 -04:00
b49d2589a1 Merge pull request #15426 from BenHall/15425-set-e-install-script-fix
Fix install.sh to handle non-zero exit codes when checking lsb_release
Upstream-commit: ba0eba69603e3a000d269c6363a58c5107862193
Component: engine
2015-08-10 08:47:19 -05:00
8120b4d8fe Change all docker -d to docker daemon
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 81cc8ebc93c20537d5fab4c016a3774f58b3e483
Component: engine
2015-08-10 20:48:08 +08:00
89ab9698f7 Merge pull request #15074 from coolljt0725/14756_enable_golint_2
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
Upstream-commit: 764aa1a583ba6f73a32af1ba064401967cb716b6
Component: engine
2015-08-08 07:14:53 -04:00
724e66acf4 Fix install.sh to handle non-zero exit codes when checking lsb_release
Signed-off-by: Ben Hall <ben@benhall.me.uk>
Upstream-commit: 3b28bada0af08993508af8658d56c15b17ec6fb7
Component: engine
2015-08-08 11:44:52 +01:00
305eb65786 Enable golint in pkg/jsonlog and pkg/jsonmessage.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5220f3b535ce38edbff616bc78f1eb92148d310e
Component: engine
2015-08-08 11:28:22 +08:00
2c6e673ce7 typofix - https://github.com/vlajos/misspell_fixer
Signed-off-by: Veres Lajos <vlajos@gmail.com>
Upstream-commit: 514623272398574c8fd7ef3fe42c5b2ae161349a
Component: engine
2015-08-07 23:25:49 +01:00
130868c480 Merge pull request #15416 from vdemeester/lint-remove-pkgsystemd
Remove pkg/systemd from validate-lint
Upstream-commit: 7ac357c7954283b29276044cb4225551c0f4d8d3
Component: engine
2015-08-07 14:31:12 -07:00
8af88451b7 Remove pkg/systemd from validate-lint
Following #15330, pkg/systemd doesn't exists anymore.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: b8559991dcc97c3defee89ed70c3b616152ef583
Component: engine
2015-08-07 22:26:45 +02:00
d20356ab98 daemon/graphdriver/overlay/ fix lint errors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: de3944219f23ffe3ac83add4c1f2b0ec0a4cd5c0
Component: engine
2015-08-07 18:34:59 +00:00
c8706706f4 Merge pull request #14897 from WeiZhang555/golint-api-types
fix golint warnings/errors on package api/types/
Upstream-commit: 0a0e9701f7bbe58e75eff9d1934fde0a5038ee9c
Component: engine
2015-08-07 10:51:27 -07:00
8778d71536 Merge pull request #14828 from brahmaroutu/lint_graph_tags
/graph/tag fix lint errors/warnings
Upstream-commit: b1009d1fdd551a57e7c266d9cc8122ed3f80aa2c
Component: engine
2015-08-07 10:49:26 -07:00
e16f2386a3 Merge pull request #15392 from Microsoft/js/vendor_ansiterm
Update vendored go-ansiterm for Windows console
Upstream-commit: 27fd64c67f2db82917db7a5248fc20309295bb13
Component: engine
2015-08-07 09:01:31 -07:00
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
502a6d4faf fix golint warnings/errors on package api/types/
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 3d6617ffe7d9242107ac09eab4f2d8ce87acb95c
Component: engine
2015-08-07 09:43:43 +08:00
927b6c6e4b fix rpm signing so it does not open a tty w question
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 203776a40c2c692375b5618a3b392cb119879f04
Component: engine
2015-08-06 16:18:40 -07:00
2cced695e9 to not keep old debs for experimental
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: aadb3407d3f524625b7d5db754f66949c82dc5ad
Component: engine
2015-08-06 14:49:05 -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
65b70bf683 /graph/tag fix lint errors/warnings
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: d9b261221aa6ada89a2dac3e535cb1d48be37cad
Component: engine
2015-08-05 17:46:41 +00: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