Skip to content

Commit a14a257

Browse files
committed
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 (cherry picked from commit c6e385d) Conflicts: tests/valgrind-check/Containerfile To get a smaller change I just combined the update and install apt lines instead of also changing the ubuntu version and package list.
1 parent 8cc1c89 commit a14a257

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

tests/valgrind-check/Containerfile

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
FROM ubuntu:20.04 AS build
2-
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --fix-missing
3-
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y libssl-dev libxml2-dev libpam0g-dev liblmdb-dev libacl1-dev libpcre3 libpcre3-dev
4-
RUN DEBIAN_FRONTEND=noninteractive apt-get install -y python git flex bison byacc automake make autoconf libtool valgrind curl
2+
RUN DEBIAN_FRONTEND=noninteractive apt-get update -y --fix-missing \
3+
DEBIAN_FRONTEND=noninteractive apt-get install -y libssl-dev libxml2-dev libpam0g-dev liblmdb-dev libacl1-dev libpcre3 libpcre3-dev python git flex bison byacc automake make autoconf libtool valgrind curl
54
COPY masterfiles masterfiles
65
COPY core core
76
WORKDIR core

0 commit comments

Comments
 (0)