toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
312 Commits 3 Branches 295 Tags
3e2da1ea70daf06598a2091fc391c3d32af77dbd
Commit Graph

312 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andrew Hsu
3e2da1ea70 added RestartSec 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 3614f5dc4eb20e0d028ee1b2fd4bc23d34815f39
Component: packaging
 2018-08-24 22:40:02 +00:00
Andrew Hsu
8f960d9901 Merge pull request #162 from andrewhsu/cprox 
[18.09] update containerd proxy commit to afca176
Upstream-commit: ad501c8f80636b3446db0a15d6a9da8ccfd65ccd
Component: packaging
 2018-08-24 15:19:12 -07:00
Andrew Hsu
546163ada0 update containerd proxy commit to afca176 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: eea6967f5de4835800349b1bcf2b81de8fd92207
Component: packaging
 2018-08-24 22:14:20 +00:00
Eli Uriegas
bcac5c18d0 Merge pull request #160 from dhiltgen/fix_scope 
[18.09] Make engine scope a build time setting
Upstream-commit: 4a425676ac9183011f84fafda1a103fe93121dd1
Component: packaging
 2018-08-24 12:01:27 -07:00
Daniel Hiltgen
66e16d32fe Make engine scope a build time setting 
This should make it easier to change downstream builds
to change the scope.

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 72406691244c12d5360889f8658bd4989b588364
Component: packaging
 2018-08-24 11:40:42 -07:00
Eli Uriegas
5e417d9bd2 Merge pull request #158 from andrewhsu/ac 
[18.09] use systemctl is-active to check for containerd
Upstream-commit: 7e5cc1a95e11a48148f1972d625322ae1399c0bc
Component: packaging
 2018-08-23 09:59:48 -07:00
Andrew Hsu
51edf81efb use systemctl is-active to check for containerd 
The other way was not working.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
(cherry picked from commit f00df1bf1efa2ed1ea508ea7b1c291500441571d)
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: a9b0387bb0f40bd7687d8653a0714724eb66f3b9
Component: packaging
 2018-08-23 16:57:41 +00:00
Eli Uriegas
97dd93e978 Merge pull request #157 from seemethere/remove_overlay_1809 
[18.09] Remove overlay as the default storage driver
Upstream-commit: 54dc76c596e5f5fe8ee76e65a0ac601f8a1d8e8b
Component: packaging
 2018-08-23 09:44:14 -07:00
Eli Uriegas
dc460e810c Remove overlay as the default storage driver 
Should rely on list in the daemon

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 605758124d0750c14d24bfb1ebcf77d102591f4a)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 6cc81c2e8c95127baac275750bc544452fec7799
Component: packaging
 2018-08-23 16:39:44 +00:00
Eli Uriegas
dbb89de17a Merge pull request #155 from seemethere/fix_up_dockerfile_1809 
[18.09] Fix up Dockerfile.engine to compile docker-proxy statically
Upstream-commit: 9162117ba4c76ad329c4c4abeab02b91e76cbd4c
Component: packaging
 2018-08-23 08:50:54 -07:00
Eli Uriegas
6c6bc2f8c9 Remove linux-headers as a dependency 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 82258262f90bfaca3a2ef14e6b53238c2fac3147
Component: packaging
 2018-08-23 15:08:24 +00:00
Eli Uriegas
45b43d2050 Wire up dependencies for debian, source -> . 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 99bbb6e33f46b6e2621204aac3b05344783ccfaa)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 3aeb8e9365fefea1be6e6b64624fccb81d5a70ad
Component: packaging
 2018-08-22 23:28:39 +00:00
Eli Uriegas
adca33ea9c Fix whitespace, add Dockerfile.engine to clean 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 831482a3296e9a7b1ad10f6b8c850a7a4095b881)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ce1d295cf4f7049dc48813d825511a85ebf7e9c1
Component: packaging
 2018-08-22 23:28:39 +00:00
Eli Uriegas
cea6d4e302 Make GO_IMAGE configurable, default to official go 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
(cherry picked from commit 4cdbe08bf929d5c731b61e1cea217fa40156a3a8)
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 5bfb6ce9464fea13abc71fb6c12b9f5cb01a29a4
Component: packaging
 2018-08-22 23:28:39 +00:00
Eli Uriegas
bd24fd7ae6 Merge pull request #148 from dhiltgen/license_message 
Set up default product license for community engines
Upstream-commit: 7195f2116059c01b3a4cc4314c345510d04a2feb
Component: packaging
 2018-08-21 11:15:36 -07:00
Eli Uriegas
a16152031b Merge pull request #151 from docker/develop 
Merging the develop changes into master
Upstream-commit: a119f42ef86517dc79e0b3749acdb457a63dea6d
Component: packaging
 2018-08-21 11:15:07 -07:00
Daniel Hiltgen
06c4880d2c Set up default product license for community engines 
This will report a fixed string for community engines
Upstream-commit: 140dd867085cbe97947a64353fe245b858284172
Component: packaging
 2018-08-20 16:41:23 -07:00
Eli Uriegas
6536c488a2 Merge pull request #150 from seemethere/require 
Set containerd to be a systemd bind for docker
Upstream-commit: 710ecfcf0992363047d1f9bf57be20b7459ae0c7
Component: packaging
 2018-08-20 14:31:22 -07:00
Eli Uriegas
dbc4cb6ea0 Set containerd to be a systemd bind for docker 
The daemon won't actually start without containerd

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 16037618282dc5076089c7b749cdd07376650f8d
Component: packaging
 2018-08-20 21:17:32 +00:00
Eli Uriegas
ca4ed4129e Merge pull request #149 from seemethere/offline_engine 
Do offline bundles for engine installs
Upstream-commit: 99edae9143f8189a75aab661536c995d46c55231
Component: packaging
 2018-08-20 13:23:00 -07:00
Eli Uriegas
b3c9a88509 Do offline bundles for engine installs 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: fe03039776edbc90053b510ae6e72657340b1ccb
Component: packaging
 2018-08-20 20:08:07 +00:00
Eli Uriegas
d59e776158 Merge pull request #147 from seemethere/c 
Make ENGINE_IMAGE configurable for dockerd.json
Upstream-commit: 411a80222b89308419e138708cc2cfc7442721b7
Component: packaging
 2018-08-20 08:08:55 -07:00
Eli Uriegas
3f276a5ee3 Make ENGINE_IMAGE configurable for dockerd.json 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 657c7899302691373836bbd28fc4c069da64d90e
Component: packaging
 2018-08-20 14:59:56 +00:00
Eli Uriegas
6e4bcc873b Merge pull request #146 from seemethere/configurable 
Make IMAGE_TAG configurable for dockerd.json
Upstream-commit: e344a52260c8774a3de2a648d8b055e83d27b6f7
Component: packaging
 2018-08-18 14:50:04 -07:00
Eli Uriegas
a59390fe70 Remove s390x for now 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 660431eec07bb7a934c483bb2355b9f121fb98e2
Component: packaging
 2018-08-18 21:49:50 +00:00
Eli Uriegas
d0741cffba Make IMAGE_TAG configurable for dockerd.json 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: aabd5d3b852b3b3f7131cdd622a9e5078f193819
Component: packaging
 2018-08-18 21:27:35 +00:00
Eli Uriegas
0500a90795 Merge pull request #145 from seemethere/rpm_override 
Make the build variables eval at reference
Upstream-commit: 303a2454cdee1ba71caad664a1861e3386b01592
Component: packaging
 2018-08-17 14:39:38 -07:00
Eli Uriegas
82d8af2891 Make the build variables eval at reference 
Makes it so that you can overwrite them better if you include this
makefile in another makefile...

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 446f8d31394ae35fc38187aa5e40627b33a95a27
Component: packaging
 2018-08-17 21:22:05 +00:00
Eli Uriegas
eacc99c223 Merge pull request #144 from seemethere/resilience 
Make the curl for containerd-proxy more resilient
Upstream-commit: 9e0c559930ad836e8926e1766bead587d9c6fa5b
Component: packaging
 2018-08-17 13:42:42 -07:00
Eli Uriegas
26a46ac890 Make the curl for containerd-proxy more resilient 
Was reporting 404's using the old url for some reason, might have to
refactor this in the future to just use a git clone...

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 763ad6aa7ac24c269dc1dfa223771671acffc8fc
Component: packaging
 2018-08-17 20:25:50 +00:00
docker-unir[bot]
aa6259f758 Merge pull request #143 from seemethere/configurability_plz 
Merged with https://github.com/seemethere/unir
Upstream-commit: c2de74bb370d514115888d5626c6649b079166d1
Component: packaging
 2018-08-17 18:40:56 +00:00
Eli Uriegas
126bb1b3a0 Add some changes to make things more configurable 
Allows us to switch out debian files and rpm specs on the fly and also
gives us an out to have ARCH specific dockerfiles if we need them for
RPM's. The same strategy can be used for DEB's if need be

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: b72dc2edb8329151bfe2df6989fb329f41e720fb
Component: packaging
 2018-08-17 18:33:02 +00:00
Eli Uriegas
ce5c73493b Merge pull request #142 from seemethere/remove_rpm_arch 
Remove arch specific dockerfiles for RPM building
Upstream-commit: 0d23632daafbdbf93bba0005bc8b595582e88f00
Component: packaging
 2018-08-16 16:59:22 -07:00
Eli Uriegas
9df43900d6 Remove arch specific dockerfiles 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 0fd20b90cd322f0eeb06440833ba119b26f44d05
Component: packaging
 2018-08-16 23:50:31 +00:00
Eli Uriegas
6fee85f2ef Merge pull request #141 from seemethere/fix_xenial 
Build this on xenial instead
Upstream-commit: fbc1757b6cf0084c4ae399b2893f7188ad693107
Component: packaging
 2018-08-16 16:35:52 -07:00
Eli Uriegas
cfdb136fbd Build this on xenial instead 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 587c5995b3283f49410fc8bb89f9d7dad67a6ab7
Component: packaging
 2018-08-16 23:23:36 +00:00
docker-unir[bot]
1cdc07f84f Merge pull request #140 from seemethere/deb_new 
Merged with https://github.com/seemethere/unir
Upstream-commit: ecfdd4c83e0cf1640fd0a6e03ceb7a292be4acca
Component: packaging
 2018-08-16 23:09:24 +00:00
Eli Uriegas
d0d5b8bd04 Do not conflict with docker-ee-cli 
docker-ee-cli will obsolete docker-ce-cli

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: e6e563fc93f86bc17a61858ac755e74af1691081
Component: packaging
 2018-08-16 22:50:16 +00:00
Eli Uriegas
d9d726eb2b Intial deb package split for 18.09.x 
Get's rid of architecture specific dockerfiles (yay manifest lists),
also follows very closely to what the RPM makefile does with the
sources.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ab1ba336ad1720a166e8ed4469c616851d89a8d1
Component: packaging
 2018-08-16 22:39:37 +00:00
docker-unir[bot]
00eadcc8c5 Merge pull request #131 from seemethere/rpm_new 
Merged with https://github.com/seemethere/unir
Upstream-commit: 6944fe6659317d20343947e22f71f24eb129ed30
Component: packaging
 2018-08-16 18:37:48 +00:00
Eli Uriegas
cbac77a8f2 Some changes to get this working on CentOS 7 
Old versions of things on CentOS 7 strike again!

infinity is not a thing for TimeoutSec on systemd < 229

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 86dafe5391e2ef298248536cd038e27230a4df63
Component: packaging
 2018-08-16 04:03:40 +00:00
Eli Uriegas
4b8490a8fe Improve containerd detection, don't rely on root 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 2134ee524ecf6a96c99a518652b4ec65680abc34
Component: packaging
 2018-08-16 00:10:04 +00:00
Eli Uriegas
4670e93b92 Revive pre / post steps, update offline location 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 558cd9c4bb28a11fe1ff3da45a4efd19265d7ce5
Component: packaging
 2018-08-15 23:17:54 +00:00
Eli Uriegas
cbb6da8c29 Update to use a base golang image instead of curl 
Why didn't we do this the whole time? `¯\_(ツ)_/¯`

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: df2a0d6fc5a59a7a8b352689238eddf5a46d3ed4
Component: packaging
 2018-08-15 23:12:28 +00:00
Eli Uriegas
4a4db9a651 Round out systemd for RPM packaging 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: f99ffa4b5ef8c85fa5fbeb8fdc95403f9a02ceaf
Component: packaging
 2018-08-15 23:01:10 +00:00
Eli Uriegas
03fa2aa531 Add systemd files, add containerd-proxy config 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 481c39539b723230a258f02e3d33d3baed03d2ce
Component: packaging
 2018-08-14 20:30:22 +00:00
Eli Uriegas
74209bb90a Remove rpmlint checks, add BuildRequires 
rpmlint checks can be re-added later

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: c245ce12c1e0a092ef21094b287b8cb94a51ee1e
Component: packaging
 2018-08-14 17:27:32 +00:00
Eli Uriegas
1f463af629 Add containerd-shim-process installation 
Also split off containerd.mk into it's own thing since most of this
stuff will be re-used with debian packaging anyways.

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 5513629a1b4868d82a41249eac634edbff51e315
Component: packaging
 2018-08-14 16:50:27 +00:00
Eli Uriegas
4db1f97e23 Add containerd-proxy building 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ca519bb1194b6ab673b5ade7861f220cac949ec6
Component: packaging
 2018-08-14 16:50:27 +00:00
Eli Uriegas
2645463a17 Remove engine-$(ARCH).tar dependency for now 
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 111b5babb924137df28c233ac40c23f7553a39da
Component: packaging
 2018-08-14 16:50:27 +00:00