528c150b8c
Removes engine VERSION dependency
...
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com >
Upstream-commit: 89d8a83e20172e66c16c6ddbc46f43e5f67f7045
Component: packaging
2017-09-11 12:11:59 -07:00
08880363bd
Merge pull request #29 from thaJeztah/remove-redundant-contrib
...
remove desktop-integration contrib from .deb
Upstream-commit: 50c7ac954e520fc9270cc765d3c11afb5b261154
Component: packaging
2017-08-30 19:47:50 -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
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
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
b1bd677bbe
remove desktop-integration contrib from .deb
...
these examples are not nescessary for day-to-day
use of docker, so don't have to be included in
the packages.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 957c44b12e036f3c0a57e34262eca0e0263a0d39
Component: packaging
2017-06-22 02:02:36 -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
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
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
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
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
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
680164099a
pass in git commit override when building deb
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 3c70b56937c415c6bf3516aeaa5231c6d7d3145d
Component: packaging
2017-05-25 05:57:29 +00:00
61ed131a71
initial commit
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: f64fc552cdfc4b4f2efb384054970fb0bfc1bd25
Component: packaging
2017-05-20 05:11:06 +00:00
