Skip to content

Commit e32f67b

Browse files
committed
refactor: Replaced rt-tests installation from source with Debian package
1 parent 79a6bf3 commit e32f67b

File tree

1 file changed

+5
-13
lines changed

1 file changed

+5
-13
lines changed

docker/Dockerfile

+5-13
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@ ARG DEBIAN_FRONTEND=noninteractive
1010
# Dependencies for latency plot
1111
RUN apt-get update && apt-get install -y \
1212
curl \
13-
grep \
1413
build-essential \
1514
make \
1615
libnuma-dev \
@@ -23,19 +22,12 @@ RUN apt-get update && apt-get install -y \
2322
dialog \
2423
tmux
2524

26-
# Fetch most recent version of rt-tests and mklatencyplot
27-
RUN cd ${WS_DIR} \
28-
&& RT_TESTS=$(echo $(curl -Ls https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests | grep -o -P '(?<=href\=\")(rt-tests-2.*)(?=.tar.xz\">)')) \
29-
&& curl -SLO --fail https://mirrors.edge.kernel.org/pub/linux/utils/rt-tests/${RT_TESTS}.tar.xz \
30-
&& tar -xf ${RT_TESTS}.tar.xz \
31-
&& cd ${RT_TESTS} \
32-
&& make \
33-
&& make install \
34-
&& cd .. \
35-
&& rm -r ${RT_TESTS} \
36-
&& rm ${RT_TESTS}.tar.xz \
25+
# Cyclictest and mklatencyplot
26+
RUN apt-get update && apt-get install -y \
27+
rt-tests \
28+
&& cd ${WS_DIR} \
3729
&& curl -SLO --fail https://www.osadl.org/uploads/media/mklatencyplot.bash \
38-
# && sed -i -E "s/(cores=).*/\1\$(nproc)/" ${WS_DIR}/mklatencyplot.bash \
30+
&& sed -i -E "s/(cores=).*/\1\$(nproc)/" mklatencyplot.bash \
3931
&& chmod +x mklatencyplot.bash
4032

4133
ARG DEBIAN_FRONTEND=dialog

0 commit comments

Comments
 (0)