Skip to content

Commit 350c0ba

Browse files
committed
cleanup: Sort apk/apt install commands in Dockerfiles.
CodeQL scanning is complaining about this.
1 parent 8c1bda5 commit 350c0ba

File tree

3 files changed

+55
-18
lines changed

3 files changed

+55
-18
lines changed

other/bootstrap_daemon/docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ FROM alpine:3.19.0 AS build
55
RUN ["apk", "--no-cache", "add",\
66
"clang",\
77
"cmake",\
8-
"linux-headers",\
98
"libconfig-dev",\
109
"libconfig-static",\
1110
"libsodium-dev",\
1211
"libsodium-static",\
12+
"linux-headers",\
1313
"musl-dev",\
1414
"ninja",\
1515
"python3"]

other/docker/perf/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@ FROM alpine:3.14.0
33
RUN ["apk", "add", "--no-cache", \
44
"bash", \
55
"gcc", \
6-
"linux-headers", \
7-
"musl-dev", \
86
"libsodium-dev", \
97
"libvpx-dev", \
8+
"linux-headers", \
9+
"musl-dev", \
1010
"opus-dev", \
1111
"perf"]
1212

testing/Dockerfile

Lines changed: 52 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,22 +10,34 @@ ENV NO_ARCH_OPT 1
1010

1111
RUN apt-get update && \
1212
apt-get -y install --no-install-suggests --no-install-recommends \
13+
apt-transport-https \
14+
apt-utils \
1315
automake \
14-
ninja-build \
16+
bash-completion \
1517
bison flex \
1618
build-essential \
19+
ca-certificates \
20+
cmake \
21+
dialog \
1722
git \
18-
python3 python3-dev python3-setuptools python-is-python3 \
19-
libtool libtool-bin \
23+
gnupg \
24+
gnuplot-nox \
25+
jupp \
26+
less \
2027
libglib2.0-dev \
21-
wget vim jupp nano bash-completion less \
22-
apt-utils apt-transport-https ca-certificates gnupg dialog \
2328
libpixman-1-dev \
24-
gnuplot-nox \
25-
screen \
26-
cmake \
27-
parallel \
2829
libsodium-dev \
30+
libtool libtool-bin \
31+
nano \
32+
ninja-build \
33+
parallel \
34+
python-is-python3 \
35+
python3 \
36+
python3-dev \
37+
python3-setuptools \
38+
screen \
39+
vim \
40+
wget \
2941
&& rm -rf /var/lib/apt/lists/*
3042

3143
RUN echo "deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main" >> /etc/apt/sources.list && \
@@ -36,12 +48,37 @@ RUN echo "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu focal main
3648

3749
RUN apt-get update && apt-get full-upgrade -y && \
3850
apt-get -y install --no-install-suggests --no-install-recommends \
39-
gcc-10 g++-10 gcc-10-plugin-dev gcc-10-multilib gcc-multilib gdb lcov \
40-
clang-12 clang-tools-12 libc++1-12 libc++-12-dev \
41-
libc++abi1-12 libc++abi-12-dev libclang1-12 libclang-12-dev \
42-
libclang-common-12-dev libclang-cpp12 libclang-cpp12-dev liblld-12 \
43-
liblld-12-dev liblldb-12 liblldb-12-dev libllvm12 libomp-12-dev \
44-
libomp5-12 lld-12 lldb-12 llvm-12 llvm-12-dev llvm-12-runtime llvm-12-tools \
51+
clang-12 \
52+
clang-tools-12 \
53+
g++-10 \
54+
gcc-10 \
55+
gcc-10-multilib \
56+
gcc-10-plugin-dev \
57+
gcc-multilib \
58+
gdb \
59+
lcov \
60+
libc++-12-dev \
61+
libc++1-12 \
62+
libc++abi-12-dev \
63+
libc++abi1-12 \
64+
libclang-12-dev \
65+
libclang-common-12-dev \
66+
libclang-cpp12 \
67+
libclang-cpp12-dev \
68+
libclang1-12 \
69+
liblld-12 \
70+
liblld-12-dev \
71+
liblldb-12 \
72+
liblldb-12-dev \
73+
libllvm12 \
74+
libomp-12-dev \
75+
libomp5-12 \
76+
lld-12 \
77+
lldb-12 \
78+
llvm-12 \
79+
llvm-12-dev \
80+
llvm-12-runtime \
81+
llvm-12-tools \
4582
&& rm -rf /var/lib/apt/lists/*
4683

4784
RUN update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-10 0

0 commit comments

Comments
 (0)