Skip to content

Commit 3b38d35

Browse files
committed
Update trusty Dockerfile
Trusty dockerfile now uses the correct syntax for building and installing. There are the necessary commands to build the AppImage.
1 parent f58b139 commit 3b38d35

File tree

1 file changed

+13
-5
lines changed

1 file changed

+13
-5
lines changed

docker/Dockerfile.ubuntu_trusty

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,16 @@ RUN git clone -b $git_branch "https://github.com/crapp/labpowerqt.git" && \
2929
cmake -DCMAKE_BUILD_TYPE=Release \
3030
-DCMAKE_C_COMPILER=gcc-6 \
3131
-DCMAKE_CXX_COMPILER=g++-6 \
32-
-DCMAKE_PREFIX_PATH=/opt/qt58 ../ && \
33-
make -j $make_core
32+
-DCMAKE_PREFIX_PATH=/opt/qt58 \
33+
-DCMAKE_INSTALL_PREFIX=/usr ../ && \
34+
make -j $make_core && \
35+
make DESTDIR=appdir install
3436

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

4043
CMD /bin/bash
4144

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

0 commit comments

Comments
 (0)