From 793a998e5a323eb800718098e2509c6b2dde4cfd Mon Sep 17 00:00:00 2001 From: Kalaiselvim <117940852+Kalaiselvi84@users.noreply.github.com> Date: Fri, 16 Feb 2024 20:11:02 +0000 Subject: [PATCH] Switch to debian:bookworm (#3657) --- build/build-image/Dockerfile | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/build/build-image/Dockerfile b/build/build-image/Dockerfile index 0f7abd229c..c57299b35b 100644 --- a/build/build-image/Dockerfile +++ b/build/build-image/Dockerfile @@ -14,13 +14,18 @@ # ForceUpdate 12 -- change here if you need to force a rebuild -FROM debian:bullseye +FROM debian:bookworm RUN apt-get update && \ - apt-get install -y build-essential gnupg curl git wget psmisc rsync make python bash-completion \ - zip nano jq graphviz gettext-base plantuml software-properties-common && \ + apt-get install -y build-essential gnupg curl git wget psmisc rsync make python3 bash-completion \ + zip nano jq graphviz gettext-base plantuml software-properties-common ruby-full && \ apt-get clean +RUN gem install fpm && \ + fpm -s empty -t deb -p python2.7-0.0.0-0-any.deb --name python2.7 --license MIT --version 0.0.0 --architecture all --description 'Dummy package to satisfy google-cloud-cli dependencies.' --maintainer 'Yourself' && \ + dpkg -i python2.7-0.0.0-0-any.deb && \ + rm python2.7-0.0.0-0-any.deb + # install go WORKDIR /usr/local ENV GO_VERSION=1.21.6 @@ -70,10 +75,9 @@ RUN echo "source <(helm completion bash)" >> /root/.bashrc # install golang-ci linter RUN go install github.com/golangci/golangci-lint/cmd/golangci-lint@v1.51.2 -# Install Python, pip, and yamllint +# Install yamllint RUN apt-get update && \ - apt-get install -y python3-pip && \ - pip3 install yamllint==1.32.0 + apt-get install -y yamllint # install gotestsum test runner RUN go install gotest.tools/gotestsum@latest