comparison deploy/linux/docker/Dockerfile_appimage.in @ 1978:d3bd593a610c

Merge from branch c++14
author Chris Cannam
date Fri, 31 Aug 2018 15:14:27 +0100
parents 34cb861994a2
children f69819b5c248
comparison
equal deleted inserted replaced
1965:4d7542238772 1978:d3bd593a610c
43 RUN apt-get update && \ 43 RUN apt-get update && \
44 apt-get install -y \ 44 apt-get install -y \
45 qt510base \ 45 qt510base \
46 qt510svg 46 qt510svg
47 RUN apt-get clean && rm -rf /var/lib/apt/lists/* 47 RUN apt-get clean && rm -rf /var/lib/apt/lists/*
48
48 RUN locale-gen en_US.UTF-8 49 RUN locale-gen en_US.UTF-8
49 ENV LANG en_US.UTF-8 50 ENV LANG en_US.UTF-8
50 ENV LANGUAGE en_US:en 51 ENV LANGUAGE en_US:en
51 ENV LC_ALL en_US.UTF-8 52 ENV LC_ALL en_US.UTF-8
53
52 RUN hg clone -r[[REVISION]] https://code.soundsoftware.ac.uk/hg/sonic-visualiser 54 RUN hg clone -r[[REVISION]] https://code.soundsoftware.ac.uk/hg/sonic-visualiser
55
53 RUN git clone https://github.com/sandstorm-io/capnproto 56 RUN git clone https://github.com/sandstorm-io/capnproto
54 WORKDIR capnproto 57 WORKDIR capnproto
55 RUN git checkout v0.6.1 58 RUN git checkout v0.6.1
56 WORKDIR c++ 59 WORKDIR c++
57 RUN ./setup-autotools.sh && autoreconf -i && ./configure && make -j3 && make install 60 RUN autoreconf -i && ./configure && make -j3 && make install
61
58 WORKDIR ../../sonic-visualiser 62 WORKDIR ../../sonic-visualiser
59 ENV QTDIR /opt/qt510 63 ENV QTDIR /opt/qt510
60 ENV PATH /opt/qt510/bin:$PATH 64 ENV PATH /opt/qt510/bin:$PATH
61 RUN ./configure 65 RUN ./configure
62 RUN make -j3 66 RUN make -j3
67
63 RUN deploy/linux/deploy-appimage.sh 68 RUN deploy/linux/deploy-appimage.sh
64 RUN tar cvf output.tar *.AppImage && cp output.tar .. 69 RUN tar cvf output.tar *.AppImage && cp output.tar ..