Commit Graph

746 Commits

Author SHA1 Message Date
c4ddbfd5f9 Merge pull request #14545 from Djelibeybi/oraclelinux6-rpm
Updated docker-engine.spec to build on Oracle Linux 6.
Upstream-commit: c6f4c192fe33bd04fb2b624c115d176f17de7a06
Component: engine
2015-07-23 13:29:48 -07:00
f7a16948b8 Do Docker edits so we can use the new distribution code
Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: b874ef8f43754e5c0fe40b90c3533db93491753e
Component: engine
2015-07-23 10:24:46 -07:00
ba54a4bec5 Vendor latest distributions so we can use the new errcode stuff
ping @stevvooe @RichardScothern

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 8b69552b50b0811db077b4bc2583d167e7c8aaec
Component: engine
2015-07-23 10:24:46 -07:00
1b57972b10 Merge pull request #14903 from jfrazelle/fix-experimental-rpm-debs
pass DOCKER_EXPERIMENTAL into build images
Upstream-commit: e5d8fb965815d3037622d74aa8f99e260f6e06a8
Component: engine
2015-07-23 10:05:00 -07:00
81c6019b8c pass DOCKER_EXPERIMENTAL into build images
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 76d6751600fe91424171b886fdd87fb3eb3a1380
Component: engine
2015-07-23 09:42:22 -07:00
70222bd2d9 Merge pull request #14893 from Evalle/14653-fix-sles-issue
Fixing SLES12 issue
Upstream-commit: d44e334a6eab31edf2700bf2ca2246b3cfe976a8
Component: engine
2015-07-23 18:22:38 +02:00
b8bceb1145 fix fedora release
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 8192a9ac6cc5b1e010b20185ccef6aecfed7c405
Component: engine
2015-07-23 09:16:35 -07:00
ab56e0ae0e Fixing SLES12 issue
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: 94119c58a103ef59262052b11b414b8a51299da6
Component: engine
2015-07-23 08:59:23 +02:00
c0b55ed08f Merge pull request #14878 from icecrime/14756_golint_on_ci
Enable validate-lint as part of CI
Upstream-commit: 5fdc10239624aa3b623f46af28bf237b0f33299f
Component: engine
2015-07-22 16:32:29 -07:00
8cd4fb4243 Merge pull request #14638 from jfrazelle/new-repo-install-script
update install script/docs for new apt and yum repos
Upstream-commit: f21819275470b8a3ec6915fa59f386be44371356
Component: engine
2015-07-22 15:25:27 -07:00
c56f8c4097 Enable validate-lint as part of CI
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: bc8b8e03b48bf1ef6ce6b67271948e4a20c2ed31
Component: engine
2015-07-22 15:23:34 -07:00
e804755952 Merge pull request #14862 from vdemeester/validate-lint-all-files
Update validate-lint to lint all go files
Upstream-commit: 3198e76b7758ece76600562d960cb17ad735c7ca
Component: engine
2015-07-22 15:18:02 -07:00
54ba2b1bf3 update install script for new repos
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 451d3f5950b493029000c2554fe3f266ffb007e4
Component: engine
2015-07-22 15:08:19 -07:00
bdf2ee5403 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>
Upstream-commit: fa34f07ec04e22b2e0631cc0656ba569b453d21c
Component: engine
2015-07-22 23:21:18 +02:00
76ec388f40 Merge pull request #14864 from ewindisch/apparmor-engine-policy
Add AppArmor policy for the docker binary
Upstream-commit: a7d84503128720612022d46f5c9c04602cb19f05
Component: engine
2015-07-22 13:56:33 -07:00
3a0a990d94 Merge pull request #14067 from vbatts/vbatts-tar-split
graph: layer tar disassembly and reassembly
Upstream-commit: 1639288b0a686f30f4c73486590b1c93d61b9f28
Component: engine
2015-07-22 12:53:26 -07:00
792828f992 Merge pull request #14628 from estesp/update-docker-py
Update docker-py commit to current master (~1.3.1 release)
Upstream-commit: c328e0c8274ab7b988e8c279f447a1074e3b0631
Component: engine
2015-07-22 12:41:41 -07:00
ec7391b794 Merge pull request #14442 from cpuguy83/refactor_logdrvier_reader
Refactor log driver reader
Upstream-commit: 1c6fe58efc413b606b6b24e42584ca14be2d1ca8
Component: engine
2015-07-22 11:54:35 -07:00
ae18180fac 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>
Upstream-commit: 39dae54a3f40035b1b7e5ca86c53d05dec832ed2
Component: engine
2015-07-22 14:20:50 -04:00
1ec6bf08bd 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)
Upstream-commit: 65fb04228eba7c6d8640bc8de8800ade05efe2f1
Component: engine
2015-07-22 13:17:59 -04:00
596da1de67 Update linted package list
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: b7184f857489bee6b547eb10a3dfefcd3e420767
Component: engine
2015-07-22 08:46:42 -07:00
051476e67d 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>
Upstream-commit: 7fb061832a0ebf197abb41c576887a1d2aca18be
Component: engine
2015-07-22 11:36:10 -04:00
50e8a78638 Merge pull request #14851 from bfirsh/golint-integration-cli
Golint integration-cli
Upstream-commit: 875fffdff886205d096ab348d94b5079885f17fb
Component: engine
2015-07-22 11:28:19 -04:00
6aa4de764e Fix golint warnings for integration-cli
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 6b3c928140193f911b73f87bb8b07f54bba5a63a
Component: engine
2015-07-22 14:03:50 +01:00
e1e5cbd789 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>
Upstream-commit: 0f5c9d301b9b1cca66b3ea0f9dec3b5317d3686d
Component: engine
2015-07-22 10:26:10 +02:00
3abbd3cbb1 Update validate-lint script
Add a set of newly linted packages, and fix the script.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 7f02cc420ab068f129ec24f3c7514a838bddb1ce
Component: engine
2015-07-21 15:02:46 -07:00
0236ca4bfe Merge pull request #13617 from Microsoft/10662-sql
Windows: Statically linkable SQLite3
Upstream-commit: 943bf44686f18e2888a2a9b986d787e6ed728986
Component: engine
2015-07-21 10:12:40 -07:00
8f6577a7cd Merge pull request #14780 from icecrime/14756_add_golint
Add golint to the development toolbox
Upstream-commit: e4f1cf787c50e0f4e97ea5d0aee5a7b4c5b40ff5
Component: engine
2015-07-21 09:50:58 -07:00
f8dc4be64b Windows: Statically linkable SQLite3
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 10bcaca914b32af29d8ce9974c5f5656a2f8cc1d
Component: engine
2015-07-21 09:33:46 -07:00
5bcf01ef67 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>
Upstream-commit: 6cce8d18384a5ae1212e7b0f7b7ac9662a89c8c1
Component: engine
2015-07-21 09:00:36 -07:00
74cf202b4f 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>
Upstream-commit: 80d99236c1ef9d389dbaca73c1a949da16b56b42
Component: engine
2015-07-21 11:05:53 -04:00
aacf99aa55 vendor fsnotify
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d241d2f36c64b24ef40d28afb28934b36cad539b
Component: engine
2015-07-20 22:47:03 -04:00
d9c672b3bd Update libcontainer to v0.0.2
This is fix for proper setup of nested containers cgroups.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f0f261a899acf3c11d01c97e2503ec0ddb200232
Component: engine
2015-07-17 15:05:17 -07:00
8a425b30fb Merge pull request #14693 from LK4D4/update_libcontainer
Update libcontainer
Upstream-commit: 98ed9a55f42f7c86c7c9cddb27f6807e7e77c889
Component: engine
2015-07-17 13:02:04 -07:00
63fd915fb7 Merge pull request #13680 from jfrazelle/new-apt-yum-repos
WIP: new apt yum repos for release scripts
Upstream-commit: 25d9f38852173950a4a4192746a56bef39b24fd9
Component: engine
2015-07-17 12:29:21 -07:00
b8696f7d26 Merge pull request #14685 from Microsoft/10662-revendorhcsshim
Windows: Revendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
Upstream-commit: fb34537a9963b3fc3aa9c74046becbc90a1cba07
Component: engine
2015-07-17 12:31:58 -04:00
d9e652a366 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>
Upstream-commit: c86189d554ba14aa04b6314970d3699e5ddbf4de
Component: engine
2015-07-16 16:02:26 -07:00
8f72c020f5 Update github.com/docker/libnetwork to 2a5cb84758b5115d99d8f82c84845417c6c345a3
This update includes removal of libcontainer dependency.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: b84ceb3d0ac53690f19cfc05f6b0e91e1998aa41
Component: engine
2015-07-16 13:58:38 -07:00
49b7af2492 Windows: Vendor hcsshim@f674a70f1306dbe20b3a516bedd3285d85db60d9
Signed-off-by: John Howard <John.Howard@microsoft.com>
Upstream-commit: 83ad0536c130cbd0705cec27866ff4f770923912
Component: engine
2015-07-16 12:07:20 -07:00
d5bd1836f1 Vendor docker distribution registry client and dependencies
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 745820fec0faba80b1e0df9c236c6181930647db
Component: engine
2015-07-16 13:13:46 -04:00
4ee32ba904 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>
Upstream-commit: c850e97c84abffc71509692ab1accd38408fa51b
Component: engine
2015-07-15 15:54:00 -07:00
fed66f56be Merge pull request #14607 from brahmaroutu/increase_timeout
increase timeout to run tests on slow platforms
Upstream-commit: 23d0676c077d87205ad7b4f90c2dfb90037c12a6
Component: engine
2015-07-13 14:56:17 -07:00
35171e122f Merge pull request #14343 from Pensu/14232-Add-Warning-To-Ubuntu-Script
14232 add warning to ubuntu script
Upstream-commit: 5e331ad41a8c3ada92856a85c2411f80409284fd
Component: engine
2015-07-13 14:38:58 -07:00
14e7c996e2 Increase timeout to run tests on slow platforms
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: b98edced9e16e73b84a1a7fc670d4c3f6d57f3e8
Component: engine
2015-07-13 21:13:17 +00:00
d231ef5cce Merge pull request #14556 from Evalle/14497-fix-install-script
Fix issue with detection logic of Centos in install.sh
Upstream-commit: 655b1d23678f67857a1d39606eebb86799f65f06
Component: engine
2015-07-13 13:47:08 -07:00
7af622bdcb Fix issue with detection logic of Centos in install.sh
Signed-off-by: evalle <shmarnev@gmail.com>
Upstream-commit: 33039aa12939f6be6d8775ca5d9bee7541641053
Component: engine
2015-07-13 20:50:31 +02:00
6ee85e4248 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>
Upstream-commit: 80e90499aafabb27c68a2ddca31339aa125c40ae
Component: engine
2015-07-11 22:37:02 +08:00
13a7ed0799 Updated docker-engine.spec to build on Oracle Linux 6.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 865d3a148875485a3749be83b67ea7449830e6b6
Component: engine
2015-07-11 09:53:00 +10:00
8e13e89b0b Merge pull request #14537 from stevvooe/allow-one-character-repository-names
Allow one character repository names
Upstream-commit: 9264d384244d7334a45c4e3d46c639683993a077
Component: engine
2015-07-10 15:41:53 -07:00
c3450bd95b Windows: Exec driver
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9ae9d4c87af8b04eb80006aca9f760ffdb1052bb
Component: engine
2015-07-10 13:36:56 -07:00