diff --git a/development/build-dependencies-ubuntu-2004.sh b/development/build-dependencies-ubuntu-2004.sh index 44a6fcaa..bb094cb3 100755 --- a/development/build-dependencies-ubuntu-2004.sh +++ b/development/build-dependencies-ubuntu-2004.sh @@ -1,5 +1,8 @@ #!/bin/bash +## 2023.04: this file is not updated see docker/Dockerfile.ubuntu_focal + + # preparation # sudo apt update # sudo apt upgrade diff --git a/development/build-with-docker.sh b/development/build-with-docker.sh index 76d5b381..face4cad 100755 --- a/development/build-with-docker.sh +++ b/development/build-with-docker.sh @@ -49,7 +49,7 @@ time docker run \ -v $PROJECTDIR/docker-build-${BUILD_TYPE}:/opt/nixnote2/qmake-build-${BUILD_TYPE} \ -v $PROJECTDIR/docker-build-${BUILD_TYPE}-t:/opt/nixnote2/qmake-build-${BUILD_TYPE}-t \ -it ${DOCKERTAG} \ - /bin/bash -c "cd nixnote2 && git fetch && git checkout --track origin/$PROJECTBRANCH && git reset --hard origin/$PROJECTBRANCH && ./development/build-with-qmake.sh ${BUILD_TYPE} noclean /usr/lib/nixnote2/tidy browser && ./development/run-tests.sh ${BUILD_TYPE} noclean /usr/lib/nixnote2/tidy && ./development/create-AppImage-linuxdeploy.sh && mv *.AppImage appdir && chmod -R a+rwx appdir/*.AppImage" + /bin/bash -c "cd nixnote2 && git fetch && git checkout --track origin/$PROJECTBRANCH && git reset --hard origin/$PROJECTBRANCH && ./development/build-with-qmake.sh ${BUILD_TYPE} noclean /usr/lib browser && ./development/run-tests.sh ${BUILD_TYPE} noclean /usr/lib/nixnote2/tidy && ./development/create-AppImage-linuxdeploy.sh && mv *.AppImage appdir && chmod -R a+rwx appdir/*.AppImage" ls appdir/*.AppImage echo "If all got well then AppImage file in appdir is your binary" diff --git a/development/docker/Dockerfile.ubuntu_focal b/development/docker/Dockerfile.ubuntu_focal index 17ffc493..a5fd432e 100644 --- a/development/docker/Dockerfile.ubuntu_focal +++ b/development/docker/Dockerfile.ubuntu_focal @@ -8,12 +8,12 @@ ENV PATH="${wdir}/linuxdeploy:${wdir}/linuxdeploy-plugin-qt:${wdir}/appimagetool ENV DEBIAN_FRONTEND=noninteractive RUN apt-get update && apt-get install -y software-properties-common -RUN add-apt-repository ppa:nixnote/nixnote2-stable -y && apt-get update -qq +#RUN add-apt-repository ppa:nixnote/nixnote2-stable -y && apt-get update -qq RUN apt-get update && apt-get install -y git-core qt5-default build-essential ccache p7zip-full libssl1.1 libcrypt1 libnss3 \ wget curl make pkg-config \ qtwebengine5-dev qtwebengine5-dev-tools \ libboost-dev libboost-test-dev libboost-program-options-dev libevent-dev libcurl4-openssl-dev \ - libpoppler-qt5-dev libqt5webkit5-dev qt5-qmake qttools5-dev-tools libhunspell-dev nixnote2-tidy + libpoppler-qt5-dev libqt5webkit5-dev qt5-qmake qttools5-dev-tools libhunspell-dev libtidy-dev libqt5positioning5-plugins # install linuxdeploy RUN wget -nv "https://github.com/linuxdeploy/linuxdeploy/releases/download/continuous/linuxdeploy-x86_64.AppImage" && \