bump

Author: Timur Galeev

alpine/Dockerfile

@@ -31,24 +31,8 @@ RUN apk --no-cache add \
   && rm glibc-bin-${GLIBC_VER}.apk \
   && rm -rf /var/cache/apk/*
 
-RUN apk add docker
-
-# buildx
-COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
-
-# kubectl
-ENV kubectl v1.23.4
-RUN curl -sLo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${kubectl}/bin/linux/amd64/kubectl && \
-  chmod +x /usr/local/bin/kubectl
-
-# helm
-ENV helm v3.8.1
-RUN curl -sL https://get.helm.sh/helm-${helm}-linux-amd64.tar.gz | tar xz && \
-  mv linux-amd64/helm /usr/local/bin/helm && \
-  chmod +x /usr/local/bin/helm
-
 VOLUME /root/.aws
-VOLUME /root/.kube
-VOLUME /root/.helm
 
-ENTRYPOINT ["bash"]
+RUN aws --version
+
+ENTRYPOINT ["aws"]

kube/Dockerfile

@@ -1,35 +1,51 @@
 # Dockerfile
 
-FROM docker
-
-RUN apk add -v --update bash curl python3 py-pip jq git file tar && \
-    apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing hub
-
-# awscli
-ENV awscli 1.27.94
-RUN pip install --upgrade awscli==${awscli} && \
-    apk del -v --purge py-pip && \
-    rm /var/cache/apk/*
+FROM alpine
+
+ENV GLIBC_VER=2.31-r0
+
+RUN apk --no-cache update && \
+  apk add --no-cache bash curl python3 py3-pip jq git file tar && \
+  apk add --no-cache -X http://dl-cdn.alpinelinux.org/alpine/edge/testing hub
+
+RUN apk --no-cache add \
+  binutils \
+  && curl -sL https://alpine-pkgs.sgerrand.com/sgerrand.rsa.pub -o /etc/apk/keys/sgerrand.rsa.pub \
+  && curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-${GLIBC_VER}.apk \
+  && curl -sLO https://github.com/sgerrand/alpine-pkg-glibc/releases/download/${GLIBC_VER}/glibc-bin-${GLIBC_VER}.apk \
+  && apk add --no-cache \
+  glibc-${GLIBC_VER}.apk \
+  glibc-bin-${GLIBC_VER}.apk \
+  && curl -sL https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip -o awscliv2.zip \
+  && unzip awscliv2.zip \
+  && aws/install \
+  && rm -rf \
+  awscliv2.zip \
+  aws \
+  /usr/local/aws-cli/v2/*/dist/aws_completer \
+  /usr/local/aws-cli/v2/*/dist/awscli/data/ac.index \
+  /usr/local/aws-cli/v2/*/dist/awscli/examples \
+  && apk --no-cache del \
+  binutils \
+  && rm glibc-${GLIBC_VER}.apk \
+  && rm glibc-bin-${GLIBC_VER}.apk \
+  && rm -rf /var/cache/apk/*
+
+RUN apk add docker
+
+# buildx
+COPY --from=docker/buildx-bin /buildx /usr/libexec/docker/cli-plugins/docker-buildx
 
 # kubectl
-ENV kubectl v1.26.3
+ENV kubectl v1.23.4
 RUN curl -sLo /usr/local/bin/kubectl https://storage.googleapis.com/kubernetes-release/release/${kubectl}/bin/linux/amd64/kubectl && \
-    chmod +x /usr/local/bin/kubectl
+  chmod +x /usr/local/bin/kubectl
 
 # helm
-ENV helm v3.11.2
+ENV helm v3.8.1
 RUN curl -sL https://get.helm.sh/helm-${helm}-linux-amd64.tar.gz | tar xz && \
-    mv linux-amd64/helm /usr/local/bin/helm && \
-    chmod +x /usr/local/bin/helm
-
-# helm plugin
-RUN helm plugin install https://github.com/chartmuseum/helm-push
-
-# aws-iam-authenticator
-RUN curl -sLo /bin/aws-iam-authenticator https://amazon-eks.s3-us-west-2.amazonaws.com/1.11.5/2018-12-06/bin/linux/amd64/aws-iam-authenticator && \
-    chmod +x /bin/aws-iam-authenticator
-
-COPY .m2/ /root/.m2/
+  mv linux-amd64/helm /usr/local/bin/helm && \
+  chmod +x /usr/local/bin/helm
 
 VOLUME /root/.aws
 VOLUME /root/.kube