Merge pull request #10408 from heitbaum/docker122

[le12.2] Docker fix caching of apt update
This commit is contained in:
Ian Leonard
2025-08-23 20:45:51 -04:00
committed by GitHub
2 changed files with 4 additions and 6 deletions

View File

@@ -16,9 +16,8 @@ RUN adduser --disabled-password --gecos '' docker \
&& adduser docker sudo \
&& echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
RUN apt-get update
RUN apt-get install -y \
RUN apt-get update \
&& apt-get install -y \
wget bash bc gcc-12 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
unzip diffutils lzop make file g++-12 xfonts-utils xsltproc default-jre-headless python3 \
libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \

View File

@@ -15,9 +15,8 @@ ENV LANG=en_US.UTF-8 \
RUN useradd docker -U -G sudo -m -s /bin/bash \
&& echo '%sudo ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers
RUN apt-get update
RUN apt-get install -y \
RUN apt-get update \
&& apt-get install -y \
wget bash bc gcc-14 cpp-14 sed patch patchutils tar bzip2 gzip xz-utils zstd perl gawk gperf zip \
unzip diffutils lzop make file g++-14 xfonts-utils xsltproc default-jre-headless python3 \
libc6-dev libncurses5-dev libjson-perl libxml-parser-perl libparse-yapp-perl rdfind \