Commit Graph

25 Commits

Author SHA1 Message Date
0e20c40e36 Swap "ubuntu-debootstrap" for just "ubuntu"
See https://github.com/docker-library/official-images/pull/982#issuecomment-133207587.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: a5eec723f8509c8fe588e3a57d14d6c9df6aa87b
Component: engine
2015-09-01 14:03:49 -07:00
aa25376ef2 add build deps for selinux-policy/selinux-policy-devel
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 42d8fe610548843376f035e1649444178f8497fb
Component: engine
2015-08-28 17:43:30 -07:00
5b4a0b8a4c cleanup and fix btrfs subvolume recursion deletion
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: bd06432ba32a6cc555de82e08b125992aaec25fb
Component: engine
2015-08-25 13:00:41 -07:00
24242b6544 fedora 20 is EOL remove from rpm builder
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ee1304a35e73049221f8f2c485b5aa2684c1725f
Component: engine
2015-08-21 11:01:18 -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
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
7ec7d6b833 Remove Ubuntu 14.10 (Utopic Unicorn) from build-deb targets
As of July 23, 2015, it is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2015-July/000198.html) and will receive no further updates.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: a83e4e4a3411be7ae461408bb1c99f2f9af1f5ee
Component: engine
2015-07-24 13:21:01 -07:00
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
6e935ab7ff actually update deb dockerfiles
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 1fff0a5cc5503ed2af0fd0b9bf775ebd41917a44
Component: engine
2015-07-22 13:06:04 -07:00
84681c30e3 Merge pull request #14609 from ewindisch/apparmor-policy
Move AppArmor policy to contrib & deb packaging
Upstream-commit: 380959dd68cd56e60a2ea93cd7f26c8d88135483
Component: engine
2015-07-21 08:48:02 -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
9acb0cc0fc Remove reference to CENTOS6 from generate script
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 18ca5d7c0e8582bf4e31a8ca1f5c6a5dbc58d55b
Component: engine
2015-07-21 01:21:33 +02:00
30e998cb02 remove centos6 from rpm builder
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: af5fb9b7d0722783d6ffcc9d36e36e158d1b84b0
Component: engine
2015-07-19 14:30:48 -07: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
68020cd75e Change generate.sh so that the yum command for packages remains generic across distros.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: f18c4f23cc98ba4fd4fb3241571ce31062eda717
Component: engine
2015-07-10 07:34:47 +10:00
414a101271 Add support for building docker-engine RPM on Oracle Linux 7.
Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 0117330ae7da7dc77d27c551fb298d842afc3890
Component: engine
2015-07-08 16:12:19 +10:00
863d4d7ae6 fix rpms
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 76a853de6eee072e4874a64e4c5ffcceacdccbf1
Component: engine
2015-07-06 14:14:26 -07:00
efadb1b4ee Finally add precise/12.04 as a build-deb target
Ubuntu Precise has a number of warts that made it non-trivial to add initially, but I've managed to work through some of them and come up with a working build.  Two important parts to note are that it has neither the `btrfs` nor the `devicemapper` graphdriver backends since `btrfs-tools` and `libdevmapper-dev` in the precise repositories are too ancient for them to even compile.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 98180b89543396c07c1f1ea420554fbcce31c513
Component: engine
2015-05-29 12:55:58 -07:00
0f1265a12c Merge pull request #13539 from tianon/deb-ubuntu-wily
Add Ubuntu Wily (15.10) as a build-deb target
Upstream-commit: f99a96274254a8c861b654c1caf6062b7c23e1de
Component: engine
2015-05-28 11:01:27 -07:00
3817bdd3ec Add Ubuntu Wily (15.10) as a build-deb target
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 38c77ba876b64e9019091a1f089f90d341cd14ba
Component: engine
2015-05-28 01:06:11 -07:00
5a7a988cff Add fedora:22 to our rpm targets
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 96903c837f25679faf67ffbcb9a9050c0cc2519a
Component: engine
2015-05-28 01:01:45 -07:00
52ea26d7d6 Switch verbosity in builder/*/generate.sh so that we get download progress for Go instead of the name of every single file extracted
Also, `curl` is smart enough to see when the consumer of the pipe is going slow that it should slow down the transfer, so this gives a reasonable indication of extraction progress too.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 24d98c14a0ee580018fdfcc465a76fd4a976e40f
Component: engine
2015-05-07 14:15:35 -06:00
0017c3b28a Add rpm for centos-6, centos-7, fedora-20, fedora-21
Signed-off-by: Jessica Frazelle <princess@docker.com>
Upstream-commit: 18beb5561140aaa950f00391a87bb332fb2b6aea
Component: engine
2015-05-05 16:05:30 -07:00
11438fc8b6 Add "debian:stretch" as another build-deb target
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: d317b7c89159f9795fa7eb69504191208b3c0b3f
Component: engine
2015-05-01 15:03:08 -06:00
52a235444a Add "builder-deb" base images for building ".deb" packages properly
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: eee1efcfd6c46dbdc5da02ca12722e399a56bb12
Component: engine
2015-04-06 10:43:36 -06:00