Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

App image combined #2300

Merged
merged 2 commits into from Sep 23, 2019
Merged

App image combined #2300

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34ef270
AppImage: Fix missing libssl1.1
Sep 22, 2019
f4d30e1
AppImage: Fix path of machine-id in dbus library
Sep 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 8 additions & 2 deletions scripts/docker/trusty-qt512/Dockerfile
View file
Open in desktop
Expand Up @@ -55,10 +55,16 @@ RUN rm -rf qtwebkit
ADD dbus-1.12.16.tar.gz .
RUN mkdir dbus-1.12.16/build && \
cd dbus-1.12.16/build && \
cmake ../cmake -DDBUS_INSTALL_SYSTEM_LIBS=1 && \
sed -inline 's/${CMAKE_INSTALL_FULL_LOCALSTATEDIR}\/lib\/dbus\/machine-id/\/var\/lib\/dbus\/machine-id/' ../cmake/CMakeLists.txt && \
cmake ../cmake -DDBUS_INSTALL_SYSTEM_LIBS=1 && \
make install && \
ldconfig

ADD OpenSSL_1_1_1.tar.gz .
RUN cd /openssl-OpenSSL_1_1_1 && \
./config --prefix=/usr/local/ssl --openssldir=/usr/local/ssl shared zlib && \
make && mkdir -p /ssllibs && cp *.so /ssllibs && cd / && rm -rf openssl-OpenSSL_1_1_1

# try to remove some of the packages we no longer need
RUN apt-get remove -y libqt5core5a libqt5dbus5 libqt5gui5 ruby openssh-client

Expand All @@ -68,4 +74,4 @@ RUN git clone git://github.com/Subsurface-divelog/subsurface
RUN bash -e -x ./subsurface/scripts/build.sh -desktop -create-appdir -build-with-webkit

# remove the source, but keep the install-root
RUN rm -rf subsurface libgit2 googlemaps grantlee
RUN rm -rf subsurface libgit2 googlemaps grantlee
6 changes: 6 additions & 0 deletions scripts/docker/trusty-qt512/getpackages.sh
View file
Open in desktop
@@ -0,0 +1,6 @@
#!/bin/bash

wget https://github.com/Kitware/CMake/releases/download/v3.13.2/cmake-3.13.2-Linux-x86_64.sh
wget http://download.qt.io/official_releases/qt/5.12/5.12.4/qt-opensource-linux-x64-5.12.4.run
curl -O https://dbus.freedesktop.org/releases/dbus/dbus-1.12.16.tar.gz
wget https://github.com/openssl/openssl/archive/OpenSSL_1_1_1.tar.gz
2 changes: 1 addition & 1 deletion scripts/linux-trusty-qt512/before_install.sh
View file
Open in desktop
Expand Up @@ -28,4 +28,4 @@ export QT_ROOT=/usr/local/Qt/5.12.4
cd ${TRAVIS_BUILD_DIR}/..

# start the container and keep it running
docker run -v $PWD/subsurface:/subsurface --name=trusty-qt512 -w / -d dirkhh/trusty-qt512:0.6 /bin/sleep 60m
docker run -v $PWD/subsurface:/subsurface --name=trusty-qt512 -w / -d dirkhh/trusty-qt512:0.7 /bin/sleep 60m
2 changes: 2 additions & 0 deletions scripts/linux-trusty-qt512/in-container-build.sh
View file
Open in desktop
Expand Up @@ -23,6 +23,8 @@ mv appdir/usr/usr/local/Qt/5.12.4/gcc_64/plugins/* appdir/usr/plugins # the usr
mv appdir/usr/lib/grantlee/ appdir/usr/plugins/
rm -rf appdir/usr/home/ appdir/usr/include/ appdir/usr/share/man/ # No need to ship developer and man files as part of the AppImage
rm -rf appdir/usr/usr appdir/usr/lib/cmake appdir/usr/lib/pkgconfig
cp /ssllibs/libssl.so appdir/usr/lib/libssl.so.1.1
cp /ssllibs/libcrypto.so appdir/usr/lib/libcrypto.so.1.1

# get the linuxdeployqt tool and run it to collect the libraries
curl -L -O "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
Expand Down