Commit Graph

15 Commits

Author SHA1 Message Date
b6f361cd3a Add standard OCI labels
This adds the standardized OCI labels for our image so downstream tools
will be able to inspect/extract these mechanically.

Reference: https://github.com/opencontainers/image-spec/blob/master/annotations.md#pre-defined-annotation-keys

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 58e5b9c98134930c00ad678bc0de454b490dd7b6
Component: packaging
2018-08-29 10:27:51 -07:00
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
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
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
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
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
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
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
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
13fe238674 Add extra dollar in Makefile/image
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 65a9bb677ebffccb2d5d1002c3e1bdd4dd46d76c
Component: packaging
2018-08-07 13:22:53 -07:00
3570421f62 Remove shell directive so target will work
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 93fcc8443b504c94beaef697ec6f27748b40d656
Component: packaging
2018-08-07 13:21:18 -07:00
d72fa21d55 Add tar targets for engine image
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 2ffde00d61af1074e100ca0c725dbd4f685299a1
Component: packaging
2018-08-07 13:06:47 -07:00
46906a5687 Build docker image with engine binary on multiple arches
Signed-off-by: Jose Bigio <jose.bigio@docker.com>
Upstream-commit: 2dfaf0dd0fa7b7a7aef76d1254b2b48dc04d0211
Component: packaging
2018-08-03 16:32:19 -07:00
f232ca8480 Switch image name on hub
For the Q3 release the names will be refined slightly, and "ce" will no
longer be used - it's now just the docker engine, with "community" or
"enterprise" at the end if disambiguation is needed.
Upstream-commit: e69e4ea4997e468d20d93247ba19cd5e86daf24f
Component: packaging
2018-08-01 08:03:20 -07:00
78ba8bbfa1 Add support for image build
This adds a new packaging variant for engine with an image
Upstream-commit: 27766ed0f4576ced4026adc60359ad63a977008e
Component: packaging
2018-07-12 10:41:52 -07:00