From f18ed90d4f8190850553a1c20e38390c60d220a9 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 17 Jul 2017 11:24:21 +0100 Subject: [PATCH] kubernetes: Add local scripts after downloads Caches much better. Signed-off-by: Ian Campbell --- projects/kubernetes/kubernetes/Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/projects/kubernetes/kubernetes/Dockerfile b/projects/kubernetes/kubernetes/Dockerfile index 3ddda9ca8..6a39d6910 100644 --- a/projects/kubernetes/kubernetes/Dockerfile +++ b/projects/kubernetes/kubernetes/Dockerfile @@ -30,9 +30,6 @@ RUN apk add --no-cache --initdb -p /out \ # Remove apk residuals. We have a read-only rootfs, so apk is of no use. RUN rm -rf /out/etc/apk /out/lib/apk /out/var/cache -ADD kubelet.sh /out/usr/bin/kubelet.sh -ADD kubeadm-init.sh /out/usr/bin/kubeadm-init.sh - RUN curl -fSL -o /tmp/cni.tgz https://dl.k8s.io/network-plugins/cni-amd64-${cni_version}.tar.gz && \ mkdir -p /out/opt/cni /out/etc/cni/net.d && \ tar -xzf /tmp/cni.tgz -C /out/opt/cni @@ -41,6 +38,9 @@ RUN curl -fSL -o /out/usr/bin/kubelet https://dl.k8s.io/${kubernetes_version}/bi RUN curl -fSL -o /out/usr/bin/kubeadm https://dl.k8s.io/${kubernetes_version}/bin/linux/amd64/kubeadm && chmod 0755 /out/usr/bin/kubeadm RUN curl -fSL -o /out/usr/bin/kubectl https://dl.k8s.io/${kubernetes_version}/bin/linux/amd64/kubectl && chmod 0755 /out/usr/bin/kubectl +ADD kubelet.sh /out/usr/bin/kubelet.sh +ADD kubeadm-init.sh /out/usr/bin/kubeadm-init.sh + FROM scratch WORKDIR / ENTRYPOINT ["/usr/bin/kubelet.sh"]