1
0
mirror of https://github.com/docker/cli.git synced 2026-01-26 15:41:42 +03:00
Commit Graph

124 Commits

Author SHA1 Message Date
Tibor Vass
74edba628c Merge pull request #30489 from unclejack/bump_go_to_1.7.5
Dockerfile*: bump Go to 1.7.5
Upstream-commit: a88e529d28266a804e7b32bbce72ee18ececdddb
Component: engine
2017-01-30 10:32:55 -08:00
Alexander Morozov
38a091bebe Merge pull request #27783 from epiloque/add-rpm-armhf-centos-7
add rpm builder for ARM CentOS 7
Upstream-commit: 865b3b76521c561f09afadb46574df36f927c85b
Component: engine
2017-01-27 13:18:20 -08:00
unclejack
b3f0aa463e Dockerfile*: bump Go to 1.7.5
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: b6e2703230c9262b14df22d4a865f140a897740d
Component: engine
2017-01-27 02:14:36 +02:00
Justin Cormack
ecfeb35159 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>
Upstream-commit: f8119bb7a76b5c42defb6e0a2dc67bd77ad29a5e
Component: engine
2017-01-18 12:27:21 +00:00
Mark Milstein
0e2f851d3d add rpm builder for armhf CentOS 7
Signed-off-by: Mark Milstein <mark@epiloque.com>
Upstream-commit: 296f8d5abc471685ca619aaa11a626cbc1ac3384
Component: engine
2017-01-17 18:05:38 +00:00
Christopher Jones
b1a42a3384 [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>
Upstream-commit: fa17ac256019729a15f6c33c2c2dad34acef9e4a
Component: engine
2017-01-13 16:48:41 -05:00
Brian Goff
85d3bbdc8b Merge pull request #28900 from tophj-ibm/ppc64le-rpmbuild-fedora23
[ppc64le] add make rpm for fedora 24
Upstream-commit: 7548fc763789979b86b907a3d12f6f5b7c85c802
Component: engine
2016-12-21 13:43:13 -05:00
Andrew Hsu
29ad604435 remove fedora-23 because eol
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: ef98091a901cd9926d307ed622de088c90da2ef3
Component: engine
2016-12-15 09:44:34 -08:00
Andrew Hsu
20a5fc751f Revert "get rhel7.3 selinux-policy-devel pkg for centos-7"
This reverts commit bfe5cab13bf0c83624fde0ab74f223bfa15d04c2.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 793be849c8bd13a88cc2b370141cc8c9b1c3f77b
Component: engine
2016-12-08 16:27:23 -08:00
Christy Perez
fbe4468efc ppc64le rpmbuild
Add support for 'make rpm' on ppc64le. Currently only fedora 24.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 42969d44fc9a9905b32a4fc1d5facdb64da3e4ab
Component: engine
2016-12-08 17:16:16 -05:00
Christopher Jones
475e43a2b7 [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>
Upstream-commit: 62ab6809bd0a654dde9c076f5a197253c66877e8
Component: engine
2016-12-08 16:18:10 -05:00
Christopher Jones
ef878bf7f4 [project] bump go to go 1.7.4
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 20e243780ef3b6a7d1debca6279e06b003895121
Component: engine
2016-12-07 22:22:39 -05:00
Brian Goff
fad60545c0 Merge pull request #29081 from andrewhsu/fix-rhel73
add selinux policy for centos-7
Upstream-commit: b7ab3276c2f7f875e041ed4d1a3a7975f1496e17
Component: engine
2016-12-06 11:00:45 -05:00
Andrew Hsu
e4ea064d47 run dnf upgrade before installing in fedora
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: ebd804bfb6af27b04514512676619b6a961551dc
Component: engine
2016-12-04 16:29:03 -08:00
Andrew Hsu
8039795523 get rhel7.3 selinux-policy-devel pkg for centos-7
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: bfe5cab13bf0c83624fde0ab74f223bfa15d04c2
Component: engine
2016-12-02 14:39:24 -08:00
Sebastiaan van Stijn
7c90136733 Use official fedora 25 image
Fedora 25 was released today, and the official
image will be available soon.

This removes the temporary override, so that
we can build using the official image.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 545a2f009e5d99a196d1a328f4861207f8a99107
Component: engine
2016-11-23 02:19:02 +01:00
Sebastiaan van Stijn
650e1e1f00 Merge pull request #28672 from mlaventure/arm-ubuntu-xenial
Add support for armhf ubuntu-xenial deb
Upstream-commit: 6e11ca0fdf7f6b6ca313da46d545b069dda89f14
Component: engine
2016-11-22 19:57:11 +01:00
Sebastiaan van Stijn
e3d6a1c7d6 Merge pull request #27625 from hqhq/add_deb_support
Add `make deb` support for aarch64
Upstream-commit: bae61194dbc080ffce679d4792d751170834662b
Component: engine
2016-11-22 18:24:58 +01:00
Kenfe-Mickael Laventure
3da2e461d3 Add generate.sh for armhf deb Dockerfiles
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 3b3cf87478cc478c79116ed1f281a95955264eff
Component: engine
2016-11-22 07:12:57 -08:00
Kenfe-Mickael Laventure
7ee0929419 Add support for armhf ubuntu-yakkety deb
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: b118056241430a28739128fdf7fc60b125a12c49
Component: engine
2016-11-22 07:09:10 -08:00
Felix Ruess
2bf8a1c8e2 build debian package for armhf ubuntu-xenial
Signed-off-by: Felix Ruess <felix.ruess@gmail.com>
Upstream-commit: 015e83a8da3ccf9f208f92d5d66e5dd159f75ad7
Component: engine
2016-11-21 12:34:20 +01:00
Qiang Huang
e6ecd89a1b Add make deb support for aarch64
Fixes: #27045

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a532ff8cc387ba1d6d98eb2456dd53d97d3eca4b
Component: engine
2016-11-17 09:38:17 +08:00
Andrew Hsu
2c1cd5595f replace vim-common with vim for opensuse
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 5764171fe773b450c05b39c43a5a69d55cd0ce79
Component: engine
2016-11-10 15:50:29 -08:00
Sebastiaan van Stijn
949cb1d2cb Add Fedora 25 RPMs
This is a temporary version for building
Fedora 25. Fedora 25 will be released during
code-freeze, and is currently in beta, so no
official images are available yet.

Current release date is scheduled for 2016-11-15
https://fedoraproject.org/wiki/Releases/25/Schedule

Once released, the image will be updated for
GA

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: c4f1cb779179b6145702174614706c462a5ceaae
Component: engine
2016-11-10 20:44:30 +01:00
Michael Crosby
5b17cce44b Reorder rpm deps for changelog
The changelog is auto generated and the comment in the generate.sh
script is a lie, these should not be in alphabetical order but
in chronological order.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 053738f7e267494eee2e5aeb28889ddc3d97b3fa
Component: engine
2016-11-09 11:33:35 -08:00
Michael Crosby
f1be94b613 Add tini build deps to deb generation
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 6440c5d822c6c9083155839d1d6f51b369a9ebee
Component: engine
2016-11-09 11:12:14 -08:00
Michael Crosby
caf784f5ba Add tini deps to rpm build
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: e0e7dd6fee00b97ae7d73a21528c4f84bfae88ba
Component: engine
2016-11-09 10:47:24 -08:00
Sebastiaan van Stijn
549c168518 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>
Upstream-commit: 27beb64d468614db0eb7344340d39b5619219a7d
Component: engine
2016-11-07 15:14:36 +01:00
Christopher Jones
4ca3d7782b 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>
Upstream-commit: 732d1035d2f1d8f0b6f3410035fa393431b93d89
Component: engine
2016-11-04 09:03:41 -05:00
Brian Goff
ba87ff5ff2 Merge pull request #28046 from tophj-ibm/make-debs-1610
[ppc64le] add yakkety yak to 'make deb'
Upstream-commit: d5c3eb0afb9ccbdb671c4841727bab87a4bb2145
Component: engine
2016-11-03 20:17:36 -04:00
Christopher Jones
45efa44b4f [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>
Upstream-commit: da382044d3630bcdeb1eac64f2f7ad476e0cf007
Component: engine
2016-11-03 15:59:59 -04:00
Christopher Jones
dc399e49f2 [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>
Upstream-commit: 629e85ad8975046eba3a88fdc8448759525e27bd
Component: engine
2016-11-03 15:26:28 -04:00
Andrew Hsu
c0d067f26a sed replace apt mirror with default deb.debian.org for debian distros
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: dbe17defd15d16d1d85d794c8beaea595df1d0ba
Component: engine
2016-10-25 13:25:21 -07:00
Sebastiaan van Stijn
0c230bcf48 Merge pull request #27327 from flixr/deb_armhf_ubuntu-trusty_buildtags
debian package: update buildtags for armhf ubuntu-trusty
Upstream-commit: 6698a66be705039f44688d4476f5016145184259
Component: engine
2016-10-20 09:52:43 -07:00
Alexander Morozov
5d03410dc2 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>
Upstream-commit: 7d8831c0914b8016daee5c0b90496b581d61522d
Component: engine
2016-10-19 13:55:01 -07:00
Vincent Demeester
cc3045cf2d Merge pull request #27421 from jcberthon/master
builder: Add AppArmor to runc buildtags for armhf - fixes #27351
Upstream-commit: fb65df5bfe7c03a449b4d7c2c57d73de590ea2e1
Component: engine
2016-10-17 19:20:09 +02:00
Sebastiaan van Stijn
04d1de1324 Remove Fedora 22 from RPM build as it is EOL
Fedora 22 reached end of life on July 19th, and
will no longer receive updates;

https://fedoramagazine.org/fedora-22-end-of-life-2016-july/

With the recent release of Fedora 24, Fedora 22 will officially enter End Of
Life (EOL) status on July 19th, 2016. After July 19th, all packages in the
Fedora 22 repositories will no longer receive security, bugfix, or enhancement
updates, and no new packages will be added to the Fedora 22 collection.

Upgrading to Fedora 23 or Fedora 24 before July 19th 2016 is highly recommended
for all users still running Fedora 22.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: ff405a1d2b9cb7ccbd315e882b6bd7560eb4159c
Component: engine
2016-10-16 21:13:26 -07:00
Jean-Christophe Berthon
647cbda777 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>
Upstream-commit: e0c7300e3b2abea3d32d591fb01ee798ff59e0d4
Component: engine
2016-10-16 15:32:31 +00:00
Felix Ruess
f526e109d5 builder: update deb armhf ubuntu-trusty buildtags
Signed-off-by: Felix Ruess <felix.ruess@gmail.com>
Upstream-commit: 63515bc59e5be4cebaa475ec4c8fe992a6c1107d
Component: engine
2016-10-12 20:47:06 +02:00
Kenfe-Mickael Laventure
94417a16f4 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>
Upstream-commit: e9a81057086cf9834cce4c49c6f8ef035938fc64
Component: engine
2016-10-04 13:01:00 -07:00
Alexander Morozov
0cc382f1ee Merge pull request #26920 from tophj-ibm/add-1404-make-debs
ppc64le: add files for supporting 14.04 'make debs'
Upstream-commit: 1dbf3c65e15a2d021cc15ded9caaf6192d58970b
Component: engine
2016-09-27 07:54:57 -07:00
Christopher Jones
8a1347213b 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>
Upstream-commit: f431211631f0dd68ec41c970e5b951c5141e3f9b
Component: engine
2016-09-26 12:13:39 -04:00
Christopher Jones
3fec534730 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>
Upstream-commit: 9a928e32325c399999342fcf24d9fd3074137a90
Component: engine
2016-09-26 10:24:55 -04:00
Michael Holzheu
5f6c283538 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>
Upstream-commit: 73df9b4e87d0a9fc13ef75e0d8f2f50ddfc8c7e5
Component: engine
2016-09-12 16:10:36 +02:00
Fabio Rapposelli
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
Antonio Murdaca
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
Christopher Jones
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
Dieter Reuter
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
Sebastiaan van Stijn
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
Antonio Murdaca
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