1
0
mirror of https://github.com/Llewellynvdm/conky.git synced 2025-01-13 11:15:27 +00:00

Make sure all tools are installed for build.

This commit is contained in:
Brenden Matthews 2021-02-28 11:05:13 -06:00
parent 642e39cfa3
commit a40c89b1ea
No known key found for this signature in database
GPG Key ID: B49ABB7270D9D4FD
5 changed files with 31 additions and 30 deletions

View File

@ -2,11 +2,10 @@ ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
FROM ${IMAGE}/builder/fedora-31-base:latest FROM ${IMAGE}/builder/fedora-31-base:latest
RUN dnf -y -q install \ RUN dnf -y -q install \
llvm \ llvm \
clang \ clang \
libcxx-devel \ libcxx-devel \
libcxxabi-devel \ libcxxabi-devel \
npm \ npm \
&& dnf clean all \ && dnf clean all \
&& npm install -g lcov-summary \ && npm cache clean --force
&& npm cache clean --force

View File

@ -2,11 +2,10 @@ ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
FROM ${IMAGE}/builder/fedora-32-base:latest FROM ${IMAGE}/builder/fedora-32-base:latest
RUN dnf -y -q install \ RUN dnf -y -q install \
llvm \ llvm \
clang \ clang \
libcxx-devel \ libcxx-devel \
libcxxabi-devel \ libcxxabi-devel \
npm \ npm \
&& dnf clean all \ && dnf clean all \
&& npm install -g lcov-summary \ && npm cache clean --force
&& npm cache clean --force

View File

@ -10,7 +10,6 @@ RUN dnf update -y -q \
freetype-devel \ freetype-devel \
git \ git \
imlib2-devel \ imlib2-devel \
lcov \
libcurl-devel \ libcurl-devel \
libical-devel \ libical-devel \
libircclient-devel \ libircclient-devel \

View File

@ -2,11 +2,13 @@ ARG IMAGE=registry.gitlab.com/brndnmtthws-oss/conky
FROM ${IMAGE}/builder/fedora-33-base:latest FROM ${IMAGE}/builder/fedora-33-base:latest
RUN dnf -y -q install \ RUN dnf -y -q install \
llvm \ clang \
clang \ gcovr \
libcxx-devel \ lcov \
libcxxabi-devel \ libcxx-devel \
npm \ libcxxabi-devel \
&& dnf clean all \ llvm \
&& npm install -g lcov-summary \ npm \
&& npm cache clean --force && dnf clean all \
&& npm install -g lcov-summary \
&& npm cache clean --force

View File

@ -7,13 +7,15 @@ RUN wget -q https://apt.llvm.org/llvm-snapshot.gpg.key \
&& DEBIAN_FRONTEND=noninteractive \ && DEBIAN_FRONTEND=noninteractive \
apt-get install -qy --no-install-recommends \ apt-get install -qy --no-install-recommends \
clang-11 \ clang-11 \
lldb-11 \
lld-11 \
libc++-11-dev \
libc++abi-11-dev \
clang-tools-11 \
clang-format-11 \ clang-format-11 \
clang-tidy-11 \ clang-tidy-11 \
clang-tools-11 \
lcov \
gcovr \
libc++-11-dev \
libc++abi-11-dev \
lld-11 \
lldb-11 \
nodejs \ nodejs \
npm \ npm \
&& apt-get clean \ && apt-get clean \