From c6e385d76b6e266b5223217f12f5558b5d7db67f Mon Sep 17 00:00:00 2001 From: Craig Comstock Date: Fri, 3 Oct 2025 09:01:15 -0500 Subject: [PATCH] Adjusted valgrind-check Containerfile to ensure apt update and install are linked and cached together in one layer Otherwise, the update layer can be cached and have bad information for the subsequent two install command layers. As the distribution changes package versions the install layers, if they are not cached, will fail. Also combined the two install commands into one for brevity. Ticket: ENT-13252 Changelog: none --- tests/valgrind-check/Containerfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tests/valgrind-check/Containerfile b/tests/valgrind-check/Containerfile index a7243e5c1f..72cac93e16 100644 --- a/tests/valgrind-check/Containerfile +++ b/tests/valgrind-check/Containerfile @@ -1,7 +1,6 @@ FROM ubuntu:24.04 AS build -RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --fix-missing -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libssl-dev libxml2-dev libpam0g-dev liblmdb-dev libacl1-dev libpcre2-dev librsync-dev -RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python3 git flex bison byacc automake make autoconf libtool valgrind curl +RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --fix-missing && \ + DEBIAN_FRONTEND=noninteractive apt-get install -y libssl-dev libxml2-dev libpam0g-dev liblmdb-dev libacl1-dev libpcre2-dev librsync-dev python3 git flex bison byacc automake make autoconf libtool valgrind curl COPY masterfiles masterfiles COPY core core WORKDIR core