From 8e5fb47c0cd71eb656c517b369f5db37ca9e55ed Mon Sep 17 00:00:00 2001 From: Vladimir Borisov Date: Wed, 20 Sep 2023 16:02:27 +0300 Subject: [PATCH] Ubuntu22 --- distros/Ubuntu/Dockerfile | 11 ++++++----- distros/Ubuntu/package.sh | 2 +- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/distros/Ubuntu/Dockerfile b/distros/Ubuntu/Dockerfile index 56c7f9c2..108063df 100644 --- a/distros/Ubuntu/Dockerfile +++ b/distros/Ubuntu/Dockerfile @@ -1,15 +1,16 @@ -FROM ubuntu:20.04 +FROM ubuntu:jammy RUN ln -fs /usr/share/zoneinfo/Europe/Sofia /etc/localtime ENV DEBIAN_FRONTEND noninteractive # Install package dependencies -RUN apt update && apt install -y git librsvg2-bin checkinstall nodejs build-essential cmake qt5-default qtdeclarative5-dev qtdeclarative5-dev-tools qtwebengine5-dev qml-module-qtquick-controls qml-module-qtquick-dialogs qml-module-qt-labs-platform qml-module-qtwebchannel qml-module-qtwebengine wget libssl-dev sudo libmpv-dev +RUN apt update && apt install -y git librsvg2-bin checkinstall nodejs build-essential cmake qtbase5-dev libqt5core5a qtdeclarative5-dev qtdeclarative5-dev-tools qtwebengine5-dev qml-module-qtquick-controls qml-module-qtquick-dialogs qml-module-qt-labs-platform qml-module-qtwebchannel qml-module-qtwebengine wget libssl-dev sudo libmpv-dev # Setting up new user -RUN useradd builduser -m -RUN passwd -d builduser -RUN echo 'builduser ALL=(ALL) ALL' >> /etc/sudoers +RUN adduser --gecos '' --disabled-password builduser +RUN usermod -aG sudo builduser +RUN echo 'builduser ALL=(ALL) NOPASSWD:ALL' >> /etc/sudoers + WORKDIR /home/builduser # Import the required files diff --git a/distros/Ubuntu/package.sh b/distros/Ubuntu/package.sh index a2f486f7..c5246593 100755 --- a/distros/Ubuntu/package.sh +++ b/distros/Ubuntu/package.sh @@ -13,4 +13,4 @@ cp dist-utils/common/preremove ./preremove-pak make -f release.makefile clean make -f release.makefile -sudo checkinstall --default --install=no --fstrans=yes --pkgname stremio --pkgversion "$(./dist-utils/common/get-version.sh)" --pkggroup video --pkglicense="MIT" --nodoc --pkgarch=$(dpkg --print-architecture) --requires="nodejs,libmpv1 \(\>=0.30.0\),qml-module-qt-labs-platform \(\>=5.9.5\),qml-module-qtquick-controls \(\>=5.9.5\),qml-module-qtquick-dialogs \(\>=5.9.5\),qml-module-qtwebchannel \(\>=5.9.5\),qml-module-qtwebengine \(\>=5.9.5\),qml-module-qt-labs-folderlistmodel \(\>=5.9.5\),qml-module-qt-labs-settings \(\>=5.9.5\),librubberband2 \(\>=1.8.1\),libuchardet0 \(\>=0.0.6\),libfdk-aac2 \(\>=2.0.2\)" make -f release.makefile install +sudo checkinstall --default --install=no --fstrans=no --exclude=/usr/ --pkgname stremio --pkgversion "$(./dist-utils/common/get-version.sh)" --pkggroup video --pkglicense="MIT" --nodoc --pkgarch=$(dpkg --print-architecture) --requires="nodejs,libmpv1 \(\>=0.30.0\),qml-module-qt-labs-platform \(\>=5.9.5\),qml-module-qtquick-controls \(\>=5.9.5\),qml-module-qtquick-dialogs \(\>=5.9.5\),qml-module-qtwebchannel \(\>=5.9.5\),qml-module-qtwebengine \(\>=5.9.5\),qml-module-qt-labs-folderlistmodel \(\>=5.9.5\),qml-module-qt-labs-settings \(\>=5.9.5\),librubberband2 \(\>=1.8.1\),libuchardet0 \(\>=0.0.6\),libfdk-aac2 \(\>=2.0.2\)" make -f release.makefile install