Skip to content

Commit 92b1f53

Browse files
committed
adding -y on apt-get installs
1 parent 34fcd34 commit 92b1f53

3 files changed

Lines changed: 6 additions & 53 deletions

File tree

scripts/docker/build/ubuntu24/Dockerfile.cb

Lines changed: 0 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -32,53 +32,6 @@ RUN apt-get update && \
3232
rm -r /var/lib/apt/lists/*
3333

3434

35-
#
36-
# Install profiling tools
37-
#
38-
RUN apt-get update && \
39-
apt-get install $APT_OPTS \
40-
libgoogle-perftools-dev \
41-
google-perftools \
42-
valgrind \
43-
heaptrack \
44-
psmisc \
45-
kcachegrind \
46-
kio \
47-
libkf5iconthemes5 \
48-
libkf5parts5 \
49-
libkf5textwidgets5 \
50-
libqt5gui5 \
51-
libqt5widgets5 && \
52-
apt-get clean && \
53-
rm -r /var/lib/apt/lists/*
54-
55-
#
56-
# Set up Ubuntu debug symbol repository and install OS library debug symbols.
57-
# These allow callgrind/valgrind to resolve system library calls (glibc,
58-
# OpenSSL, talloc, etc.) to named symbols instead of hex addresses.
59-
#
60-
RUN apt-get update && \
61-
apt-get install $APT_OPTS ubuntu-dbgsym-keyring && \
62-
printf 'deb http://ddebs.ubuntu.com noble main restricted universe multiverse\ndeb http://ddebs.ubuntu.com noble-updates main restricted universe multiverse\n' \
63-
> /etc/apt/sources.list.d/ddebs.list && \
64-
apt-get update && \
65-
apt-get install $APT_OPTS \
66-
libc6-dbg \
67-
libssl3t64-dbgsym \
68-
libtalloc2-dbgsym \
69-
libpcre2-8-0-dbgsym \
70-
libsqlite3-0-dbgsym && \
71-
apt-get clean && \
72-
rm -r /var/lib/apt/lists/*
73-
74-
#
75-
# Install FlameGraph scripts
76-
#
77-
RUN git clone --depth 1 https://github.com/brendangregg/FlameGraph /opt/flamegraph \
78-
&& chmod +x /opt/flamegraph/*.pl /opt/flamegraph/*.sh
79-
80-
ENV PATH="/opt/flamegraph:${PATH}"
81-
8235
#
8336
# Set up NetworkRADIUS extras repository
8437
#

scripts/docker/build/ubuntu24/Dockerfile.prof

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ COPY scripts/docker/profiling/profiles/default-profiling /profile
1313
# Install profiling tools
1414
#
1515
RUN apt-get update && \
16-
apt-get install $APT_OPTS \
16+
apt-get install -y $APT_OPTS \
1717
libgoogle-perftools-dev \
1818
google-perftools \
1919
valgrind \
@@ -35,11 +35,11 @@ RUN apt-get update && \
3535
# OpenSSL, talloc, etc.) to named symbols instead of hex addresses.
3636
#
3737
RUN apt-get update && \
38-
apt-get install $APT_OPTS ubuntu-dbgsym-keyring && \
38+
apt-get install -y $APT_OPTS ubuntu-dbgsym-keyring && \
3939
printf 'deb http://ddebs.ubuntu.com noble main restricted universe multiverse\ndeb http://ddebs.ubuntu.com noble-updates main restricted universe multiverse\n' \
4040
> /etc/apt/sources.list.d/ddebs.list && \
4141
apt-get update && \
42-
apt-get install $APT_OPTS \
42+
apt-get install -y $APT_OPTS \
4343
libc6-dbg \
4444
libssl3t64-dbgsym \
4545
libtalloc2-dbgsym \

scripts/docker/m4/profiling.deb.m4

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ COPY scripts/docker/profiling/profiles/PROFILE_NAME /profile
88
# Install profiling tools
99
#
1010
RUN apt-get update && \
11-
apt-get install $APT_OPTS \
11+
apt-get install -y $APT_OPTS \
1212
libgoogle-perftools-dev \
1313
google-perftools \
1414
valgrind \
@@ -30,11 +30,11 @@ RUN apt-get update && \
3030
# OpenSSL, talloc, etc.) to named symbols instead of hex addresses.
3131
#
3232
RUN apt-get update && \
33-
apt-get install $APT_OPTS ubuntu-dbgsym-keyring && \
33+
apt-get install -y $APT_OPTS ubuntu-dbgsym-keyring && \
3434
printf 'deb http://ddebs.ubuntu.com OS_CODENAME main restricted universe multiverse\ndeb http://ddebs.ubuntu.com OS_CODENAME-updates main restricted universe multiverse\n' \
3535
> /etc/apt/sources.list.d/ddebs.list && \
3636
apt-get update && \
37-
apt-get install $APT_OPTS \
37+
apt-get install -y $APT_OPTS \
3838
libc6-dbg \
3939
libssl3t64-dbgsym \
4040
libtalloc2-dbgsym \

0 commit comments

Comments
 (0)