Brian Goff
764aa1a583
Merge pull request #15074 from coolljt0725/14756_enable_golint_2
...
Enable golint in pkg/jsonlog and pkg/jsonmessage part of #14756
2015-08-08 07:14:53 -04:00
Ben Hall
3b28bada0a
Fix install.sh to handle non-zero exit codes when checking lsb_release
...
Signed-off-by: Ben Hall <ben@benhall.me.uk>
2015-08-08 11:44:52 +01:00
Lei Jitang
5220f3b535
Enable golint in pkg/jsonlog and pkg/jsonmessage.
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-08 11:28:22 +08:00
Veres Lajos
5146232723
typofix - https://github.com/vlajos/misspell_fixer
...
Signed-off-by: Veres Lajos <vlajos@gmail.com>
2015-08-07 23:25:49 +01:00
Alexander Morozov
7ac357c795
Merge pull request #15416 from vdemeester/lint-remove-pkgsystemd
...
Remove pkg/systemd from validate-lint
2015-08-07 14:31:12 -07:00
Vincent Demeester
b8559991dc
Remove pkg/systemd from validate-lint
...
Following #15330 , pkg/systemd doesn't exists anymore.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-08-07 22:26:45 +02:00
Srini Brahmaroutu
de3944219f
daemon/graphdriver/overlay/ fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-08-07 18:34:59 +00:00
David Calavera
0a0e9701f7
Merge pull request #14897 from WeiZhang555/golint-api-types
...
fix golint warnings/errors on package api/types/
2015-08-07 10:51:27 -07:00
David Calavera
b1009d1fdd
Merge pull request #14828 from brahmaroutu/lint_graph_tags
...
/graph/tag fix lint errors/warnings
2015-08-07 10:49:26 -07:00
Arnaud Porterie
27fd64c67f
Merge pull request #15392 from Microsoft/js/vendor_ansiterm
...
Update vendored go-ansiterm for Windows console
2015-08-07 09:01:31 -07:00
root
ecf528fcb6
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>
2015-08-06 20:48:02 -07:00
Zhang Wei
3d6617ffe7
fix golint warnings/errors on package api/types/
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-08-07 09:43:43 +08:00
Jessica Frazelle
203776a40c
fix rpm signing so it does not open a tty w question
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-06 16:18:40 -07:00
Jessica Frazelle
aadb3407d3
to not keep old debs for experimental
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-06 14:49:05 -07:00
Alessandro Boch
e35a5ae463
Vendoring libnetwork bd3eecc96f3c05a4acef1bedcf74397bc6850d22
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-08-06 14:23:25 -07:00
Jessica Frazelle
ed248207d7
revert apparmor changes back to how it was in 1.7.1, but keep tests
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-06 12:49:25 -07:00
Qiang Huang
b8a8ac9b58
Use docker daemon for intergation test daemon start
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-06 16:20:57 +08:00
Tibor Vass
8534090476
Merge pull request #15252 from coolljt0725/14765_enable_golint_3
...
Enable golint in pkg/archive
2015-08-05 19:27:48 -04:00
Jessie Frazelle
a8e67849b9
Merge pull request #15001 from fmoliveira/master
...
Adding support for elementary OS distro in install script.
2015-08-05 16:14:47 -07:00
John Howard
ac120567e8
Windows: Workaround for CI
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-08-05 11:20:30 -07:00
Srini Brahmaroutu
d9b261221a
/graph/tag fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-08-05 17:46:41 +00:00
Arnaud Porterie
2c3cd949c8
Merge pull request #15269 from brahmaroutu/lint_daemon_graphdriver_zfs
...
daemon/graphdriver/zfs fix lint errrors/warnings
2015-08-04 18:41:02 -07:00
Arnaud Porterie
7b077c16d6
Merge pull request #15302 from LK4D4/update_libcontainer
...
Update runc to v0.0.3
2015-08-04 18:40:32 -07:00
Filipe Oliveira
f618de1543
Adding support to forked distributions in installer script.
...
Signed-off-by: Filipe Oliveira <contato@fmoliveira.com.br>
2015-08-04 21:33:48 -03:00
Jessica Frazelle
efd47654dd
only sign the files that were changed in the last 2 hours
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-08-04 13:16:57 -07:00
Antonio Murdaca
23dab01ed2
Merge pull request #14840 from HuKeping/golint-pkg-sysinfo
...
Fix golint warning on pkg/sysinfo
2015-08-04 20:57:39 +02:00
Srini Brahmaroutu
e27c904b99
daemon/graphdriver/zfs fix lint errrors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-08-04 18:30:55 +00:00
Alexander Morozov
a4ddf0e362
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>
2015-08-04 10:47:59 -07:00
Lei Jitang
ba332b7d12
Enable golint in pkg/arcive
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-04 09:52:54 +08:00
David Calavera
408cffac94
Include apparmor/docker only when it exists.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-08-03 17:34:04 -07:00
Alessandro Boch
dab0447ae0
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>
2015-08-03 16:37:01 -07:00
Arnaud Porterie
ff3adb135d
Merge pull request #15114 from hqhq/hq_exedriver_win_lint
...
Fix golint warnings for daemon/execdriver/windows
2015-08-03 16:28:47 -07:00
Srini Brahmaroutu
3e7f9c636a
daemon/graphdriver/vfs fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-08-03 17:46:42 +00:00
Arnaud Porterie
67bca8ab8a
Merge pull request #15215 from dmcgowan/notary-update
...
Notary updates
2015-08-03 09:06:09 -07:00
Brian Goff
dce1488ae5
Merge pull request #15013 from coolljt0725/14756_enbale_golint_1
...
Enable golint, part of #14756
2015-08-02 22:14:18 -04:00
Qiang Huang
f9b5eb0cac
Fix golint warnings for daemon/execdriver/windows
...
Addresses: #14756
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-08-03 09:54:02 +08:00
Lei Jitang
27a8f9937e
Enable golint part of #14756
...
pkg/broadcastwriter
pkg/graphdb
pkg/httputils
pkg/ioutils
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-08-03 09:45:05 +08:00
Hu Keping
7390cc5300
Fix golint warning on pkg/sysinfo
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-08-01 18:24:49 +08:00
Derek McGowan
d594c6fcd8
Vendor latest notary
...
Use updated notary to pick up updates from security review
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-31 17:32:35 -07:00
David Calavera
9e9f3aa36b
Merge pull request #15185 from aboch/vnd_lbn_1.8
...
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
2015-07-31 08:58:41 -07:00
Tibor Vass
b48d744b07
Merge pull request #15175 from MHBauer/cliconfig-lint
...
additional lint fix and enable linter for cliconfig package
2015-07-30 23:07:19 -04:00
Tibor Vass
0cce1fb37f
Vendor docker/distribution to 7dc8d4a26b
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-30 21:14:39 -04:00
Alessandro Boch
91274625ba
Vendoring libnetwork 31139cdb513aea5ad1ed08b60d4350a68b4c96db
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2015-07-30 17:28:40 -07:00
Jessica Frazelle
b0af811272
fix regression
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-07-30 16:38:51 -07:00
Jessie Frazelle
5b65284649
Merge pull request #15103 from Djelibeybi/fix14924
...
Seperate lsb_dist detection from dist_version detection
2015-07-30 16:21:35 -07:00
Morgan Bauer
e809919e26
lint fix and enable linter for cliconfig package
...
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-07-30 14:37:37 -07:00
Tibor Vass
2f1a7c903f
Merge pull request #14844 from WeiZhang555/golint-api
...
fix golint errors/warnings of pkg api/
2015-07-30 16:02:06 -04:00
root
cfeab585c0
fix golint errors/warnings of pkg `api/`
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-07-30 09:46:25 +08:00
Qiang Huang
e34f562a77
Add back golint for daemon/execdriver/native
...
It's broken by #15099 Fix it.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-30 08:58:54 +08:00
Jessie Frazelle
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
Tibor Vass
6a274e48dc
Merge pull request #14843 from MHBauer/demonlogger-lint
...
golint fixes for daemon/logger/*
2015-07-29 18:09:46 -04:00
Eric Windisch
0f4e5f7149
Remove container AA profile from packaging
...
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-29 17:47:38 -04:00
Avi Miller
5c6446f335
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>
2015-07-30 07:30:51 +10:00
Srini Brahmaroutu
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
Morgan Bauer
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
Tibor Vass
e77ea5aa7a
Merge pull request #14784 from brahmaroutu/lint_api_client
...
fix golint errors/warnings
2015-07-29 14:04:45 -04:00
David Calavera
1cfae07a6e
Merge pull request #15015 from runcom/14911-fix-install-script-debian81
...
Fix install script to handle debian 8.1 apt repo string
2015-07-29 10:45:50 -07:00
Tibor Vass
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
root
929f2c2f40
api/client fix golint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-29 17:20:54 +00:00
Tibor Vass
2cd058ce4f
Merge pull request #14785 from brahmaroutu/lint_api_server
...
fix golint errors/warnings
2015-07-29 13:09:31 -04:00
Jessica Frazelle
c2c9e99d84
fix linnt
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-07-29 10:05:30 -07:00
Tibor Vass
0c330a7823
Merge pull request #15064 from jfrazelle/14590-fix-sudo
...
sh -c the cat repo for yum
2015-07-29 10:02:27 -04:00
Jessica Frazelle
93d134c61f
sh -c the cat repo for yum
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-28 20:25:26 -07:00
Srini Brahmaroutu
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
Tibor Vass
cc6138d946
Merge pull request #15063 from jfrazelle/only-write-distributions-file-if-dne
...
only write distributions file if dne
2015-07-28 20:45:04 -04:00
root
351f6b8ec0
api/server fix golint errors/warnings.
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-28 22:44:39 +00:00
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
Alexander Morozov
2c162292b7
Merge pull request #14824 from fcantournet/lint_pkg_mflag
...
Fix golint for pkg/mflag
2015-07-28 13:51:09 -07:00
Alexander Morozov
9cfc223cc0
Merge pull request #14818 from MHBauer/volume-lint
...
lint for volume/*
2015-07-28 13:42:18 -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
Morgan Bauer
9af963aba0
lint fixes for volume/*
...
- comments on exported values
- constant string replaced by constant reference
- unexport implementation details of VolumeDriver 'local'
- add fixed packages to linter list
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
2015-07-28 10:40:44 -07:00
John Howard
663d50464e
Windows: Fix vendor-helpers.sh
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-28 10:13:33 -07:00
Félix Cantournet
8e6ad2171a
Fix golint for pkg/mflag
...
Signed-off-by: Félix Cantournet <felix.cantournet@cloudwatt.com>
2015-07-28 15:32:42 +02: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
Qiang Huang
4862d723a4
Add daemon/execdriver/* to validate-lint
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-07-28 08:44:12 +08:00
Jessie Frazelle
33358f80e5
Merge pull request #14838 from Microsoft/10662-ansirewrite
...
Windows: CLI Improvement (TP3)
2015-07-27 17:30:14 -07:00
Jessie Frazelle
f32cab874c
Merge pull request #15034 from aaronlehmann/update-vendored-distribution
...
Update vendored distribution repo to new version
2015-07-27 17:24:35 -07:00
Jessica Frazelle
2eee192366
only write distributions file if dne
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-27 16:26:35 -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
72afd792fd
Merge pull request #15055 from calavera/log_release_steps
...
Log each release step.
2015-07-27 15:03:29 -07:00
David Calavera
776600fabb
Log each release step.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-07-27 14:28:05 -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
David Calavera
0852170e8c
Merge pull request #14923 from Djelibeybi/fix14905
...
Switch to using only the RPM command to determine the distro version.
2015-07-27 12:01:57 -07:00
Antonio Murdaca
98f15cae89
Fix install script to handle debian 8.1 apt repo string
...
Fix #14911
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-27 20:21:29 +02:00
Aaron Lehmann
091dbc1034
Update vendored distribution repo to new version
...
This version includes a fix that avoids checking against specific HTTP
status codes. The previous behavior violated the registry API spec.
Fixes #14975
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2015-07-27 09:37:38 -07:00
root
b061572916
/image - fix lint errors/warnings
...
Addresses #14756
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-27 05:40:57 +00:00
Jessica Frazelle
a2ea8f2ad8
fix deb packaging systemd files
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-25 14:04:39 -07:00
Arnaud Porterie
5bdd4d0ec4
Merge pull request #14966 from mrjana/vendor18
...
Vendoring libnetwork
2015-07-24 17:58:23 -07:00
Jana Radhakrishnan
2ad81da856
Vendoring libnetwork
...
Vendoring libnetwork commit f1c5671f1ee2133055144e566cd8b3a0ae4f0433
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-07-24 17:11:47 -07:00
Jessie Frazelle
e1dea0c485
Merge pull request #14920 from jfrazelle/release-script-updates-for-new-repo
...
warn the script is depreciated
2015-07-24 11:09:35 -07:00
Jessica Frazelle
ff271f5190
warn the script is depreciated
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-24 10:34:41 -07:00
Derek McGowan
f5a4a8da15
Vendor notary
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-24 01:31:50 -07:00
Tibor Vass
84e917b876
Merge pull request #14835 from aaronlehmann/registry-lint-cleanup
...
Improve documentation and golint compliance of registry package
2015-07-24 16:23:23 -04: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
Derek McGowan
82685367d8
Keep license files
...
Currently the vendor script removes directories which do not have imported go packages, however this also ends up removing license files which may be other directories.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-07-23 16:12:21 -07:00
Avi Miller
59e48b3468
Fix typo.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2015-07-24 08:14:06 +10:00
Avi Miller
a43199f143
Switch to using only the RPM command to determine the distro version.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2015-07-24 07:38:28 +10:00
Alexander Morozov
c6f4c192fe
Merge pull request #14545 from Djelibeybi/oraclelinux6-rpm
...
Updated docker-engine.spec to build on Oracle Linux 6.
2015-07-23 13:29:48 -07:00
Doug Davis
b874ef8f43
Do Docker edits so we can use the new distribution code
...
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-23 10:24:46 -07:00
Doug Davis
8b69552b50
Vendor latest distributions so we can use the new errcode stuff
...
ping @stevvooe @RichardScothern
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-07-23 10:24:46 -07:00
Jessie Frazelle
e5d8fb9658
Merge pull request #14903 from jfrazelle/fix-experimental-rpm-debs
...
pass DOCKER_EXPERIMENTAL into build images
2015-07-23 10:05:00 -07:00
Jessica Frazelle
76d6751600
pass DOCKER_EXPERIMENTAL into build images
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-23 09:42:22 -07:00
Sebastiaan van Stijn
d44e334a6e
Merge pull request #14893 from Evalle/14653-fix-sles-issue
...
Fixing SLES12 issue
2015-07-23 18:22:38 +02:00
Jessica Frazelle
8192a9ac6c
fix fedora release
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-23 09:16:35 -07:00
evalle
94119c58a1
Fixing SLES12 issue
...
Signed-off-by: evalle <shmarnev@gmail.com>
2015-07-23 08:59:23 +02:00
Jessie Frazelle
5fdc102396
Merge pull request #14878 from icecrime/14756_golint_on_ci
...
Enable validate-lint as part of CI
2015-07-22 16:32:29 -07:00
Jessie Frazelle
f218192754
Merge pull request #14638 from jfrazelle/new-repo-install-script
...
update install script/docs for new apt and yum repos
2015-07-22 15:25:27 -07:00
Arnaud Porterie
bc8b8e03b4
Enable validate-lint as part of CI
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-22 15:23:34 -07:00
Alexander Morozov
3198e76b77
Merge pull request #14862 from vdemeester/validate-lint-all-files
...
Update validate-lint to lint all go files
2015-07-22 15:18:02 -07:00
Jessica Frazelle
451d3f5950
update install script for new repos
...
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-22 15:08:19 -07:00
Vincent Demeester
fa34f07ec0
Update validate-lint to lint all go files
...
By default, using go with package will only validate the go file for the
current platform (or at last misses file_windows.go for example). This
tries to fix that.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-07-22 23:21:18 +02:00
Jessie Frazelle
a7d8450312
Merge pull request #14864 from ewindisch/apparmor-engine-policy
...
Add AppArmor policy for the docker binary
2015-07-22 13:56:33 -07:00
David Calavera
1639288b0a
Merge pull request #14067 from vbatts/vbatts-tar-split
...
graph: layer tar disassembly and reassembly
2015-07-22 12:53:26 -07:00
Alexander Morozov
c328e0c827
Merge pull request #14628 from estesp/update-docker-py
...
Update docker-py commit to current master (~1.3.1 release)
2015-07-22 12:41:41 -07: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
Eric Windisch
39dae54a3f
Add AppArmor policy for the engine
...
Wraps the engine itself with an AppArmor policy.
This restricts what may be done by applications
we call out to, such as 'xz'.
Significantly, this policy also restricts the policies
to which a container may be spawned into. By default,
users will be able to transition to an unconfined
policy or any policy prefaced with 'docker-'.
Local operators may add new local policies prefaced
with 'docker-' without needing to modify this policy.
Operators choosing to disable privileged containers
will need to modify this policy to remove access
to change_policy to unconfined.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-22 14:20:50 -04:00
Phil Estes
65fb04228e
Update docker-py to current master (~docker-py 1.3.1)
...
The docker-py commit used in the standard `Dockerfile` is from Feb. 2015
and is out of date with the current API level and has fixes for things
like the new docker cli config location and registry v2 changes/API
responses as well.
Also pass "NOT_ON_HOST=true" to docker-py test suite so that tests
relying on direct HOST interaction (versus running in a container) are
skipped.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-07-22 13:17:59 -04:00
Arnaud Porterie
b7184f8574
Update linted package list
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-22 08:46:42 -07:00
Vincent Batts
7fb061832a
vendor: adding tar-split dependency for graph
...
tar-split is a facility to disassemble and reassemble tar archives
Signed-off-by: Vincent Batts <vbatts@redhat.com>
2015-07-22 11:36:10 -04:00
Tibor Vass
875fffdff8
Merge pull request #14851 from bfirsh/golint-integration-cli
...
Golint integration-cli
2015-07-22 11:28:19 -04:00
Ben Firshman
6b3c928140
Fix golint warnings for integration-cli
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-07-22 14:03:50 +01:00
Antonio Murdaca
0f5c9d301b
pkg: mount: golint
...
Fix the following warnings:
pkg/mount/mountinfo.go:5:6: type name will be used as mount.MountInfo by other packages, and that stutters; consider calling this Info
pkg/mount/mountinfo.go:7:2: struct field Id should be ID
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-07-22 10:26:10 +02:00
John Howard
c923774c41
Windows: CLI Improvement
...
The Ansi parser and their associated actions have been decoupled. Now
parsing results in call backs to an interface which performs the
appropriate actions depending on the environment.
This improvement provides a functional Vi experience and the vttest no
longer panics.
This PR replaces docker/docker #13224 with the latest console updates.
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-21 16:38:44 -07:00
Arnaud Porterie
7f02cc420a
Update validate-lint script
...
Add a set of newly linted packages, and fix the script.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-21 15:02:46 -07:00
Arnaud Porterie
943bf44686
Merge pull request #13617 from Microsoft/10662-sql
...
Windows: Statically linkable SQLite3
2015-07-21 10:12:40 -07:00
Alexander Morozov
e4f1cf787c
Merge pull request #14780 from icecrime/14756_add_golint
...
Add golint to the development toolbox
2015-07-21 09:50:58 -07:00
John Howard
10bcaca914
Windows: Statically linkable SQLite3
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-21 09:33:46 -07:00
Arnaud Porterie
6cce8d1838
Add golint to the development toolbox
...
Add golint to the Dockerfile, and a `validate-lint` task to the
Makefile. Currently, the linter will process a harcoded list of packages
that will expand as we fix more warnings. Eventually, the linter should
process all subpackages of the repo (excluding vendored code).
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-07-21 09:00:36 -07:00
Eric Windisch
80d99236c1
Move AppArmor policy to contrib & deb packaging
...
The automatic installation of AppArmor policies prevents the
management of custom, site-specific apparmor policies for the
default container profile. Furthermore, this change will allow
a future policy for the engine itself to be written without demanding
the engine be able to arbitrarily create and manage AppArmor policies.
- Add deb package suggests for apparmor.
- Ubuntu postinst use aa-status & fix policy path
- Add the policies to the debian packages.
- Add apparmor tests for writing proc files
Additional restrictions against modifying files in proc
are enforced by AppArmor. Ensure that AppArmor is preventing
access to these files, not simply Docker's configuration of proc.
- Remove /proc/k?mem from AA policy
The path to mem and kmem are in /dev, not /proc
and cannot be restricted successfully through AppArmor.
The device cgroup will need to be sufficient here.
- Load contrib/apparmor during integration tests
Note that this is somewhat dirty because we
cannot restore the host to its original configuration.
However, it should be noted that prior to this patch
series, the Docker daemon itself was loading apparmor
policy from within the tests, so this is no dirtier or
uglier than the status-quo.
Signed-off-by: Eric Windisch <eric@windisch.us>
2015-07-21 11:05:53 -04:00
Brian Goff
d241d2f36c
vendor fsnotify
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-07-20 22:47:03 -04:00
Alexander Morozov
f0f261a899
Update libcontainer to v0.0.2
...
This is fix for proper setup of nested containers cgroups.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-17 15:05:17 -07:00
Arnaud Porterie
98ed9a55f4
Merge pull request #14693 from LK4D4/update_libcontainer
...
Update libcontainer
2015-07-17 13:02:04 -07:00
David Calavera
25d9f38852
Merge pull request #13680 from jfrazelle/new-apt-yum-repos
...
WIP: new apt yum repos for release scripts
2015-07-17 12:29:21 -07:00
Brian Goff
fb34537a99
Merge pull request #14685 from Microsoft/10662-revendorhcsshim
...
Windows: Revendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
2015-07-17 12:31:58 -04:00
Alexander Morozov
c86189d554
Update libcontainer
...
Replaced github.com/docker/libcontainer with
github.com/opencontainers/runc/libcontaier.
Also I moved AppArmor profile generation to docker.
Main idea of this update is to fix mounting cgroups inside containers.
After updating docker on CI we can even remove dind.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-16 16:02:26 -07:00
Alexander Morozov
b84ceb3d0a
Update github.com/docker/libnetwork to 2a5cb84758b5115d99d8f82c84845417c6c345a3
...
This update includes removal of libcontainer dependency.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-07-16 13:58:38 -07:00
John Howard
83ad0536c1
Windows: Vendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
...
Signed-off-by: John Howard <John.Howard@microsoft.com>
2015-07-16 12:07:20 -07:00
Tibor Vass
745820fec0
Vendor docker distribution registry client and dependencies
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-07-16 13:13:46 -04:00
Jessica Frazelle
c850e97c84
Add release-deb & release-rpm scripts.
...
These will create the apt & yum repos for the deb/rpms generated by build-deb
and build-rpm.
Adds sign-repo script which signs the repo metadata with a gpg key.
Signed-off-by: Jessica Frazelle <princess@docker.com>
2015-07-15 15:54:00 -07:00
Arnaud Porterie
23d0676c07
Merge pull request #14607 from brahmaroutu/increase_timeout
...
increase timeout to run tests on slow platforms
2015-07-13 14:56:17 -07:00
Jessie Frazelle
5e331ad41a
Merge pull request #14343 from Pensu/14232-Add-Warning-To-Ubuntu-Script
...
14232 add warning to ubuntu script
2015-07-13 14:38:58 -07:00
root
b98edced9e
Increase timeout to run tests on slow platforms
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-07-13 21:13:17 +00:00
Jessie Frazelle
655b1d2367
Merge pull request #14556 from Evalle/14497-fix-install-script
...
Fix issue with detection logic of Centos in install.sh
2015-07-13 13:47:08 -07:00
evalle
33039aa129
Fix issue with detection logic of Centos in install.sh
...
Signed-off-by: evalle <shmarnev@gmail.com>
2015-07-13 20:50:31 +02:00
Penghan Wang
80e90499aa
Fix failure on adding source list for ubuntu
...
For hybrid cloud, some ubuntu vm images doesn't have the directory
`/etc/apt/sources.list.d` which cause failure on creating
`/etc/apt/sources.list.d/docker.list`.
To fix this issue, create this directory first (if it doesn't exist).
Signed-off-by: Penghan Wang <ph.wang@daocloud.io>
2015-07-11 22:37:02 +08:00
Avi Miller
865d3a1488
Updated docker-engine.spec to build on Oracle Linux 6.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com>
2015-07-11 09:53:00 +10:00
Jessie Frazelle
9264d38424
Merge pull request #14537 from stevvooe/allow-one-character-repository-names
...
Allow one character repository names
2015-07-10 15:41:53 -07:00
John Howard
9ae9d4c87a
Windows: Exec driver
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-07-10 13:36:56 -07:00
Stephen J Day
bfd5202c17
Update docker/distribution dependency
...
Signed-off-by: Stephen J Day <stephen.day@docker.com>
2015-07-10 14:05:38 -06:00