Merge pull request #21 from linuxserver-labs/selkies

rebase to selkies

Author: aptalca

.github/workflows/call-baseimage-update.yml

@@ -10,7 +10,7 @@ jobs:
     uses: linuxserver-labs/docker-actions/.github/workflows/[email protected]
     with:
       repo_owner: ${{ github.repository_owner }}
-      baseimage: "kasmvnc"
+      baseimage: "selkies"
       basebranch: "ubuntunoble"
       app_name: "nomacs"
     secrets:

Dockerfile

@@ -1,4 +1,6 @@
-FROM ghcr.io/linuxserver/baseimage-kasmvnc:ubuntunoble
+# syntax=docker/dockerfile:1
+
+FROM ghcr.io/linuxserver/baseimage-selkies:ubuntunoble
 
 ARG BUILD_DATE
 ARG VERSION
@@ -14,7 +16,7 @@ ENV \
 RUN \
   echo "**** add icon ****" && \
   curl -o \
-    /kclient/public/icon.png \
+    /usr/share/selkies/www/icon.png \
     https://raw.githubusercontent.com/linuxserver/docker-templates/master/linuxserver.io/img/nomacs-logo.png && \
   echo "**** install build dependencies ****" && \
   apt-get update && \
@@ -26,38 +28,33 @@ RUN \
     git \
     lcov \
     libexiv2-dev \
+    libgtest-dev \
     libheif-dev \
     libopencv-dev \
-    libqt5svg5-dev \
-    libquazip5-dev \
+    libqt6svg6-dev \
+    libquazip1-qt6-dev \
     libraw-dev \
     libtiff-dev \
     libwebp-dev \
+    libxkbcommon-dev \
     libzip-dev \
-    qt5-qmake \
-    qttools5-dev \
-    qttools5-dev-tools && \
+    qmake6 \
+    qt6-declarative-dev-tools \
+    qt6-svg-dev \
+    qt6-tools-dev && \
   echo "**** install runtime dependencies ****" && \
   apt-get install -y --no-install-recommends \
     kimageformat-plugins \
     libexiv2-27 \
     libheif1 \
     libopencv-core406t64 \
     libopencv-imgproc406t64 \
-    libquazip5-1t64 \
-    libqt5concurrent5t64 \
-    libqt5printsupport5t64 \
-    libqt5svg5 \
+    libquazip1-qt6-1t64 \
+    libqt6concurrent6t64 \
+    libqt6printsupport6t64 \
+    libqt6svg6 \
     libraw23t64 \
-    qt5-image-formats-plugins && \
-  echo "**** compile heif plugin ****" && \
-  mkdir -p /tmp/heif && \
-  git clone https://github.com/jakar/qt-heif-image-plugin.git /tmp/heif && \
-  mkdir -p /tmp/heif/build && \
-  cd /tmp/heif/build && \
-  cmake .. && \
-  make && \
-  make install && \
+    qt6-image-formats-plugins && \
   echo "**** compile nomacs ****" && \
   if [ -z "${APP_VERSION}" ]; then \
     APP_VERSION=$(curl -sX GET https://api.github.com/repos/nomacs/nomacs/commits/master | jq -r '. | .sha' | cut -c1-8); \
@@ -68,7 +65,13 @@ RUN \
   git checkout "${APP_VERSION}" && \
   mkdir -p /tmp/nomacs/build && \
   cd /tmp/nomacs/build && \
-  cmake ../ImageLounge/. && \
+  cmake \
+    -DENABLE_OPENCV=ON \
+    -DENABLE_RAW=ON \
+    -DENABLE_TIFF=ON \
+    -DENABLE_QUAZIP=ON \
+    -DENABLE_PLUGINS=ON \
+    ../ImageLounge/. && \
   make && \
   make install && \
   ldconfig && \
@@ -82,17 +85,21 @@ RUN \
     git \
     lcov \
     libexiv2-dev \
+    libgtest-dev \
     libheif-dev \
     libopencv-dev \
-    libqt5svg5-dev \
+    libqt6svg6-dev \
+    libquazip1-qt6-dev \
     libquazip5-dev \
     libraw-dev \
     libtiff-dev \
     libwebp-dev \
+    libxkbcommon-dev \
     libzip-dev \
-    qt5-qmake \
-    qttools5-dev \
-    qttools5-dev-tools && \
+    qmake6 \
+    qt6-declarative-dev-tools \
+    qt6-svg-dev \
+    qt6-tools-dev && \
   rm -rf \
     /tmp/* \
     /var/lib/apt/lists/* \