Skip to content

Commit

Permalink
Update trusty Dockerfile
Browse files Browse the repository at this point in the history
Trusty dockerfile now uses the correct syntax for building and
installing. There are the necessary commands to build the AppImage.
  • Loading branch information
crapp committed May 1, 2017
1 parent f58b139 commit 3b38d35
Showing 1 changed file with 13 additions and 5 deletions.
18 changes: 13 additions & 5 deletions docker/Dockerfile.ubuntu_trusty
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,16 @@ RUN git clone -b $git_branch "https://github.com/crapp/labpowerqt.git" && \
cmake -DCMAKE_BUILD_TYPE=Release \
-DCMAKE_C_COMPILER=gcc-6 \
-DCMAKE_CXX_COMPILER=g++-6 \
-DCMAKE_PREFIX_PATH=/opt/qt58 ../ && \
make -j $make_core
-DCMAKE_PREFIX_PATH=/opt/qt58 \
-DCMAKE_INSTALL_PREFIX=/usr ../ && \
make -j $make_core && \
make DESTDIR=appdir install

RUN wget -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage" && \
cd labpowerqt/build && \
find \( -name "moc_*" -or -name "*.o" -or -name "qrc_*" -or -name "Makefile*" -or -name "*.a" \) -exec rm -v {} \; && \
mv -v ../../linuxdeployqt-continuous-x86_64.AppImage ./linuxdeployqt && chmod a+x linuxdeployqt
#find \( -name "moc_*" -or -name "*.o" -or -name "qrc_*" -or -name "Makefile*" -or -name "*.a" \) -exec rm -v {} \; && \
mv -v ../../linuxdeployqt-continuous-x86_64.AppImage ./linuxdeployqt && \
chmod a+x linuxdeployqt

CMD /bin/bash

Expand All @@ -44,6 +47,11 @@ CMD /bin/bash
# run docker container interactively and allow access to fuse device
# docker run -it --cap-add SYS_ADMIN --device /dev/fuse trustylab
# enter labpowerqt build directory and run linuxdeployqt
# ./linuxdeployqt -verbose=3 -appimage -bundle-non-qt-libs src/labpowerqt
#
# source /opt/qt5*/bin/qt5*-env.sh
# ./linuxdeployqt appdir/usr/share/applications/*.desktop -bundle-non-qt-libs && \
# ./linuxdeployqt appdir/usr/share/applications/*.desktop -appimage
#
# use docker cp to copy the generated appimage. the appimage has the same
# architecture than the host system.
#

0 comments on commit 3b38d35

Please sign in to comment.