Skip to content

Commit 61753ef

Browse files
committed
Dockerfile: move llvm installation at the earliest
Install llvm for the tools to know it's presence. Signed-off-by: Nishanth Menon <nm@ti.com>
1 parent 55b4833 commit 61753ef

1 file changed

Lines changed: 19 additions & 8 deletions

File tree

Dockerfile

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,6 @@ RUN apt-get update \
7171
RUN python3 -m venv /usr/local/venv
7272
RUN . /usr/local/venv/bin/activate
7373

74-
COPY other-configs/tmp /tmp
75-
76-
RUN --mount=type=bind,source=build-env.sh,target=/tmp/build-env.sh \
77-
INSTALL_GCC=$INSTALL_GCC /tmp/build-env.sh
78-
79-
# Publish the source repository
80-
LABEL org.opencontainers.image.source=https://github.com/nmenon/kernel_patch_verify
81-
8274
# Add our llvm repo configs
8375
COPY llvm-config /
8476

@@ -89,6 +81,25 @@ RUN apt-get update \
8981
clangd \
9082
libclang-dev \
9183
lld \
84+
llvm-dev \
85+
&& apt-get autoremove -y\
86+
&& apt-get clean -y\
87+
&& rm -rf \
88+
/tmp/* \
89+
/var/lib/apt/lists/* \
90+
/var/tmp/* \
91+
/var/log/*
92+
93+
COPY other-configs/tmp /tmp
94+
95+
RUN --mount=type=bind,source=build-env.sh,target=/tmp/build-env.sh \
96+
INSTALL_GCC=$INSTALL_GCC /tmp/build-env.sh
97+
98+
# Publish the source repository
99+
LABEL org.opencontainers.image.source=https://github.com/nmenon/kernel_patch_verify
100+
101+
# Install patchwise dependencies
102+
RUN apt-get update \
92103
&& . /usr/local/venv/bin/activate \
93104
&& patchwise --install \
94105
&& echo "**** cleanup ****" \

0 commit comments

Comments
 (0)