diff options
| author |  Paul Buxton <paubuxton.mail@googlemail.com> | 2019-09-22 13:32:55 +0100 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2019-09-23 13:38:57 -0700 |
| commit | 4b391c448dadb33b01505b7356108a02cf0a80d4 (patch) | |
| tree | 06d9280cb95eb302a10585dbc1fa9c2a0421bc10 /scripts/docker | |
| parent | b2230855e61c99d5d0b8de672a3e366688beaa30 (diff) | |
| download | subsurface-4b391c448dadb33b01505b7356108a02cf0a80d4.tar.gz | |
AppImage: Fix missing libssl1.1
Add ssl to the AppImage build.
Add helper script to fetch required dependancies.
Update docker build container used.
Signed-off-by: Paul Buxton <paubuxton.mail@googlemail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker')
| -rw-r--r-- | scripts/docker/trusty-qt512/Dockerfile | 7 | ||||
| -rw-r--r-- | scripts/docker/trusty-qt512/getpackages.sh | 6 |
2 files changed, 12 insertions, 1 deletions
diff --git a/scripts/docker/trusty-qt512/Dockerfile b/scripts/docker/trusty-qt512/Dockerfile index f116bbb20..0c1914a03 100644 --- a/scripts/docker/trusty-qt512/Dockerfile +++ b/scripts/docker/trusty-qt512/Dockerfile @@ -59,6 +59,11 @@ RUN mkdir dbus-1.12.16/build && \ 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 @@ -68,4 +73,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
\ No newline at end of file diff --git a/scripts/docker/trusty-qt512/getpackages.sh b/scripts/docker/trusty-qt512/getpackages.sh new file mode 100644 index 000000000..9b0e0fbe3 --- /dev/null +++ b/scripts/docker/trusty-qt512/getpackages.sh @@ -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 |