From 74f556207501b037b64ca1075671b3d469e574d1 Mon Sep 17 00:00:00 2001 From: Andrew Rynhard Date: Wed, 11 Nov 2020 06:50:59 -0800 Subject: [PATCH] feat: upgrade Ceph to octopus Brings in an updated version of the Ceph. Signed-off-by: Andrew Rynhard --- Dockerfile | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 971b182..66ab0d6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,9 +8,9 @@ ARG KUBELET_VER ARG KUBELET_SHA512_AMD64 ARG KUBELET_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBELET_VER}/bin/linux/${TARGETARCH}/kubelet -RUN wget -q -O /kubelet ${KUBELET_URL} && \ - echo "${KUBELET_SHA512_AMD64} /kubelet" | sha512sum -c && \ - chmod +x /kubelet +RUN wget -q -O /kubelet ${KUBELET_URL} \ + && echo "${KUBELET_SHA512_AMD64} /kubelet" | sha512sum -c \ + && chmod +x /kubelet FROM alpine:latest as builder-arm64 @@ -19,9 +19,9 @@ ARG KUBELET_VER ARG KUBELET_SHA512_ARM64 ARG KUBELET_URL=https://storage.googleapis.com/kubernetes-release/release/${KUBELET_VER}/bin/linux/${TARGETARCH}/kubelet -RUN wget -q -O /kubelet ${KUBELET_URL} && \ - echo "${KUBELET_SHA512_ARM64} /kubelet" | sha512sum -c && \ - chmod +x /kubelet +RUN wget -q -O /kubelet ${KUBELET_URL} \ + && echo "${KUBELET_SHA512_ARM64} /kubelet" | sha512sum -c \ + && chmod +x /kubelet ARG TARGETARCH FROM builder-${TARGETARCH} as builder @@ -31,7 +31,8 @@ FROM us.gcr.io/k8s-artifacts-prod/build-image/debian-iptables:v12.1.2 as contain RUN clean-install \ bash \ ca-certificates \ - ceph-common \ + wget \ + gnupg \ cifs-utils \ e2fsprogs \ xfsprogs \ @@ -45,6 +46,11 @@ RUN clean-install \ udev \ util-linux +RUN wget -q -O- 'https://download.ceph.com/keys/release.asc' | apt-key add - +RUN echo deb https://download.ceph.com/debian-octopus/ buster main | tee /etc/apt/sources.list.d/ceph.list +RUN apt-get clean \ + && clean-install ceph-common + COPY --from=builder /kubelet /usr/local/bin/kubelet LABEL org.opencontainers.image.source https://github.com/talos-systems/kubelet