diff options
| author | Claudio Cambra <claudio.cambra@gmail.com> | 2022-07-28 14:31:07 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-28 14:31:07 +0300 |
| commit | e8a60a6445d3a98c0f2bfa13f556dd9ed6c9f4e8 (patch) | |
| tree | 250a71d3f91c62071edfea507a1c9bc58c35ff08 | |
| parent | 9d28ddb70799c35fe483a64975957b9380403f8a (diff) | |
| parent | 29bf73de3372e2dcc16c927f9a60fd8c3ad3e2ee (diff) | |
Merge pull request #386 from nextcloud/work/karchive
Add KArchive to client Dockerfiles
| -rw-r--r-- | client-appimage/Dockerfile | 26 | ||||
| -rw-r--r-- | client/Dockerfile | 28 |
2 files changed, 54 insertions, 0 deletions
diff --git a/client-appimage/Dockerfile b/client-appimage/Dockerfile index ca56e5b..f42927d 100644 --- a/client-appimage/Dockerfile +++ b/client-appimage/Dockerfile @@ -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} @@ -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 diff --git a/client/Dockerfile b/client/Dockerfile index 9aa9896..b7f8491 100644 --- a/client/Dockerfile +++ b/client/Dockerfile @@ -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} @@ -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 \ @@ -185,6 +187,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" |