From 9818aafa65a4811a0621c11f1d13c3c238113233 Mon Sep 17 00:00:00 2001 From: nio Date: Fri, 8 Jul 2022 13:40:36 +0800 Subject: [PATCH] Delete Helm and Kustomize binaries in Dockerfile (#5041) remove helm and kustomize binary file --- build/ks-apiserver/Dockerfile | 7 ------- build/ks-controller-manager/Dockerfile | 17 +---------------- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/build/ks-apiserver/Dockerfile b/build/ks-apiserver/Dockerfile index b955e4573..fd2200415 100644 --- a/build/ks-apiserver/Dockerfile +++ b/build/ks-apiserver/Dockerfile @@ -5,9 +5,6 @@ # Download dependencies FROM alpine:3.11 as base_os_context -ARG TARGETARCH -ARG TARGETOS -ARG HELM_VERSION=v3.5.2 ENV OUTDIR=/out RUN mkdir -p ${OUTDIR}/usr/local/bin/ @@ -16,10 +13,6 @@ WORKDIR /tmp RUN apk add --no-cache ca-certificates -# install helm -ADD https://get.helm.sh/helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz /tmp -RUN tar xvzf /tmp/helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz -C /tmp -RUN mv /tmp/${TARGETOS}-${TARGETARCH}/helm ${OUTDIR}/usr/local/bin/ # Build FROM golang:1.16.3 as build_context diff --git a/build/ks-controller-manager/Dockerfile b/build/ks-controller-manager/Dockerfile index 67be4064f..5d7ea6afa 100644 --- a/build/ks-controller-manager/Dockerfile +++ b/build/ks-controller-manager/Dockerfile @@ -5,30 +5,15 @@ # Download dependencies FROM alpine:3.11 as base_os_context -ARG TARGETARCH -ARG TARGETOS -ARG HELM_VERSION=v3.5.2 -ARG KUSTOMIZE_VERSION=v4.2.0 ARG INGRESS_NGINX_VERSION=4.0.13 ENV OUTDIR=/out -RUN mkdir -p ${OUTDIR}/usr/local/bin RUN mkdir -p ${OUTDIR}/var/helm-charts WORKDIR /tmp RUN apk add --no-cache ca-certificates -# Install helm -ADD https://get.helm.sh/helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz /tmp -RUN tar xvzf /tmp/helm-${HELM_VERSION}-${TARGETOS}-${TARGETARCH}.tar.gz -C /tmp -RUN mv /tmp/${TARGETOS}-${TARGETARCH}/helm ${OUTDIR}/usr/local/bin/ - -# install kustomize -ADD https://github.com/kubernetes-sigs/kustomize/releases/download/kustomize%2F${KUSTOMIZE_VERSION}/kustomize_${KUSTOMIZE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz /tmp -RUN tar xvzf /tmp/kustomize_${KUSTOMIZE_VERSION}_${TARGETOS}_${TARGETARCH}.tar.gz -C /tmp -RUN mv /tmp/kustomize ${OUTDIR}/usr/local/bin/ - # Install Nginx Ingress Helm Chart ADD https://github.com/kubernetes/ingress-nginx/releases/download/helm-chart-${INGRESS_NGINX_VERSION}/ingress-nginx-${INGRESS_NGINX_VERSION}.tgz /tmp @@ -64,4 +49,4 @@ WORKDIR / EXPOSE 8443 8080 -CMD ["sh"] \ No newline at end of file +CMD ["sh"]