Merge pull request #10 from bitofsky/2024-03

update
bitofsky · Mar 14, 2024 · 50cb2b6 · 50cb2b6
2 parents 3e1c02d + c593682
commit 50cb2b6
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 18 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -7,10 +7,10 @@ ENV AWS_CLI 2.15.28
 RUN apt-get update -y && \
     apt-get install -y --no-install-recommends \
         ca-certificates \
-        python3 \
         curl \
         unzip && \
-    apt-get clean
+    apt-get clean && \
+    rm -rf /var/lib/apt/lists/*
 
 # install awscli v2. see https://docs.aws.amazon.com/cli/latest/userguide/getting-started-install.html
 RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI}.zip" -o /tmp/awscliv2.zip \
@@ -19,9 +19,6 @@ RUN curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-${AWS_CLI}.zip" -
     && rm /tmp/awscliv2.zip \
     && rm -rf /tmp/aws
 
-# install node packages
-RUN npm i -g pnpm@${PNPM_VERSION}
-
 RUN curl -L "https://github.com/moby/buildkit/releases/download/v0.13.0/buildkit-v0.13.0.linux-amd64.tar.gz" -o /tmp/buildkit.tar.gz \
     && mkdir -p /tmp/buildkit \
     && tar -C /tmp/buildkit -xzf /tmp/buildkit.tar.gz \
@@ -31,15 +28,7 @@ RUN curl -L "https://github.com/moby/buildkit/releases/download/v0.13.0/buildkit
     && rm /tmp/buildkit.tar.gz
 
 # install kubectl
-RUN curl -L "https://dl.k8s.io/release/v1.27.11/bin/linux/amd64/kubectl" -o "/usr/bin/kubectl-v1.27"
-RUN curl -L "https://dl.k8s.io/release/v1.28.7/bin/linux/amd64/kubectl" -o "/usr/bin/kubectl-v1.28"
-RUN curl -L "https://dl.k8s.io/release/v1.29.2/bin/linux/amd64/kubectl" -o "/usr/bin/kubectl-v1.29" && chmod a+x /usr/bin/kubectl*
-
-RUN ln -s /usr/bin/kubectl-v1.29 /usr/bin/kubectl
-
-# runner
-FROM node:18.12.0-slim as runner
-COPY --link --from=builder /usr /usr
+COPY --link --from=bitnami/kubectl:1.29.2 /opt/bitnami/kubectl/bin/kubectl /usr/bin/kubectl
 
 # install golang
 COPY --link --from=golang:1.20.2 /usr/local/go/ /usr/local/go/
@@ -50,4 +39,3 @@ RUN mkdir -p "$GOPATH/src" "$GOPATH/bin" && chmod -R 777 "$GOPATH" && \
     ln -s /bin/bash /usr/bin/bash && \
     ln -s /bin/sh /usr/bin/sh && \
     npm i -g pnpm@${PNPM_VERSION}
-
diff --git a/README.md b/README.md
@@ -6,8 +6,8 @@ Includes:
 - PNPM 8.6.12
 - Golang 1.20.2
 - Docker base image: node:18.12.0-slim
-- Additional tools: ca-certificates, awscli v2, python3, curl
-- Moby BuildKit v0.11.4
-- kubectl v1.27 ~ v1.29 (default v1.29)
+- Additional tools: ca-certificates, awscli v2, curl, unzip
+- Moby BuildKit v0.13.0
+- kubectl v1.29.2
 
 This container image is designed for both Node.js and Golang development. It includes a variety of packages and tools that will streamline your workflow and improve productivity.