Commit Graph

298 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
9e2e0e95d9 Add RPM package building for docker-ce-cli
Splits out the docker-ce package and docker-ce-cli package into their
own things.

Still TODO: need to have a cleanup on the dependencies for the
Dockerfiles

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 2a27fb1dad0f91c25acb885c117563a33f6c5e88
Component: packaging
2018-08-14 16:50:27 +00:00
788de7687c Merge pull request #139 from andrewhsu/multi
Merged with https://github.com/seemethere/unir
Upstream-commit: e5c3bb43d2d20f1a9e5a3443c1c6be748b7f571c
Component: packaging
2018-08-14 16:43:54 +00:00
945372fa23 Merge pull request #137 from seemethere/scratch
Merged with https://github.com/seemethere/unir
Upstream-commit: e1e487b7de1138d3abf965c505dc6af0c213e86b
Component: packaging
2018-08-13 22:19:10 +00:00
5b9122fbe9 refactor fedora-28 Dockerfile for multi-stage
Also moved package deps into spec file BuildRequires. Had to hard-code
Epoch in spec file in order to realize deps with yum-builddep.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 07f46e8e96692c511c04f29fbc78c2aa9592e479
Component: packaging
2018-08-12 07:54:44 +00:00
1bf6cebb40 refactor fedora-27 Dockerfile for multi-stage
Also moved package deps into spec file BuildRequires. Had to hard-code
Epoch in spec file in order to realize deps with yum-builddep.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: b09bb012dd220e822aa6e90ef20d9cb83ccada8b
Component: packaging
2018-08-12 07:54:44 +00:00
26c6ae9770 refactor centos-7 Dockerfile for multi-stage
Also moved package deps into spec file BuildRequires. Had to hard-code
Epoch in spec file in order to realize deps with yum-builddep.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 784a53cec5061e6a718acc3a7104c61215c15078
Component: packaging
2018-08-12 07:54:44 +00:00
b290116fb4 hardcode epoch so yum-builddep will work
Looks like yum-builddep will only work if rpmlint passed on the spec
file and the spec file errors out on Epoch not being hardcoded.

Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: 42b49f6556022ecba47801f4639ddbc7864c9fe0
Component: packaging
2018-08-12 07:48:14 +00:00
4ae3a83348 DISABLE_WARN_OUTSIDE_CONTAINER when building RPMs
This will save time waiting for timeout to expire.
Upstream-commit: 11a6221a830d7ffc3291e5b8749e364b18e07626
Component: packaging
2018-08-12 07:42:50 +00:00
f395016eaa Change runc compilation to static
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 1cd96d5f686b389920ba01d0b230d7c29148e8ba
Component: packaging
2018-08-10 21:33:59 +00:00
79bec603a6 Merge pull request #138 from jose-bigio/fix_Makefile_var
Merged with https://github.com/seemethere/unir
Upstream-commit: d7f8fe075d4bd078afbd71e5d29c2f2a3dae4ce7
Component: packaging
2018-08-10 20:19:28 +00:00
1f4ebac506 Fix static version variable
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 507c9f84ccc3f83c978aeefa2f0377ed0c14c3b8
Component: packaging
2018-08-10 13:12:48 -07:00
31a1aed04a Change final image to be a scratch image
Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: 08c4ef675e42077a7407143f5e94d53b198b1a0f
Component: packaging
2018-08-10 16:53:25 +00:00
ae672e2b0e Merge pull request #135 from jose-bigio/top_level_make
Merged with https://github.com/seemethere/unir
Upstream-commit: 0b376627615b15ea2a17b5c97bd7b975b910ea10
Component: packaging
2018-08-07 21:52:06 +00:00
7c303cf2e5 Add top level make target
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 9bb08342efcf1d9e69cbeca9b820309c9622bef5
Component: packaging
2018-08-07 14:28:11 -07:00