From 51b42bc7b86448867d3438467ca620b71b9882c0 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Tue, 24 Oct 2017 14:32:51 +0200 Subject: [PATCH] Move back to Ubuntu 14.04, but with custom libyubikey and libykpers-1 builds, resolves #1114 --- Dockerfile | 57 +++++++++++++++++++++++++++++------------------------- 1 file changed, 31 insertions(+), 26 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6f7ace34c..ad9a2f442 100644 --- a/Dockerfile +++ b/Dockerfile @@ -14,51 +14,54 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -FROM centos:7 +FROM ubuntu:14.04 + +ENV QT5_VERSION=59 +ENV QT5_PPA_VERSION=${QT5_VERSION}2 RUN set -x \ - && curl "https://copr.fedorainfracloud.org/coprs/bugzy/keepassxc/repo/epel-7/bugzy-keepassxc-epel-7.repo" \ - > /etc/yum.repos.d/bugzy-keepassxc-epel-7.repo + && apt-get update -y \ + && apt-get -y install software-properties-common RUN set -x \ - && curl "https://copr.fedorainfracloud.org/coprs/sic/backports/repo/epel-7/sic-backports-epel-7.repo" \ - > /etc/yum.repos.d/sic-backports-epel-7.repo + && add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty RUN set -x \ - && yum clean -y all \ - && yum upgrade -y + && apt-get update -y \ + && apt-get upgrade -y # build and runtime dependencies RUN set -x \ - && yum install -y \ - make \ - automake \ - gcc-c++ \ - cmake \ - libgcrypt16-devel \ - qt5-qtbase-devel \ - qt5-linguist \ - qt5-qttools \ - zlib-devel \ - qt5-qtx11extras \ - qt5-qtx11extras-devel \ - libXi-devel \ - libXtst-devel + && apt-get install -y \ + cmake3 \ + g++ \ + libgcrypt20-dev \ + qt${QT5_VERSION}base \ + qt${QT5_VERSION}tools \ + qt${QT5_VERSION}x11extras \ + zlib1g-dev \ + libxi-dev \ + libxtst-dev \ + mesa-common-dev + +ENV CMAKE_PREFIX_PATH=/opt/qt${QT5_VERSION}/lib/cmake +ENV LD_LIBRARY_PATH=/opt/qt${QT5_VERSION}/lib +RUN set -x \ + && echo /opt/qt${QT_VERSION}/lib > /etc/ld.so.conf.d/qt${QT5_VERSION}.conf # AppImage dependencies RUN set -x \ - && yum install -y \ + && apt-get install -y \ wget \ - fuse-libs + libfuse2 # build libyubikey ENV YUBIKEY_VERSION=1.13 -RUN set -x && yum install -y libusb-devel RUN set -x \ && wget "https://developers.yubico.com/yubico-c/Releases/libyubikey-${YUBIKEY_VERSION}.tar.gz" \ && tar xf libyubikey-${YUBIKEY_VERSION}.tar.gz \ && cd libyubikey-${YUBIKEY_VERSION} \ - && ./configure --prefix=/usr --libdir=/usr/lib64 \ + && ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu \ && make \ && make install \ && cd .. \ @@ -66,11 +69,13 @@ RUN set -x \ # build libykpers-1 ENV YKPERS_VERSION=1.18.0 +RUN set -x \ + && apt-get install -y libusb-dev RUN set -x \ && wget "https://developers.yubico.com/yubikey-personalization/Releases/ykpers-${YKPERS_VERSION}.tar.gz" \ && tar xf ykpers-${YKPERS_VERSION}.tar.gz \ && cd ykpers-${YKPERS_VERSION} \ - && ./configure --prefix=/usr --libdir=/usr/lib64 \ + && ./configure --prefix=/usr --libdir=/usr/lib/x86_64-linux-gnu \ && make \ && make install \ && cd .. \