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

Merge pull request #1047 from aidanhs/aphs-fix-dockerfile

Browse Source 
Fix builds in Docker
This commit is contained in:
Jonathan White 2017-10-18 23:05:32 -04:00 committed by GitHub
commit 7d6baf53fa
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Dockerfile
View File

@ -23,10 +23,11 @@ RUN set -x \
RUN set -x \
&& add-apt-repository ppa:george-edison55/cmake-3.x
ENV QT_PPA=qt591
ENV QT_VERSION=qt59
RUN set -x \
&& add-apt-repository --yes ppa:beineri/opt-${QT_VERSION}-trusty
&& add-apt-repository --yes ppa:beineri/opt-${QT_PPA}-trusty
RUN set -x \

2
release-tool
View File

@ -615,7 +615,7 @@ build() {
logInfo "Launching Docker container to compile sources..."
docker run --name "$DOCKER_CONTAINER_NAME" --rm \
--cap-add SYS_ADMIN --device /dev/fuse \
--cap-add SYS_ADMIN --security-opt apparmor:unconfined --device /dev/fuse \
-e "CC=${CC}" -e "CXX=${CXX}" \
-v "$(realpath "$SRC_DIR"):/keepassxc/src:ro" \
-v "$(realpath "$OUTPUT_DIR"):/keepassxc/out:rw" \