Merge pull request #9753 from heitbaum/focal

tools/docker/focal: update Dockerfile to use golang-1.20
This commit is contained in:
Christian Hewitt 2025-02-04 17:36:47 +04:00 committed by GitHub
commit a9f6a4de83
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -20,10 +20,12 @@ RUN adduser --disabled-password --gecos '' docker \
RUN apt-get update && apt-get install -y \ 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 \ 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 \ 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 \ libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \
golang-1.18-go git openssh-client rsync \ golang-1.20-go git openssh-client rsync \
--no-install-recommends \ --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/* && rm -rf /var/lib/apt/lists/*
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \ RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \