Commit Graph

60 Commits

Author SHA1 Message Date
4128b146dc Removes telemetry mentions from Fedora 26
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: a8c7e75bfd263b2f7445b06f749aba13aaeac789
Component: packaging
2017-07-25 11:26:40 -07:00
772603618a Merge pull request #41 from seemethere/revert_metrics_plugin
Revert "Added the metrics plugin to the RPM/DEB packages"
Upstream-commit: 0f409bf47a7a0e6cbd97b3768a10724ecdd11ccc
Component: packaging
2017-07-25 10:08:52 -07:00
4e97b12edd Merge pull request #40 from seemethere/propagate_build_deb_errors
Tell build-deb to throw up errors
Upstream-commit: d37c8c84f7e4693bc922fe1063686064b2740f5b
Component: packaging
2017-07-25 09:46:29 -07:00
5230175f79 Revert "Added the metrics plugin to the RPM/DEB packages"
This reverts commit ceac22bf2240df483b1d3bd3a19ac681e665f910.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: bda73f99e455bd3f041ccc843f094186ca8b8623
Component: packaging
2017-07-24 18:16:04 -07:00
b58d0f8839 Tell build-deb to throw up errors
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 3618e4aa262f154f79c804752d69110772e636a3
Component: packaging
2017-07-24 16:30:11 -07:00
0c686df105 Add raspbian deb packages
Upstream-commit: 1c61fdcafc4f6fa0e41c267cd857d0b60d3a2dbd
Component: packaging
2017-07-22 08:20:40 +02:00
0fbe24ad38 Merge pull request #31 from andrewhsu/f26
build fedora 26 packages
Upstream-commit: 7cf8afa936431a5779f3d9e5748a40b05bfa75e4
Component: packaging
2017-07-21 14:44:11 -07:00
29f596dcad End Ubuntu 16.10 (Yakkety) support
Ubuntu 16.10 (Yakkety) reached it's "End of Life" on July 20, 2017:
http://fridge.ubuntu.com/2017/07/20/ubuntu-16-10-yakkety-yak-end-of-life-reached-on-july-20-2017/

As such we are removing support for the distribution for future versions
of Docker packages.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 36cc14cd480879391eeb9f470417698618f4cdb3
Component: packaging
2017-07-21 14:33:18 -07:00
658d91b7b5 Update spec to align with new spec files
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: feb2f647c5570753a607b71bb476028c8d1b4e55
Component: packaging
2017-07-21 14:20:39 -07:00
da96ff7f66 Update go version, add distro/suite tags
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 26b1bd9f3da46b907021ae66d310405057e29634
Component: packaging
2017-07-21 14:18:42 -07:00
f462cfc7cf build fedora 26 packages
Just released: https://docs.fedoraproject.org/en-US/Fedora/26/html/Release_Notes/

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 412824b465d8334278bb9c02f0a5ee3d294826fd
Component: packaging
2017-07-21 14:16:38 -07:00
140ada5fa0 Merge pull request #37 from seemethere/change_deb_rules_to_cd
Change make -C to a cd command for manpage generation
Upstream-commit: f608c8c590676f30bc1fe05bf65e6716d3e97a3a
Component: packaging
2017-07-21 10:57:18 -07:00
6f2ec850b4 Merge pull request #3 from rogaha/add_metrics_plugin
Added the metrics plugin to the RPM/DEB packages
Upstream-commit: ce952b6f169aedf56a968f58117587cafd20aa09
Component: packaging
2017-07-21 10:56:30 -07:00
2e0a8a6dee Change make -C to a cd command
Tried out make -C in this scenario and it did not seem to function
correctly, changed to cd.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 3a548f8815d5308b197abea1e39f0a0a4939c4f2
Component: packaging
2017-07-21 10:44:34 -07:00
e7e7faca03 Have docker cli be compiled in GOPATH
manpage generation was failing for docker cli when being run under
aarch64: https://ci.qa.aws.dckr.io/job/docker/job/release-packaging/view/change-requests/job/PR-41/5/execution/node/360/log/

The way to remedy this is to compile the cli and the manpages while in
the GOPATH so that dependencies found in the vendor folder are
discovered by the go build tools.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: b325a0eb0216e151be5d3e1ab9e48db07f53c6c5
Component: packaging
2017-07-21 10:31:28 -07:00
264d26c86a Add ubuntu-xenial aarch64 Dockerfile
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 94cbc76b701b8b108f6a337b1695bd664f441bdc
Component: packaging
2017-07-20 13:30:51 -07:00
cc15b49a4c Merge pull request #33 from tophj-ibm/s390x-add-seccomp
[s390x] add seccomp buildtag for ubuntu-yakkety
Upstream-commit: 795c44b6edfd158443b9ce501130b2e9776ab04a
Component: packaging
2017-07-19 17:21:19 -07:00
cc4d27dd59 Added the metrics plugin to the RPM/DEB packages
- centos
 - fedora
 - ubuntu
 - debian

Signed-off-by: Roberto Gandolfo Hashioka <roberto_hashioka@hotmail.com>
Upstream-commit: ceac22bf2240df483b1d3bd3a19ac681e665f910
Component: packaging
2017-07-18 09:14:56 -07:00
16b3113441 check if build dir exists before chown
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 46dd23f1fc2863741783f0584dad1a42815e5438
Component: packaging
2017-07-14 04:35:47 +00:00
480f1b0a2a ALPINE -> ALPINE_IMG
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ee25bc2379126a75116ce66daffda6c7d3f41d42
Component: packaging
2017-07-13 15:19:22 -07:00
fa401fa1b5 Add reflective alpine images to other components
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 0435cef6a945dc1c57b51cb24b36aaf66be8d8cc
Component: packaging
2017-07-13 15:16:51 -07:00
5103d2f4f1 [s390x] add seccomp buildtag for ubuntu-yakkety
Adds the seccomp buildtag for ubuntu-yakkety on s390x

Note: s390x requires libseccomp-dev 2.3.1 at the moment which is only available
only yakkety and later. This change is also consistent with the s390x yakkety
deb dockerfile in moby/moby.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 86c865f571eb9479052e19920fbb0efe7f54fd25
Component: packaging
2017-07-13 11:57:53 -04:00
b9da7abd2e Merge pull request #19 from seemethere/increment_to_ga
Increment RPM changelog to docker-ce 17.06.0-ce
Upstream-commit: d6cdd2cd4edc041e0887b741ae11ae9e925eb055
Component: packaging
2017-07-05 15:59:25 -07:00
8172ee629e Merge pull request #26 from seemethere/add_operating_instructions
Adds operating instructions
Upstream-commit: b970db134960bcb7c18ce7f41667554a4efc8761
Component: packaging
2017-07-05 15:59:06 -07:00
45ddb5a6b4 Fix paths for completion scripts
The completion scripts have been moved to the
docker/cli repository, so should be taken from
that directory.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e1902e55b76203dd8a5b5ff8249ff750ab365b96
Component: packaging
2017-06-22 01:55:38 -07:00
9ec73b6716 Specify the make variables, add docker-ce example
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c57562d148886f1fb892db1e4604eb2399cc7399
Component: packaging
2017-06-20 16:23:43 -07:00
cc33574a88 bump RPM changelog version to 17.06.0-ce
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 7e955d1f0c8c011058d7291d4c0dd2f0e65e4b8e
Component: packaging
2017-06-20 14:25:27 -07:00
1314e42d84 Adds operating instructions
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: a1a29c1440d5396d2a1be4e933472188554ad61f
Component: packaging
2017-06-20 14:12:18 -07:00
aa2281f8d3 Merge pull request #23 from seemethere/increment_to_rc5
bump Version to 17.06.0-ce-rc5
Upstream-commit: 3f1a023d0c1b474ef82f4c0fd2c2b730bed32281
Component: packaging
2017-06-19 23:42:46 -07:00
7819b28c1f Merge pull request #20 from andrewhsu/restart
restart docker service if needed for rpm upgrade
Upstream-commit: 7267953ecb55a0c0ac73cc04edd68746e725105c
Component: packaging
2017-06-19 23:40:24 -07:00
a189d6d755 restart docker service if needed for rpm upgrade
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 3152177fdd93d6e3d8c930600bd9bff4f9a36e1d
Component: packaging
2017-06-20 06:33:07 +00:00
1a754b3d95 also have deb pkg conflict docker-engine
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f7ad018c91316588a756e4e97cd48c246b2c1419
Component: packaging
2017-06-20 03:55:08 +00:00
4b4c229f4e Prefixes documentation files per component (#21)
* Prefixes documentation files per component

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>

* Remove reliance on basename

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 24e443c109ae5e133f1b20e6c4f9a17126767c71
Component: packaging
2017-06-19 18:29:22 -07:00
0badb5dd2c bump Version to 17.06.-ce-rc5
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: d9b0a3c4106bd9edb38c38f968fab47409c8eeb1
Component: packaging
2017-06-19 18:25:00 -07:00
77f12eb0fe Merge pull request #18 from cpuguy83/conflicts_docker_ee
Add conflicts with docker-ee
Upstream-commit: c5ed65456c22e4ea514eb730ed25378669a3c6f4
Component: packaging
2017-06-19 14:16:55 -07:00
f162d46aa3 Add conflicts with docker-ee
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1c0fdb57a4c7d485f301050e140ad57bdf231cde
Component: packaging
2017-06-18 15:24:56 -07:00
a438006e4f Mark docker-*-selinux pkgs as obsolete
These are replaced by `container-selinux` on fedora-25 and centos-7.
Marking these packages as obsolete makes the installation process a bit
smoother, otherwise the user will have to manually uninstall the older
packages to install the new one.

Also makes fedora24 use container-selinux which is now supports labeling
the `dockerd` binary correctly.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 94943b47520aa81bbe30fbc4eb927c79047ef6d2
Component: packaging
2017-06-16 17:27:51 -04:00
801070c998 update rpm changelog
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 659d6015b6bf8ec3c24cf5377f3eda88beed0a10
Component: packaging
2017-06-15 09:15:43 +00:00
4634634053 Merge pull request #13 from seemethere/add_systemd_files
Add systemd scripts
Upstream-commit: 9c1135df05c6ae371da5879d8a1be88749a2bfbd
Component: packaging
2017-06-15 01:02:43 -07:00
1037ee0af4 Use internal systemd scripts for DEB packaging
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 477d0b1f735f7e243425cd2c5f48e8f216556c2f
Component: packaging
2017-06-06 14:56:39 -07:00
418eb3ce3d Use internal systemd scripts for RPM packaging
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: cbfe576e680b19c5f4c992e52bee59f2bc540026
Component: packaging
2017-06-06 14:27:41 -07:00
f34782e802 set $GOPATH/bin for s390x
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f6d30c3631abee04aa3586cba36960901f705fe2
Component: packaging
2017-06-06 19:54:54 +00:00
402bd4febb no need for tty
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: ade95a2b6f8a16aa7e6c387dc9c9dd48bba9a672
Component: packaging
2017-06-06 18:33:59 +00:00
cbb74e3fb4 Add initial systemd scripts
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 7b31f87ffd8115f8226f68b788f5b36db53981f6
Component: packaging
2017-06-06 11:32:27 -07:00
1b97ea3876 generate man pages
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: e14fca86f8230e10d79a7bfae2873a98a16bb44d
Component: packaging
2017-06-06 08:39:39 +00:00
f4929f012a Change ARCH to be reflective
Signed-off-by: Eli Uriegas <seemethere101@gmail.com>
Upstream-commit: 930db40ec8424555612ce70781e94d5cb172aa4c
Component: packaging
2017-05-31 11:15:19 -05:00
4e36db9541 Rename deb dockerfiles to $(uname -m) equivalents
Signed-off-by: Eli Uriegas <seemethere101@gmail.com>
Upstream-commit: 3f7e423438733fb5f593f666d12714ae2f63fcc9
Component: packaging
2017-05-31 11:14:20 -05:00
66970d08f9 Update GO_VERSION to 1.8.3 (#8)
Signed-off-by: Eli Uriegas <seemethere101@gmail.com>
Upstream-commit: 121e1c478d94a9be5713e944dde113f8637d6e41
Component: packaging
2017-05-31 09:06:42 -07:00
c7ff61d425 Add armhf dockerfiles for deb building (#4)
Add armhf dockerfiles for deb building

Signed-off-by: Eli Uriegas <seemethere101@gmail.com>
Upstream-commit: f0c8cea1b79b049743cd1503f7ac4a34c265f476
Component: packaging
2017-05-26 13:10:27 -07:00
dd2cbf777c Add DISTRO/SUITE env. variables to the RPM dockerfiles
Signed-off-by: Roberto Gandolfo Hashioka <roberto_hashioka@hotmail.com>
Upstream-commit: c4a9e41495fac5e4aa72151b80200aa453f65e08
Component: packaging
2017-05-26 11:48:50 -07:00