From c40d134ed058c08471ba1fc7399a798184f1ea3a Mon Sep 17 00:00:00 2001 From: Teja Swaroop Pothala Date: Wed, 19 Feb 2025 00:43:40 +0000 Subject: [PATCH] install pinta from source for jammy, migrate postman,qbittorrent,remmina --- ci-scripts/template-vars.yaml | 8 ++--- dockerfile-kasm-pinta | 2 +- dockerfile-kasm-postman | 2 +- dockerfile-kasm-qbittorrent | 2 +- dockerfile-kasm-remmina | 2 +- src/ubuntu/install/pinta/install_pinta.sh | 43 ++++++++++++++++++++--- 6 files changed, 46 insertions(+), 13 deletions(-) diff --git a/ci-scripts/template-vars.yaml b/ci-scripts/template-vars.yaml index dba959f..a560766 100644 --- a/ci-scripts/template-vars.yaml +++ b/ci-scripts/template-vars.yaml @@ -126,14 +126,14 @@ multiImages: - src/ubuntu/install/slack/** - name: pinta singleapp: true - base: core-ubuntu-focal + base: core-ubuntu-jammy dockerfile: dockerfile-kasm-pinta changeFiles: - dockerfile-kasm-pinta - src/ubuntu/install/pinta/** - name: qbittorrent singleapp: true - base: core-ubuntu-focal + base: core-ubuntu-jammy dockerfile: dockerfile-kasm-qbittorrent changeFiles: - dockerfile-kasm-qbittorrent @@ -155,7 +155,7 @@ multiImages: - src/ubuntu/install/cleanup/** - name: remmina singleapp: true - base: core-ubuntu-focal + base: core-ubuntu-jammy dockerfile: dockerfile-kasm-remmina changeFiles: - dockerfile-kasm-remmina @@ -792,7 +792,7 @@ singleImages: - src/ubuntu/install/cleanup/** - name: postman singleapp: true - base: core-ubuntu-focal + base: core-ubuntu-jammy dockerfile: dockerfile-kasm-postman changeFiles: - dockerfile-kasm-postman diff --git a/dockerfile-kasm-pinta b/dockerfile-kasm-pinta index c29de9e..5dce882 100644 --- a/dockerfile-kasm-pinta +++ b/dockerfile-kasm-pinta @@ -1,5 +1,5 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-ubuntu-focal" +ARG BASE_IMAGE="core-ubuntu-jammy" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root diff --git a/dockerfile-kasm-postman b/dockerfile-kasm-postman index 4af4509..6abb02b 100644 --- a/dockerfile-kasm-postman +++ b/dockerfile-kasm-postman @@ -1,5 +1,5 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-ubuntu-focal" +ARG BASE_IMAGE="core-ubuntu-jammy" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root diff --git a/dockerfile-kasm-qbittorrent b/dockerfile-kasm-qbittorrent index 01834ca..fa4f4f9 100644 --- a/dockerfile-kasm-qbittorrent +++ b/dockerfile-kasm-qbittorrent @@ -1,5 +1,5 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-ubuntu-focal" +ARG BASE_IMAGE="core-ubuntu-jammy" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root diff --git a/dockerfile-kasm-remmina b/dockerfile-kasm-remmina index 721ccc4..69d5f2a 100644 --- a/dockerfile-kasm-remmina +++ b/dockerfile-kasm-remmina @@ -1,5 +1,5 @@ ARG BASE_TAG="develop" -ARG BASE_IMAGE="core-ubuntu-focal" +ARG BASE_IMAGE="core-ubuntu-jammy" FROM kasmweb/$BASE_IMAGE:$BASE_TAG USER root diff --git a/src/ubuntu/install/pinta/install_pinta.sh b/src/ubuntu/install/pinta/install_pinta.sh index 02fc1fb..df948f8 100644 --- a/src/ubuntu/install/pinta/install_pinta.sh +++ b/src/ubuntu/install/pinta/install_pinta.sh @@ -2,12 +2,45 @@ set -ex # Install Pinta -apt-get update -apt-get install -y pinta +# For Jammy, build pinta from source because standard package is buggy +if grep -q Jammy /etc/os-release; then + # install requirements for building pinta from source + apt update -y + apt-get install -y dotnet-sdk-8.0 + apt-get install -y libgtk-3-dev + apt install -y autotools-dev autoconf-archive gettext intltool libadwaita-1-dev + # download and install pinta 2.1.2 source + wget -q https://github.com/PintaProject/Pinta/releases/download/2.1.2/pinta-2.1.2.tar.gz -O /tmp/pinta-2.1.2.tar.gz + tar -xvzf /tmp/pinta-2.1.2.tar.gz -C /tmp/ + cd /tmp/pinta-2.1.2 + ./configure --prefix=/usr/local + make install -# Default settings and desktop icon -cp /usr/share/applications/pinta.desktop $HOME/Desktop/ -chmod +x $HOME/Desktop/pinta.desktop + # cleanup + rm -rf /tmp/pinta-2.1.2.tar.gz /tmp/pinta-2.1.2 + + # create desktop file + cat >/usr/share/applications/pinta.desktop <