Skip to content

Commit 4e26e7e

Browse files
committed
chore: fix docker build
1 parent 708ae2d commit 4e26e7e

1 file changed

Lines changed: 19 additions & 13 deletions

File tree

Dockerfile

Lines changed: 19 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,6 @@ RUN --mount=type=cache,target=/var/lib/apt \
2424
RUN locale-gen en_US.UTF-8
2525
RUN update-locale LANG=en_US.UTF-8
2626

27-
# stern, jq, yq
28-
RUN curl -sLS https://get.arkade.dev | sh && \
29-
arkade get kubectl jq yq sops --path /usr/bin && \
30-
chmod +x /usr/bin/kubectl /usr/bin/jq /usr/bin/yq /usr/bin/sops
31-
32-
# Minimalized Google cloud sdk
33-
FROM base AS gcloud-installer
34-
3527
ENV GCLOUD_PATH=/opt/google-cloud-sdk
3628
ENV PATH $GCLOUD_PATH/bin:$PATH
3729
ENV CLOUDSDK_PYTHON=/usr/bin/python3
@@ -55,17 +47,31 @@ fi && \
5547
gcloud --version
5648

5749

58-
FROM base AS final
50+
FROM debian:bookworm
5951

6052
# Install all locales
6153

54+
WORKDIR /app
55+
ENV DEBIAN_FRONTEND=noninteractive
56+
57+
RUN --mount=type=cache,target=/var/lib/apt \
58+
--mount=type=cache,target=/var/cache/apt \
59+
apt-get update && \
60+
apt-get install --no-install-recommends -y curl unzip ca-certificates zip tzdata wget gnupg2 bzip2 apt-transport-https locales locales-all lsb-release git python3-crcmod python3-openssl
6261

63-
ENV PATH /opt/google-cloud-sdk/bin:$PATH
62+
RUN locale-gen en_US.UTF-8
63+
RUN update-locale LANG=en_US.UTF-8
64+
65+
# stern, jq, yq
66+
RUN curl -sLS https://get.arkade.dev | sh && \
67+
arkade get kubectl jq yq sops --path /usr/bin && \
68+
chmod +x /usr/bin/kubectl /usr/bin/jq /usr/bin/yq /usr/bin/sops
69+
70+
ENV GCLOUD_PATH=/opt/google-cloud-sdk
71+
ENV PATH $GCLOUD_PATH/bin:$PATH
6472
ENV CLOUDSDK_PYTHON=/usr/bin/python3
65-
COPY --from=gcloud-installer /opt/google-cloud-sdk /opt/google-cloud-sdk
66-
# This is to be able to update gcloud packages
67-
RUN git config --system credential.'https://source.developers.google.com'.helper gcloud.sh
6873

74+
COPY --from=gcloud-installer /opt/google-cloud-sdk /opt/google-cloud-sdk
6975

7076
# Azure CLI
7177
RUN mkdir -p /etc/apt/keyrings && \

0 commit comments

Comments
 (0)