Commit graph

78 commits

Author SHA1 Message Date
Justin Cormack
4108d6259a Merge pull request #31193 from docbobo/master-aarch64
Support for debian-jessie on aarch64
2017-03-14 00:45:30 +00:00
Boris Pruessmann
fcadb77b97
seccomp support for debian jessie
Based on jessie-backports.

Signed-off-by: Boris Pruessmann <boris@pruessmann.org>
2017-03-08 20:02:18 +01:00
Boris Pruessmann
2ca57fe0b0
Added support for debian-stretch (aarch64)
Signed-off-by: Boris Pruessmann <boris@pruessmann.org>
2017-03-03 23:09:33 +01:00
Dominik Dingel
7f54153ba8 Add support for s390x ubuntu-yakkety deb
Signed-off-by: Dominik Dingel <dingel@linux.vnet.ibm.com>
2017-02-27 14:52:43 +01:00
Boris Pruessmann
f9543b339d Added debian-jessie for aarch64
Adding debian-jessie as output for running make deb on aarch64. Also
update GO_VERSION to 1.8 to fix issues with incorrect pagesize.-

Signed-off-by: Boris Pruessmann <boris@pruessmann.org>
2017-02-21 07:43:57 +01:00
Tianon Gravi
52379fa76d Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
This is especially important for distributions like NixOS where `/bin/bash` doesn't exist, or for MacOS users who've installed a newer version of Bash than the one that comes with their OS.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2017-02-13 11:01:54 -08:00
unclejack
b6e2703230 Dockerfile*: bump Go to 1.7.5
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
2017-01-27 02:14:36 +02:00
Justin Cormack
f8119bb7a7 Remove sqlite
This drops support for migrations from pre-1.10 Docker versions, which
should be done via an external tool or an intermediate upgrade.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
2017-01-18 12:27:21 +00:00
Christopher Jones
fa17ac2560
[multi-arch] get go version from arch dockerfile
Changes a couple of generate scripts so that the architecture
gets the go version from its own Dockerfile. This should cover a
rare case where the go version might have to be different from
the x86 Dockerfile.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-01-13 16:48:41 -05:00
Christopher Jones
62ab6809bd
[ppc64le] use official go 1.7.4 binaries
go 1.7.4 introduced official go ppc64le binaries, so use those
instead of using older versions of go and building from src.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-12-08 16:18:10 -05:00
Christopher Jones
20e243780e
[project] bump go to go 1.7.4
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-12-07 22:22:39 -05:00
Sebastiaan van Stijn
6e11ca0fdf Merge pull request #28672 from mlaventure/arm-ubuntu-xenial
Add support for armhf ubuntu-xenial deb
2016-11-22 19:57:11 +01:00
Sebastiaan van Stijn
bae61194db Merge pull request #27625 from hqhq/add_deb_support
Add `make deb` support for aarch64
2016-11-22 18:24:58 +01:00
Kenfe-Mickael Laventure
3b3cf87478 Add generate.sh for armhf deb Dockerfiles
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-22 07:12:57 -08:00
Kenfe-Mickael Laventure
b118056241 Add support for armhf ubuntu-yakkety deb
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-11-22 07:09:10 -08:00
Felix Ruess
015e83a8da build debian package for armhf ubuntu-xenial
Signed-off-by: Felix Ruess <felix.ruess@gmail.com>
2016-11-21 12:34:20 +01:00
Qiang Huang
a532ff8cc3 Add make deb support for aarch64
Fixes: #27045

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-11-17 09:38:17 +08:00
Michael Crosby
6440c5d822 Add tini build deps to deb generation
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-11-09 11:12:14 -08:00
Sebastiaan van Stijn
27beb64d46
Add Ubuntu 16.10 Yakkety Yak
Ubuntu 16.10 has been released http://releases.ubuntu.com/yakkety/

Note that this is a short-term release, so will
EOL (and removed again) in 9 months

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2016-11-07 15:14:36 +01:00
Christopher Jones
732d1035d2
switch all go download links to https://golang.org/dl
this switches all go download links to use a redirect,
https://golang.org/dl/ instead of the direct source.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-11-04 09:03:41 -05:00
Brian Goff
d5c3eb0afb Merge pull request #28046 from tophj-ibm/make-debs-1610
[ppc64le] add yakkety yak to 'make deb'
2016-11-03 20:17:36 -04:00
Christopher Jones
da382044d3
[ppc64le] add yakkety yak to 'make deb'
This adds 'make deb' support for yakkety yak on ppc64le

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-11-03 15:59:59 -04:00
Christopher Jones
629e85ad89
[ppc64le] update make deb go download link
Updates the ppc64le `make deb` trusty download link to be
consistent with the other Dockerfiles. Also minor clarification
to how we install go.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-11-03 15:26:28 -04:00
Andrew Hsu
dbe17defd1 sed replace apt mirror with default deb.debian.org for debian distros
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-10-25 13:25:21 -07:00
Sebastiaan van Stijn
6698a66be7 Merge pull request #27327 from flixr/deb_armhf_ubuntu-trusty_buildtags
debian package: update buildtags for armhf ubuntu-trusty
2016-10-20 09:52:43 -07:00
Alexander Morozov
7d8831c091 project: update Go to 1.7.3
List of milestone issues https://github.com/golang/go/issues?q=milestone%3AGo1.7.3

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-10-19 13:55:01 -07:00
Jean-Christophe Berthon
e0c7300e3b builder: Add AppArmor to runc buildtags for armhf
On Raspbian and Debian Jessie for ARMv7 (aka armhf), the builtags for runc
were missing. These buildtags should include 'apparmor' and 'selinux'.

Signed-off-by: Jean-Christophe Berthon <huygens@berthon.eu>
2016-10-16 15:32:31 +00:00
Felix Ruess
63515bc59e builder: update deb armhf ubuntu-trusty buildtags
Signed-off-by: Felix Ruess <felix.ruess@gmail.com>
2016-10-12 20:47:06 +02:00
Kenfe-Mickael Laventure
e9a8105708 Remove Ubuntu 15.10 (Wily Werewolf) from build-deb targets
As of July 28, 2016, it is officially EOL (https://lists.ubuntu.com/archives/ubuntu-announce/2016-July/000210.html) and will receive no further updates.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-10-04 13:01:00 -07:00
Alexander Morozov
1dbf3c65e1 Merge pull request #26920 from tophj-ibm/add-1404-make-debs
ppc64le: add files for supporting 14.04 'make debs'
2016-09-27 07:54:57 -07:00
Christopher Jones
f431211631
Bump remaining Dockerfile go versions to 1.7.1
These weren't updated with the switch to go1.7.1

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-09-26 12:13:39 -04:00
Christopher Jones
9a928e3232
ppc64le: add files for supporting 14.04 'make debs'
This PR adds the necessary files needed in order to make ubuntu 14.04
ppc64le docker debs

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2016-09-26 10:24:55 -04:00
Michael Holzheu
73df9b4e87 s390x: Enable "make deb" for Ubuntu Xenial (16.04)
With this patch and Docker PR 25883 ("Add a Dockerfile for generating
manpages on s390x") "make deb" creates the following packages for s390x:

 # cd bundles/1.13.0-dev/build-deb/
 # find .
   .
   ./ubuntu-xenial
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial.dsc
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.changes
   ./ubuntu-xenial/Dockerfile.build
   ./ubuntu-xenial/docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial.tar.gz
   ./docker.log
   ./test.log

Package "docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb"
could be successfully installed on a s390x Ubuntu system:

 # cat /etc/issue
 Ubuntu 16.04.1 LTS \n \l
 # dpkg -i docker-engine_1.13.0~dev~git20160823.161729.0.2693af4-0~xenial_s390x.deb
 ...
 Installing new version of config file /etc/init.d/docker ...
 Installing new version of config file /etc/init/docker.conf ...
 Processing triggers for systemd (229-4ubuntu7) ...
 Processing triggers for ureadahead (0.100.0-19) ...
 Processing triggers for man-db (2.7.5-1) ...

 # docker version
 Client:
  Version:      1.13.0-dev
  API version:  1.25
  Go version:   go1.7
  Git commit:   2693af4-unsupported
  Built:        Wed Aug 24 11:41:13 2016
  OS/Arch:      linux/s390x

 Server:
 ...

The s390x "generate.sh" is a modified version of "ppc64le/generate.sh".
We removed seccomp for s390x because we need at least libseccomp version
2.3.1 which is not provided by Ubuntu Xenial.

Signed-off-by: Michael Holzheu <holzheu@linux.vnet.ibm.com>
2016-09-12 16:10:36 +02:00
Antonio Murdaca
12e2c2687e
Bump go to 1.7
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-08-21 19:04:15 +02:00
Christopher Jones
64881dc331
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>
2016-08-18 22:25:14 -04:00
Dieter Reuter
5907e4a872 Fix build deb for ARMv6
Signed-off-by: Dieter Reuter <dieter.reuter@me.com>
2016-08-13 00:40:29 +02:00
Sebastiaan van Stijn
589bafddf3
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>
2016-07-18 23:15:03 +02:00
Brian Goff
aaef5297bf Merge pull request #22152 from flixr/armhf-ubuntu-trusty-deb
build armhf deb for ubuntu-trusty
2016-06-12 16:27:54 -04:00
Felix Ruess
a229e1f4b7 build armhf deb for ubuntu-trusty
Signed-off-by: Felix Ruess <felix.ruess@roboception.de>
2016-06-09 14:06:19 +02:00
Stefan Scherer
d59458c12d Update golang 1.6.2
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-05-27 23:00:05 +02:00
Stefan Scherer
46c61497a0 Build deb for raspbian-jessie
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-05-27 22:54:50 +02:00
Stefan Scherer
f32ccb080a Update golang 1.6.2 for ARM
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-25 11:58:48 +02:00
Antonio Murdaca
40b21745cc Upgrade to golang 1.6.2
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-05-25 11:58:48 +02:00
Kenfe-Mickael Laventure
6a033e617f Allow changing wheezy deb builder backport mirror
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-05-09 09:10:30 -07:00
Kenfe-Mickael Laventure
d0a65a03e9 Allow specifying the apt mirror to use when generating deb packages
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-04-28 13:05:34 -07:00
David Lawrence
829d1883dc add pkcs11 build tag to deb and rpm builds
Signed-off-by: David Lawrence <david.lawrence@docker.com> (github: endophage)
2016-04-13 17:55:50 -07:00
Tibor Vass
7268eb97bc 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>
2016-04-13 11:22:48 -07:00
David Calavera
3e0bd74a3d 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>
2016-03-24 19:15:10 -04:00
Ken Cochrane
bb66d7144f 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>
2016-03-24 16:25:33 -04:00
Jessica Frazelle
f5afe02b69
fix deb generate
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2016-02-05 15:31:12 -08:00