From 9d17ec28ef7eabcf61ec18f375f8285d2db4bb20 Mon Sep 17 00:00:00 2001 From: "Yosi.Zanko" Date: Thu, 3 Nov 2022 15:58:17 +0200 Subject: [PATCH 1/4] CR-13216 - wip --- Dockerfile | 128 +++++++++++++++++++++++++---------------------------- 1 file changed, 61 insertions(+), 67 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3cb9595..50f9fe1 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,67 +1,61 @@ -FROM alpine:3.6 AS builder - -RUN apk update && apk add curl - -RUN export ARCH=$([[ "$(uname -m)" == "aarch64" ]] && echo "arm64" || echo "amd64") && \ - curl -o kubectl1.22 -L https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.21 -L https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.20 -L https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.19 -L https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.18 -L https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.17 -L https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.16 -L https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.15 -L https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.14 -L https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.13 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.12 -L https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.11 -L https://storage.googleapis.com/kubernetes-release/release/v1.11.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.10 -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/${ARCH}/kubectl && \ - curl -o kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/${ARCH}/kubectl - - -FROM alpine:3.15.6 - -RUN apk --no-cache update && apk upgrade && apk add --update bash - -#copy all versions of kubectl to switch between them later. -COPY --from=builder kubectl1.22 /usr/local/bin/ -COPY --from=builder kubectl1.21 /usr/local/bin/ -COPY --from=builder kubectl1.20 /usr/local/bin/ -COPY --from=builder kubectl1.19 /usr/local/bin/ -COPY --from=builder kubectl1.18 /usr/local/bin/ -COPY --from=builder kubectl1.17 /usr/local/bin/ -COPY --from=builder kubectl1.16 /usr/local/bin/ -COPY --from=builder kubectl1.15 /usr/local/bin/ -COPY --from=builder kubectl1.14 /usr/local/bin/ -COPY --from=builder kubectl1.13 /usr/local/bin/ -COPY --from=builder kubectl1.12 /usr/local/bin/ -COPY --from=builder kubectl1.11 /usr/local/bin/ -COPY --from=builder kubectl1.10 /usr/local/bin/kubectl -COPY --from=builder kubectl1.6 /usr/local/bin/ - -RUN chmod +x /usr/local/bin/kubectl \ - /usr/local/bin/kubectl1.6 \ - /usr/local/bin/kubectl1.11 \ - /usr/local/bin/kubectl1.12 \ - /usr/local/bin/kubectl1.13 \ - /usr/local/bin/kubectl1.14 \ - /usr/local/bin/kubectl1.15 \ - /usr/local/bin/kubectl1.16 \ - /usr/local/bin/kubectl1.17 \ - /usr/local/bin/kubectl1.18 \ - /usr/local/bin/kubectl1.19 \ - /usr/local/bin/kubectl1.20 \ - /usr/local/bin/kubectl1.21 \ - /usr/local/bin/kubectl1.22 - -WORKDIR / - -ADD cf-deploy-kubernetes.sh /cf-deploy-kubernetes -ADD template.sh /template.sh - -RUN adduser -D -h /home/cfu -s /bin/bash cfu \ - && chgrp -R $(id -g cfu) /cf-deploy-kubernetes /usr/local/bin /template.sh \ - && chmod -R g+rwX /cf-deploy-kubernetes /usr/local/bin /template.sh -USER cfu - -CMD ["bash"] +FROM debian:bullseye-slim + +RUN apt-get update && apt upgrade -y +RUN apt-get install curl bash -y +RUN export ARCH=$([[ "$(uname -m)" == "aarch64" ]] && echo "arm64" || echo "amd64") + +RUN curl -o kubectl1.22 -L https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.21 -L https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.20 -L https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.19 -L https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.18 -L https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.17 -L https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.16 -L https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.15 -L https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.14 -L https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.13 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.12 -L https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.11 -L https://storage.googleapis.com/kubernetes-release/release/v1.11.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.10 -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/${ARCH}/kubectl && \ +curl -o kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/${ARCH}/kubectl && \ +COPY kubectl1.22 /usr/local/bin/ +#COPY kubectl1.21 /usr/local/bin/ +#COPY kubectl1.20 /usr/local/bin/ +#COPY kubectl1.19 /usr/local/bin/ +#COPY kubectl1.18 /usr/local/bin/ +#COPY kubectl1.17 /usr/local/bin/ +#COPY kubectl1.16 /usr/local/bin/ +#COPY kubectl1.15 /usr/local/bin/ +#COPY kubectl1.14 /usr/local/bin/ +#COPY kubectl1.13 /usr/local/bin/ +#COPY kubectl1.12 /usr/local/bin/ +#COPY kubectl1.11 /usr/local/bin/ +#COPY kubectl1.10 /usr/local/bin/kubectl +#COPY kubectl1.6 /usr/local/bin/ +# +#RUN chmod +x /usr/local/bin/kubectl \ +# /usr/local/bin/kubectl1.6 \ +# /usr/local/bin/kubectl1.11 \ +# /usr/local/bin/kubectl1.12 \ +# /usr/local/bin/kubectl1.13 \ +# /usr/local/bin/kubectl1.14 \ +# /usr/local/bin/kubectl1.15 \ +# /usr/local/bin/kubectl1.16 \ +# /usr/local/bin/kubectl1.17 \ +# /usr/local/bin/kubectl1.18 \ +# /usr/local/bin/kubectl1.19 \ +# /usr/local/bin/kubectl1.20 \ +# /usr/local/bin/kubectl1.21 \ +# /usr/local/bin/kubectl1.22 +# +#WORKDIR / +# +#ADD cf-deploy-kubernetes.sh /cf-deploy-kubernetes +#ADD template.sh /template.sh +# +#RUN adduser -D -h /home/cfu -s /bin/bash cfu \ +# && chgrp -R $(id -g cfu) /cf-deploy-kubernetes /usr/local/bin /template.sh \ +# && chmod -R g+rwX /cf-deploy-kubernetes /usr/local/bin /template.sh +#USER cfu +# +#CMD ["bash"] From f095e0a4502778a30dae8348e5f0f5a5eff5be47 Mon Sep 17 00:00:00 2001 From: "Yosi.Zanko" Date: Thu, 3 Nov 2022 18:22:35 +0200 Subject: [PATCH 2/4] CR-13216 - wip --- Dockerfile | 94 +++++++++++++++++++++++------------------------------- 1 file changed, 40 insertions(+), 54 deletions(-) diff --git a/Dockerfile b/Dockerfile index 50f9fe1..0e50f3c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,58 +4,44 @@ RUN apt-get update && apt upgrade -y RUN apt-get install curl bash -y RUN export ARCH=$([[ "$(uname -m)" == "aarch64" ]] && echo "arm64" || echo "amd64") -RUN curl -o kubectl1.22 -L https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.21 -L https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.20 -L https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.19 -L https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.18 -L https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.17 -L https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.16 -L https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.15 -L https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.14 -L https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.13 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.12 -L https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.11 -L https://storage.googleapis.com/kubernetes-release/release/v1.11.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.10 -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/${ARCH}/kubectl && \ -curl -o kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/${ARCH}/kubectl && \ -COPY kubectl1.22 /usr/local/bin/ -#COPY kubectl1.21 /usr/local/bin/ -#COPY kubectl1.20 /usr/local/bin/ -#COPY kubectl1.19 /usr/local/bin/ -#COPY kubectl1.18 /usr/local/bin/ -#COPY kubectl1.17 /usr/local/bin/ -#COPY kubectl1.16 /usr/local/bin/ -#COPY kubectl1.15 /usr/local/bin/ -#COPY kubectl1.14 /usr/local/bin/ -#COPY kubectl1.13 /usr/local/bin/ -#COPY kubectl1.12 /usr/local/bin/ -#COPY kubectl1.11 /usr/local/bin/ -#COPY kubectl1.10 /usr/local/bin/kubectl -#COPY kubectl1.6 /usr/local/bin/ -# -#RUN chmod +x /usr/local/bin/kubectl \ -# /usr/local/bin/kubectl1.6 \ -# /usr/local/bin/kubectl1.11 \ -# /usr/local/bin/kubectl1.12 \ -# /usr/local/bin/kubectl1.13 \ -# /usr/local/bin/kubectl1.14 \ -# /usr/local/bin/kubectl1.15 \ -# /usr/local/bin/kubectl1.16 \ -# /usr/local/bin/kubectl1.17 \ -# /usr/local/bin/kubectl1.18 \ -# /usr/local/bin/kubectl1.19 \ -# /usr/local/bin/kubectl1.20 \ -# /usr/local/bin/kubectl1.21 \ -# /usr/local/bin/kubectl1.22 -# -#WORKDIR / -# -#ADD cf-deploy-kubernetes.sh /cf-deploy-kubernetes -#ADD template.sh /template.sh -# -#RUN adduser -D -h /home/cfu -s /bin/bash cfu \ -# && chgrp -R $(id -g cfu) /cf-deploy-kubernetes /usr/local/bin /template.sh \ -# && chmod -R g+rwX /cf-deploy-kubernetes /usr/local/bin /template.sh -#USER cfu +RUN curl -o /usr/local/bin/kubectl1.22 -L https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.21 -L https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.20 -L https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.19 -L https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.18 -L https://storage.googleapis.com/kubernetes-release/release/v1.18.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.17 -L https://storage.googleapis.com/kubernetes-release/release/v1.17.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.16 -L https://storage.googleapis.com/kubernetes-release/release/v1.16.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.15 -L https://storage.googleapis.com/kubernetes-release/release/v1.15.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.14 -L https://storage.googleapis.com/kubernetes-release/release/v1.14.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.13 -L https://storage.googleapis.com/kubernetes-release/release/v1.13.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.12 -L https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.11 -L https://storage.googleapis.com/kubernetes-release/release/v1.11.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/${ARCH}/kubectl && \ +curl -o /usr/local/bin/kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/${ARCH}/kubectl + +RUN chmod +x /usr/local/bin/kubectl \ + /usr/local/bin/kubectl1.6 \ + /usr/local/bin/kubectl1.11 \ + /usr/local/bin/kubectl1.12 \ + /usr/local/bin/kubectl1.13 \ + /usr/local/bin/kubectl1.14 \ + /usr/local/bin/kubectl1.15 \ + /usr/local/bin/kubectl1.16 \ + /usr/local/bin/kubectl1.17 \ + /usr/local/bin/kubectl1.18 \ + /usr/local/bin/kubectl1.19 \ + /usr/local/bin/kubectl1.20 \ + /usr/local/bin/kubectl1.21 \ + /usr/local/bin/kubectl1.22 + +WORKDIR / + +ADD cf-deploy-kubernetes.sh /cf-deploy-kubernetes +ADD template.sh /template.sh + +RUN adduser --disabled-password --home /home/cfu --shell /bin/bash cfu \ + && chgrp -R $(id -g cfu) /cf-deploy-kubernetes /usr/local/bin /template.sh \ + && chmod -R g+rwX /cf-deploy-kubernetes /usr/local/bin /template.sh +USER cfu # -#CMD ["bash"] +CMD ["bash"] From 03527515f421daf18d1f31bdcae337e3ab567bd4 Mon Sep 17 00:00:00 2001 From: "Yosi.Zanko" Date: Thu, 3 Nov 2022 18:26:23 +0200 Subject: [PATCH 3/4] CR-13216 - bumping --- service.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/service.yaml b/service.yaml index f8549eb..b047b18 100644 --- a/service.yaml +++ b/service.yaml @@ -1 +1 @@ -version: 16.1.11 +version: 16.1.12 From 13ebea22fb607bea73e11292e1d69a3fac63556d Mon Sep 17 00:00:00 2001 From: "Yosi.Zanko" Date: Sun, 6 Nov 2022 13:39:51 +0200 Subject: [PATCH 4/4] CR-13216 - removing curl after using it --- Dockerfile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0e50f3c..3cbb2e3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,10 +1,9 @@ FROM debian:bullseye-slim -RUN apt-get update && apt upgrade -y -RUN apt-get install curl bash -y -RUN export ARCH=$([[ "$(uname -m)" == "aarch64" ]] && echo "arm64" || echo "amd64") -RUN curl -o /usr/local/bin/kubectl1.22 -L https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/${ARCH}/kubectl && \ +RUN export ARCH=$([[ "$(uname -m)" == "aarch64" ]] && echo "arm64" || echo "amd64") +RUN apt-get update && apt upgrade -y && apt-get install curl bash -y && \ +curl -o /usr/local/bin/kubectl1.22 -L https://storage.googleapis.com/kubernetes-release/release/v1.22.0/bin/linux/${ARCH}/kubectl && \ curl -o /usr/local/bin/kubectl1.21 -L https://storage.googleapis.com/kubernetes-release/release/v1.21.0/bin/linux/${ARCH}/kubectl && \ curl -o /usr/local/bin/kubectl1.20 -L https://storage.googleapis.com/kubernetes-release/release/v1.20.0/bin/linux/${ARCH}/kubectl && \ curl -o /usr/local/bin/kubectl1.19 -L https://storage.googleapis.com/kubernetes-release/release/v1.19.0/bin/linux/${ARCH}/kubectl && \ @@ -17,7 +16,9 @@ curl -o /usr/local/bin/kubectl1.13 -L https://storage.googleapis.com/kubernetes- curl -o /usr/local/bin/kubectl1.12 -L https://storage.googleapis.com/kubernetes-release/release/v1.12.0/bin/linux/${ARCH}/kubectl && \ curl -o /usr/local/bin/kubectl1.11 -L https://storage.googleapis.com/kubernetes-release/release/v1.11.0/bin/linux/${ARCH}/kubectl && \ curl -o /usr/local/bin/kubectl -L https://storage.googleapis.com/kubernetes-release/release/v1.10.0/bin/linux/${ARCH}/kubectl && \ -curl -o /usr/local/bin/kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/${ARCH}/kubectl +curl -o /usr/local/bin/kubectl1.6 -L https://storage.googleapis.com/kubernetes-release/release/v1.6.0/bin/linux/${ARCH}/kubectl && \ +apt-get purge curl -y && apt-get clean + RUN chmod +x /usr/local/bin/kubectl \ /usr/local/bin/kubectl1.6 \