Commit Graph

80 Commits

Author SHA1 Message Date
cc7e4cafad Add rpm builder for VMware Photon OS
Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
Upstream-commit: 6c7e1863d552afe156eb430575cbc0e1057a77e1
Component: engine
2016-08-30 17:05:32 -07:00
0f0bfaaffb Bump go to 1.7
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 12e2c2687e5c1f47287aa3668c8853ee8b5d6706
Component: engine
2016-08-21 19:04:15 +02:00
c49a123086 ppc64le: add support for building docker debs for xenial
This PR adds the ability to make docker debs for xenial on power

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 64881dc331f1f0ff861eb82bb05eef63d6693a67
Component: engine
2016-08-18 22:25:14 -04:00
6b981f5f41 Fix build deb for ARMv6
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
Upstream-commit: 5907e4a872c7d586ab594972fa24bf4fa4e83207
Component: engine
2016-08-13 00:40:29 +02:00
b9565b1842 bump Go to 1.6.3
following the announcement;
https://groups.google.com/forum/m/#!topic/golang-announce/7JTsd70ZAT0

> [security] Go 1.6.3 and Go 1.7rc2 pre-announcement
>
> Hello gophers,
> We plan to issue Go 1.6.3 and Go 1.7rc2 on Monday July 18 at approximately 2am UTC.
> These are minor release to fix a security issue.
>
> Following our policy at https://golang.org/security, this is the pre-announcement of those releases.
>
> Because we are so late in the release cycle for Go 1.7, we will not issue a minor release of Go 1.5.
> Additionally, we plan to issue Go 1.7rc3 later next week, which will include any changes between 1.7rc1 and tip.
>
> Cheers,
> Chris on behalf of the Go team

**Note:**
the man/Dockerfile is not yet updated, because
the official image for Go 1.6.2 has not yet
been updated.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 589bafddf391cbf6aff8b22044266dc819cdcaeb
Component: engine
2016-07-18 23:15:03 +02:00
ef5445e5b7 contrib: builder: rpm: add Fedora 24
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 0b83f27328eab843d79c94dd603f52e8fb9c013b
Component: engine
2016-06-23 12:31:11 +02:00
df899a58be Merge pull request #22152 from flixr/armhf-ubuntu-trusty-deb
build armhf deb for ubuntu-trusty
Upstream-commit: aaef5297bfb2a410bdaea2bf6a4fa17951796daf
Component: engine
2016-06-12 16:27:54 -04:00
68a32ad8b7 build armhf deb for ubuntu-trusty
Signed-off-by: Felix Ruess <felix.ruess@roboception.de>
Upstream-commit: a229e1f4b74a038b604c4d60772db74d4dae3130
Component: engine
2016-06-09 14:06:19 +02:00
1ca96c8cd2 Update golang 1.6.2
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: d59458c12d76d732e0ab564ea0e769323af6d3d6
Component: engine
2016-05-27 23:00:05 +02:00
0aa032d270 Build deb for raspbian-jessie
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Upstream-commit: 46c61497a056042397fed7db65059feb68d28e16
Component: engine
2016-05-27 22:54:50 +02:00
dd2618f69b Update golang 1.6.2 for ARM
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: f32ccb080ac382a386cbe33ed1d11048474206c5
Component: engine
2016-05-25 11:58:48 +02:00
7fe655caac Upgrade to golang 1.6.2
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 40b21745cc14628fc5336fbacddf092667a70c65
Component: engine
2016-05-25 11:58:48 +02:00
8d0748f1ff Allow changing wheezy deb builder backport mirror
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 6a033e617f6c948788c580b26c6567d7d9ef359e
Component: engine
2016-05-09 09:10:30 -07:00
991c954a45 Fix rpm generation on oraclelinux-6
The uek kernel needs to be install first in order to get the correct
btrfs tools version.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 05dec0b032a6bde63a803141e2ccd48daa1a494e
Component: engine
2016-05-05 12:12:49 -07:00
a625365923 Merge pull request #22370 from mlaventure/fix-experimental-builder
Allow specifying the apt mirror to use when generating deb packages
Upstream-commit: 717842fbdeeec3e3bd56525e998a2ffcb087b4d0
Component: engine
2016-04-28 16:26:29 -04:00
ebb9e8de8c Allow specifying the apt mirror to use when generating deb packages
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: d0a65a03e9f789b73956e2d30447a385d6531dfe
Component: engine
2016-04-28 13:05:34 -07:00
ad49d67f49 centos:7/OL:7 now includes libseccomp 2.2.1
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1521a41fc578958d0238f95b43c49edab9a65a47
Component: engine
2016-04-26 20:48:26 -04:00
1b58e69a36 add pkcs11 build tag to deb and rpm builds
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
Upstream-commit: 829d1883dccc8000a6781bc074fd16afe2833841
Component: engine
2016-04-13 17:55:50 -07:00
d823c21aaa Bump Go version to 1.5.4/1.6.1 (security fix) (#21978)
Go 1.6.1 is for ppc64le only.

https://groups.google.com/forum/#!msg/golang-announce/9eqIHqaWvck/kXsfO0ogLAAJ

Dockerfile.armhf cannot currently be updated.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 7268eb97bc208f4cdf7c9119da0cfa2c9ed558a4
Component: engine
2016-04-13 11:22:48 -07:00
e7eeee7715 Downgrade to Go 1.5.3.
To not hit the issue with the request Host header.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3e0bd74a3d2647fa8c7783f4a053ad225746e6eb
Component: engine
2016-03-24 19:15:10 -04:00
7e9cc10806 Packaging changes required for new containerd binaries
These are the changes required due to the new binaries that containerd introduced.
The rpm, and deb packages now include 5 binaries.

docker, containerd, containerd-shim, ctr, and runc

The tar files also include all 5 binaries.

Signed-off-by: Ken Cochrane <KenCochrane@gmail.com>
Upstream-commit: bb66d7144f7d0a617f5985486ae36bbbaa5461ba
Component: engine
2016-03-24 16:25:33 -04:00
fe8a0bc1b8 fix deb generate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: f5afe02b695c7c286f035087cb645efcf69ffcd3
Component: engine
2016-02-05 15:31:12 -08:00
49068064e4 dont try to install journald driver on wheezy
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 6c2b014d5e3d4a6eb37df0edc1fc552b05406ede
Component: engine
2016-02-04 16:22:23 +01:00
455910471d fix opensuse rpm
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 1cbd77262987d821a675f51da1213c7bf171e05b
Component: engine
2016-02-03 10:34:17 -08:00
959dbfed52 Cleanup libseccomp.a hack since dockerinit is gone
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a605d641d76609c886ff454219a75578c95e8eb1
Component: engine
2016-01-30 16:17:13 +08:00
9512e36135 add support for building first ARM debian package
Signed-off-by: Govinda Fichtner <govinda.fichtner@googlemail.com>
Upstream-commit: 7b31ed432ee2fa95938d64dc76c982e52cd00330
Component: engine
2016-01-29 00:21:17 +01:00
4edafc3bc1 *: purge dockerinit from source code
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
2016-01-26 23:47:02 +11:00
09854fa6a5 Change the way we install from backports in the deb builder (to force deps too)
Also, add "libsystemd-journal-dev" to the explicit list (which is what prompted the change in how we install).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 722fac7a730e16c65ccd60ce5d1d7924dd6520bf
Component: engine
2016-01-25 14:49:05 -08:00
a0bfe06203 Merge pull request #19598 from tianon/pkg-config
Add pkg-config to our Debian build environment
Upstream-commit: b3af1d52427384db5a841678d29935654c904f5f
Component: engine
2016-01-22 17:33:43 -08:00
6c723b5a0d Add pkg-config to our RPM build environment
While hack/make.sh checks for systemd headers using pkg-config, we
forgot to ensure that they were there in the images that we use for
building binaries for RPM-based distributions.  Add the right packages
to the generate.sh that we use for them, and update the copies of the
generated files that we carry in the source tree.

Notes: Fedora, CentOS, and Oracle Linux put the pkg-config command in
the "pkgconfig" package, while OpenSUSE calls the package "pkg-config".
The systemd-devel package, like systemd, is not in Oracle Linux 6.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
Upstream-commit: 7d4f52ec6bd8058cc55860cf5ff1a81a3fbe8f9d
Component: engine
2016-01-22 18:46:07 -05:00
885cd6977a Add pkg-config to our Debian build environment
This is used in `hack/make.sh` for detecting various dependencies such as `libsystemd-journal` -- without this, our packages don't support pulling logs back out of journald. 😢

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 9ac671f79e46ac3e05cc9531739d8f39d8da34c7
Component: engine
2016-01-22 15:22:04 -08:00
bc39a3fed6 Merge pull request #19377 from jfrazelle/cleanup-build-rpm-deb
Cleanup build rpm deb
Upstream-commit: 5537a92e450ea56e2002f83ff50bb70fdb2cc25e
Component: engine
2016-01-20 23:58:33 -08:00
2a3e0a22a4 add a way to only build requested pkgs
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 0bff2515f74fc6f0be9f019cc8b0f08b50e36228
Component: engine
2016-01-19 17:47:27 -08:00
d8a8275332 Merge pull request #19169 from Djelibeybi/fix-ol6-build
Restoring the RPM build process for Oracle Linux 6
Upstream-commit: b69243e951a9845c3bd3e718452865c2753b7a0c
Component: engine
2016-01-15 16:56:11 -08:00
65d4b1bb7a fix selinux version for contrib/builder generation
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 3466e5c91111c43fb4a9850d3dc1ba417be478a6
Component: engine
2016-01-15 15:29:43 -08:00
2e1c787d5f Bump Go to version 1.5.3
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9560d941142b0bd17b0aa51e4d9bfe22354732ec
Component: engine
2016-01-13 17:23:46 -05:00
3293844ab5 Restoring the RPM build process for Oracle Linux 6 and updating the docker-engine.spec
file to require the Unbreakable Enterprise Kernel Release 4 on both Oracle Linux 6
and Oracle Linux 7.

The UEK R4 provides the required kernel functionality for VxLAN support
required by Docker 1.9 and user namespace support required for 1.10+.

The build of Docker on Oracle Linux 6 requires some manipulation of the build
environment so that the CGO compiler uses the UEK R4 headers instead of the old
default kernel headers.

Signed-off-by: Avi Miller <avi.miller@oracle.com>
Upstream-commit: 28f52bd06a24705bd6958ac505b6b6f36e877547
Component: engine
2016-01-08 08:09:47 +11:00
baf6d036eb fix libseccomp where version < 2.2.1
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ae54e39c80b8cc071143bfcb99bf80e3b0a0ec93
Component: engine
2015-12-28 21:30:49 -08:00
d095d83f03 Remove Ubuntu 15.04 (Vivid) from DEB build as it will be EOL
Ubuntu 15.04 (Vivid) will be EOL'd in January,
so we should remove it from our builds in the
Docker 1.10 release.

For information about the EOL data, see:
https://wiki.ubuntu.com/Releases

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 325b1f35ae7419cd7454800c8eda4dfaca1d9a77
Component: engine
2015-12-20 16:00:53 +01:00
8d399a7fd9 Remove Fedora 21 from RPM build as it is EOL
Fedora 21 is EOL'd as of December 1st, 2015.

Announcement:
https://lists.fedoraproject.org/pipermail/announce/2015-November/003296.html

Fedora 21 will reach end of life on 2015-12-01, and no further updates
will be pushed out after that time. Additionally, with the recent
release of Fedora 23, no new packages will be added to the Fedora 21
collection.

Please see https://fedoraproject.org/wiki/DNF_system_upgrade for more
information on upgrading from Fedora 21 to a newer release.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: a08c955e30d6790d1f69483d5e33e2a81a08b100
Component: engine
2015-12-20 00:42:17 +01:00
77ce2d3289 remove oracle linux 6 for time being
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 7ddf4214a666c3182acc031cec02fc99c877e98b
Component: engine
2015-12-15 16:34:41 -08:00
ab6c9709f6 Merge pull request #17989 from jfrazelle/initial-seccomp-support
Phase 1: Initial seccomp support
Upstream-commit: 87a614ed55f2a9076d8150f846b0d27fe60095a8
Component: engine
2015-12-05 08:33:58 -08:00
1c9031a8a0 update go version
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b7b707af2e617d62343391c6c82b984ff41b08e2
Component: engine
2015-12-03 16:37:13 -08:00
6ac4c29a4e hacky workaround for dockerinit static binary needing libseccomp.a for debs and rpms
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: ec6d3392f1efc49d0609370e70a749a00555508c
Component: engine
2015-12-03 16:30:51 -08:00
174151a454 update debs/rpms for seccomp
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 255004ef335d5e6cc4ec0f51ecff676e9d84643b
Component: engine
2015-12-03 16:20:05 -08:00
8d0649a213 correct ltdl for centos
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 41619f4a902927767d149524b45d23ab9569636b
Component: engine
2015-11-14 08:50:58 -08:00
08e6893ada update debs/rpms for pkcs11 yubikey things
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: cf4c3da725e5c923b637a0dbea3d20064286f008
Component: engine
2015-11-13 13:20:53 -08:00
57e4556453 add fedora 23 for all the crazies who already want it
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 45788bb62d6dcdc5b429b5ba10216d2af0402119
Component: engine
2015-11-03 14:01:55 -08:00
5502018bf5 update go version for debs and rpms
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 985fe8857d6670e5a484237a8c8ccdde66a39013
Component: engine
2015-10-29 17:04:38 -07:00
e752bdf012 update dockerfile to use dnf because i hate the warning
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: b8891a32d13724bb992d9e8aca4777a32334371e
Component: engine
2015-10-27 10:25:39 -07:00