comparison deploy/linux/docker/Dockerfile_appimage.in @ 725:48e746f45bde

Include the kdiff3 executable
author Chris Cannam
date Mon, 17 Dec 2018 09:25:11 +0000
parents 6fb20633da00
children 720595a8fa10
comparison
equal deleted inserted replaced
724:c59c17665162 725:48e746f45bde
45 ENV QTDIR /opt/qt510 45 ENV QTDIR /opt/qt510
46 ENV PATH /opt/qt510/bin:$PATH 46 ENV PATH /opt/qt510/bin:$PATH
47 RUN qmake -r 47 RUN qmake -r
48 RUN make 48 RUN make
49 49
50 RUN hg clone https://code.soundsoftware.ac.uk/hg/easyhg-kdiff3
51 WORKDIR easyhg-kdiff3/kdiff3/src-QT4
52 RUN qmake -r kdiff3.pro
53 RUN make
54 RUN cp kdiff3 ../../../easyhg-kdiff3
55
56 WORKDIR /easyhg
50 RUN deploy/linux/deploy-appimage.sh 57 RUN deploy/linux/deploy-appimage.sh
51 RUN tar cvf output-appimage.tar *.AppImage && cp output-appimage.tar .. 58 RUN tar cvf output-appimage.tar *.AppImage && cp output-appimage.tar ..