Skip to content

Commit

Permalink
Add KArchive to client Dockerfiles
Browse files Browse the repository at this point in the history
Signed-off-by: Claudio Cambra <claudio.cambra@gmail.com>
  • Loading branch information
claucambra committed Jul 22, 2022
1 parent d4b6b51 commit 29bf73d
Show file tree
Hide file tree
Showing 2 changed files with 54 additions and 0 deletions.
26 changes: 26 additions & 0 deletions client-appimage/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ARG BUILD_QT
ENV VER_QT 5.15
ENV VER_QT_DATE 2021-08-18
ENV VER_OPENSSL 1.1.1k
ENV VER_KFRAMEWORKS 5.96.0

ENV QT_ROOT /opt/qt${VER_QT}

Expand Down Expand Up @@ -171,3 +172,28 @@ RUN if [ "$BUILD_QT" != "1" ] ; then \
cd .. && \
rm -rf qtkeychain \
; fi

# Install KArchive
RUN if [ "$BUILD_QT" != "1" ] ; then \
cd /tmp && \
git clone https://invent.kde.org/frameworks/extra-cmake-modules.git --depth 1 -b v${VER_KFRAMEWORKS} && \
cd extra-cmake-modules && \
mkdir build && \
cd build && \
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release .. && \
ninja install && \
cd .. && \
rm -rf extra-cmake-modules \
; fi

RUN if [ "$BUILD_QT" != "1" ] ; then \
cd /tmp && \
git clone https://invent.kde.org/frameworks/karchive.git --depth 1 -b v${VER_KFRAMEWORKS} && \
cd karchive && \
mkdir build && \
cd build && \
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release .. && \
ninja install && \
cd .. && \
rm -rf karchive \
; fi
28 changes: 28 additions & 0 deletions client/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ ARG BUILD_QT
ENV VER_QT 5.15
ENV VER_QT_DATE 2022-07-05
ENV VER_OPENSSL 3.0.4
ENV VER_KFRAMEWORKS 5.96.0

ENV QT_ROOT /opt/qt${VER_QT}

Expand All @@ -29,6 +30,7 @@ RUN sed -i '/deb-src/s/^# //' /etc/apt/sources.list && \
jq \
perl \
python3 \
python3-pip \
software-properties-common \
build-essential \
mesa-common-dev \
Expand Down Expand Up @@ -182,6 +184,32 @@ RUN if [ "$BUILD_QT" != "1" ] ; then \
rm -rf qtkeychain \
; fi

# Install KArchive
RUN if [ "$BUILD_QT" != "1" ] ; then \
pip3 install sphinxcontrib-qthelp && \
cd /tmp && \
git clone https://invent.kde.org/frameworks/extra-cmake-modules.git --depth 1 -b v${VER_KFRAMEWORKS} && \
cd extra-cmake-modules && \
mkdir build && \
cd build && \
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release .. && \
ninja install && \
cd .. && \
rm -rf extra-cmake-modules \
; fi

RUN if [ "$BUILD_QT" != "1" ] ; then \
cd /tmp && \
git clone https://invent.kde.org/frameworks/karchive.git --depth 1 -b v${VER_KFRAMEWORKS} && \
cd karchive && \
mkdir build && \
cd build && \
cmake -G Ninja -DCMAKE_BUILD_TYPE=Release .. && \
ninja install && \
cd .. && \
rm -rf karchive \
; fi

# Setup sonar-scanner
ENV SONAR_SCANNER_VERSION 4.7.0.2747
ENV SONAR_SERVER_URL "https://sonarcloud.io"
Expand Down

0 comments on commit 29bf73d

Please sign in to comment.