From 1be3607fa6e1915c338f75d58fd52c61801f90fe Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 4 Feb 2025 07:02:24 +0000 Subject: [PATCH] tools/docker/focal: update Dockerfile to use golang-1.20 --- tools/docker/focal/Dockerfile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/docker/focal/Dockerfile b/tools/docker/focal/Dockerfile index d010a4d34d..15513d7507 100644 --- a/tools/docker/focal/Dockerfile +++ b/tools/docker/focal/Dockerfile @@ -20,10 +20,12 @@ RUN adduser --disabled-password --gecos '' docker \ RUN apt-get update && apt-get install -y \ curl bash bc gcc-10 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \ unzip diffutils lzop make file g++-10 xfonts-utils xsltproc default-jre-headless python3 \ - libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl \ - golang-1.18-go git openssh-client rsync \ + libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \ + golang-1.20-go git openssh-client rsync \ --no-install-recommends \ - && ln -s /usr/lib/go-1.18 /usr/lib/go \ + && ln -s /usr/lib/go-1.20 /usr/lib/go \ + && ln -s /usr/lib/go-1.20/bin/go /usr/bin/go \ + && ln -s /usr/lib/go-1.20/bin/gofmt /usr/bin/gofmt \ && rm -rf /var/lib/apt/lists/* RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \