Mercurial > hg > easyhg
comparison deploy/linux/docker/Dockerfile_appimage.in @ 726:720595a8fa10
Avoid using directory name that clashes with intended executable name
author | Chris Cannam |
---|---|
date | Mon, 17 Dec 2018 09:31:38 +0000 |
parents | 48e746f45bde |
children | bd9a54f9aca8 |
comparison
equal
deleted
inserted
replaced
725:48e746f45bde | 726:720595a8fa10 |
---|---|
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 | 50 RUN hg clone https://code.soundsoftware.ac.uk/hg/easyhg-kdiff3-src |
51 WORKDIR easyhg-kdiff3/kdiff3/src-QT4 | 51 WORKDIR easyhg-kdiff3-src/kdiff3/src-QT4 |
52 RUN qmake -r kdiff3.pro | 52 RUN qmake -r kdiff3.pro |
53 RUN make | 53 RUN make |
54 RUN cp kdiff3 ../../../easyhg-kdiff3 | 54 RUN cp kdiff3 ../../../easyhg-kdiff3 |
55 | 55 |
56 WORKDIR /easyhg | 56 WORKDIR /easyhg |