Commit Graph

10 Commits

Author SHA1 Message Date
Marcin Juszkiewicz
43de60caaf introduce 'install_kubectl' macro
Both kubetoolbox and magnum-conductor install 'kubectl'. In different
versions. And only for x86-64.

New macro knows how to handle other architectures. AArch64 binary is
fetched properly, other architectures (ppc64le for now) gets info that
there is no binary upstream.

Also updated to v1.5.4 as this one is used by kube/* images.

Change-Id: Ia491d6ec7156201742f28b5d1018f2794529b5b4
Partially-Implements: blueprint multiarch-and-arm64-containers
2017-05-12 14:22:29 +02:00
Jawon Choo
31259fa595 Override image's meta info.
centos based images have wrong label info,
these changes fix own image's name and build-date.

Change-Id: I1d13f8f386c8db12b5fbe5f8ecbbf9e3fbb4ba1c
Closes-Bug: #1680341
2017-05-03 11:08:17 +09:00
Jenkins
139e0dd094 Merge "kubetoolbox: mark as x86-64 only" 2017-04-20 12:59:51 +00:00
Chen
8c463a47a9 Use LABEL instead of MAINTAINER (deprecated) in all Dockerfile.j2
Use LABEL instruction instead of MAINTAINER (deprecated) instruc-
tion as suggested by Docker's official dockerfile guide.
docs.docker.com/engine/reference/builder/#maintainer-deprecated

Closes-Bug: #1683652

Change-Id: Ie87a1ddf31aefcd0b623fd2837d78de420e76898
2017-04-20 16:50:05 +09:00
Marcin Juszkiewicz
22c1557704 kubetoolbox: mark as x86-64 only
Image is using 'kubectl' binary which is not available for non-x86
architectures.

Change-Id: I26f4d2d8fa01f665ed25e429bca856c0fe3f852f
Partially-Implements: blueprint multiarch-and-arm64-containers
2017-04-19 15:45:29 +02:00
Eduardo Gonzalez
623e54da37 Alphabetize packages
Some images have packages sorted alphabetically and some not.
Unify common style between all images.

Change-Id: I906ed89c10b12886665618752f525ba71d83d991
2017-03-28 16:45:16 +01:00
Paul Bourke
8dd0f553a2 Allow customisation of k8s binary locations
Allow operators to customise the location k8s binaries are pulled from
in kubernetes-entrypoint & kubetoolbox

Change-Id: I8bab3fe7dfb9ac23dcfbfd2c709cfddaaab40534
2017-02-20 14:48:40 +00:00
Jeffrey Zhang
e5903d5fa9 Remove include_header and include_footer in all Dockerfiles
include_header and include_footer parameter is already removed, remove
them in all Dockerfiles.
Add missing footer block.

Change-Id: I90da03eb9f95a3827361d5f5ede65fde7d6be2b3
2017-02-05 10:44:48 +08:00
caoyuan
5c6cddbcf6 Remove the unnecessary "if" condition
TrivialFix

Change-Id: Ib7f07b88055594e594604ed2c4471058719cba56
2016-10-22 00:20:18 +08:00
Serguei Bezverkhi
46b41d2fad Adding kubetoolbox image
This PS adds kubetoolbox image which is required for Kubernetes
fencing pod. This image includes, kubectl binary, ceph-common and ipmi.

Change-Id: I17b2a47b95ed7dea391f1427a41c92b15c97986d
Partially-Implements: blueprint kubernetes-toolbox
2016-10-18 14:03:44 -04:00