1
0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Commit Graph

39 Commits

Author SHA1 Message Date
Eli Uriegas
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
Andrew Hsu
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
Andrew Hsu
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
Sebastiaan van Stijn
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
Eli Uriegas
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
Eli Uriegas
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
Eli Uriegas
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
Andrew Hsu
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
Andrew Hsu
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
Andrew Hsu
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
Andrew Hsu
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
Eli Uriegas
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
Eli Uriegas
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
Andrew Hsu
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
Brian Goff
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
Brian Goff
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
Andrew Hsu
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
Andrew Hsu
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
Eli Uriegas
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
Eli Uriegas
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
Andrew Hsu
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
Andrew Hsu
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
Eli Uriegas
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
Andrew Hsu
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
Eli Uriegas
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
Eli Uriegas
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
Eli Uriegas
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
Eli Uriegas
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
Roberto Gandolfo Hashioka
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
Andrew Hsu
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
Andrew Hsu
a88dc6ffda override ver and git commit when building all deb pkgs
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 4397990e00863254d78c44fbe904a70272b5b340
Component: packaging
2017-05-25 05:22:42 +00:00
Eli Uriegas
92d664086d Make the hash_files target non interactive
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 097516fc76a2c9acf798dc523326904520ff1fc7
Component: packaging
2017-05-24 10:11:40 -07:00
Andrew Hsu
b602250a48 more doc cleanup
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: dafbbb4fa4fbaade4ae0a6abcba39bbfcd8f755d
Component: packaging
2017-05-23 03:19:52 +00:00
Eli Uriegas
fe481b52a5 Move the hashing of files to its own target
So we can use it at will

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 533a843393bd7c3674074ec9af73c8e666fc7484
Component: packaging
2017-05-22 15:11:53 -07:00
Eli Uriegas
b3cf695357 Add file hashing for static files
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: a1b7f6f3407546ff41ed2e0d16d7e1b2a8ac0ef4
Component: packaging
2017-05-22 14:43:24 -07:00
Andrew Hsu
141bcdee33 specific version numbers for ubuntu
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: c4e3bb1768ff6f6285e65ca88436aa7de5b89bc8
Component: packaging
2017-05-22 19:48:10 +00:00
Andrew Hsu
a36b59a609 fix static package generation
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 3513248c56fc917a0b37ff140ca7981d7af933ef
Component: packaging
2017-05-20 06:00:56 +00:00
Andrew Hsu
61ed131a71 initial commit
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f64fc552cdfc4b4f2efb384054970fb0bfc1bd25
Component: packaging
2017-05-20 05:11:06 +00:00
Tibor Vass
969598bdd6 Initial commit
Upstream-commit: 3b31275fd8206e35f73e37d91ccaea19446eb79c
Component: packaging
2017-05-19 20:08:25 -07:00