comparison deploy/linux/docker/Dockerfile_deb.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
37 37
38 WORKDIR /easyhg 38 WORKDIR /easyhg
39 RUN qmake -r 39 RUN qmake -r
40 RUN make 40 RUN make
41 41
42 RUN hg clone https://code.soundsoftware.ac.uk/hg/easyhg-kdiff3
43 WORKDIR easyhg-kdiff3/kdiff3/src-QT4
44 RUN qmake -r kdiff3.pro
45 RUN make
46 RUN cp kdiff3 ../../../easyhg-kdiff3
47
48 WORKDIR /easyhg
42 RUN deploy/linux/deploy-deb.sh [[RELEASE]] amd64 49 RUN deploy/linux/deploy-deb.sh [[RELEASE]] amd64
43 RUN tar cvf output-deb.tar *.deb && cp output-deb.tar .. 50 RUN tar cvf output-deb.tar *.deb && cp output-deb.tar ..