Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2025-04-26 02:19:18 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update CI Dockerfile to include libsodium and bump minimum supported Qt version

Browse Source
This commit is contained in:
Janek Bevendorff 2018-01-04 21:52:29 +01:00
parent 06518c5736
commit d80c6b4b7d
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@ -61,6 +61,10 @@ RUN set -x \
libfuse2 \ libfuse2 \
wget wget
RUN set -x \
&& apt-get autoremove --purge \
&& rm -rf /var/lib/apt/lists/*
VOLUME /keepassxc/src VOLUME /keepassxc/src
VOLUME /keepassxc/out VOLUME /keepassxc/out
WORKDIR /keepassxc WORKDIR /keepassxc

29
ci/trusty/Dockerfile
View File

@ -16,7 +16,18 @@
# TIP: check this Dockerfile using this online tool: https://www.fromlatest.io # TIP: check this Dockerfile using this online tool: https://www.fromlatest.io
FROM ubuntu:trusty FROM ubuntu:14.04
ENV QT5_VERSION=53
ENV QT5_PPA_VERSION=${QT5_VERSION}2
RUN set -x \
&& apt-get update -y \
&& apt-get -y install software-properties-common
RUN set -x \
&& add-apt-repository ppa:beineri/opt-qt${QT5_PPA_VERSION}-trusty \
&& LC_ALL=C.UTF-8 add-apt-repository ppa:ondrej/php
RUN set -x \ RUN set -x \
&& apt-get -y update \ && apt-get -y update \
@ -24,13 +35,21 @@ RUN set -x \
git build-essential clang-3.6 libclang-common-3.6-dev clang-format-3.6 cmake3 make \ git build-essential clang-3.6 libclang-common-3.6-dev clang-format-3.6 cmake3 make \
curl ca-certificates gnupg2 \ curl ca-certificates gnupg2 \
libgcrypt20-dev zlib1g-dev libyubikey-dev libykpers-1-dev \ libgcrypt20-dev zlib1g-dev libyubikey-dev libykpers-1-dev \
qttools5-dev \ qt${QT5_VERSION}base \
qttools5-dev-tools \ qt${QT5_VERSION}tools \
qtbase5-dev \ qt${QT5_VERSION}x11extras \
libqt5x11extras5-dev \ qt${QT5_VERSION}translations \
libxi-dev \ libxi-dev \
libxtst-dev \ libxtst-dev \
xvfb \ xvfb \
libsodium-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
RUN set -x \
&& apt-get autoremove --purge \ && apt-get autoremove --purge \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*