kubernetes: Drop custom mounts image and use standard one

Apart from the /var/lib mount itself the custom package:

- Made host /etc/cni and /opt/cni rshared. This has been handled by init make /
  rshared since 3c326bebdf ("Make / rshared").
- Make /var/lib/kubeadm after mount. For now handle this with a dedicated start
  of day container instead.

Signed-off-by: Ian Campbell <ijc@docker.com>
This commit is contained in:
Ian Campbell
2017-07-14 14:22:40 +01:00
parent 2cfac0e8bb
commit 32506bd7f7
5 changed files with 13 additions and 47 deletions

View File

@@ -1,6 +1,6 @@
all: build-container-images build-vm-images
BOX_PLANS = kubernetes.rb mounts.rb
BOX_PLANS = kubernetes.rb
build-container-images: $(BOX_PLANS)
for plan in $(BOX_PLANS) ; do \
@@ -13,7 +13,6 @@ build-container-images: $(BOX_PLANS)
push-container-images: build-container-images cache-images
docker image push linuxkit/kubernetes:latest
docker image push linuxkit/kubernetes:latest-mounts
docker image push linuxkit/kubernetes:latest-image-cache-common
docker image push linuxkit/kubernetes:latest-image-cache-control-plane