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

Add wget, file, fuse and python for building AppImages inside the container

Browse Source
This commit is contained in:
Janek Bevendorff 2017-01-22 22:39:05 +01:00
parent 3c687d29d8
commit 1c12cd6b9e
No known key found for this signature in database
GPG Key ID: CFEC2F6850BFFA53
3 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
AppImage-Recipe.sh
View File

@ -41,8 +41,8 @@ wget -q https://github.com/probonopd/AppImages/raw/master/functions.sh -O ./func
cd $APP.AppDir cd $APP.AppDir
cp -a ../../bin-release/* . cp -a ../../bin-release/* .
mv ./usr/local/* ./usr cp -a ./usr/local/* ./usr
rmdir ./usr/local rm -R ./usr/local
patch_strings_in_file /usr/local ./ patch_strings_in_file /usr/local ./
patch_strings_in_file /usr ./ patch_strings_in_file /usr ./

6
Dockerfile
View File

@ -27,7 +27,11 @@ RUN set -x \
libqt5x11extras5-dev \ libqt5x11extras5-dev \
libxi-dev \ libxi-dev \
libxtst-dev \ libxtst-dev \
zlib1g-dev zlib1g-dev \
wget \
file \
fuse \
python
VOLUME /keepassxc/src VOLUME /keepassxc/src
VOLUME /keepassxc/out VOLUME /keepassxc/out

11
make_release.sh
View File

@ -89,6 +89,7 @@ logError() {
} }
exitError() { exitError() {
return
logError "$1" logError "$1"
if [ "" != "$ORIG_BRANCH" ]; then if [ "" != "$ORIG_BRANCH" ]; then
git checkout "$ORIG_BRANCH" > /dev/null 2>&1 git checkout "$ORIG_BRANCH" > /dev/null 2>&1
@ -309,10 +310,14 @@ if $BUILD_SOURCES; then
logInfo "Installing to bin dir..." logInfo "Installing to bin dir..."
make DESTDIR="${OUTPUT_DIR}/bin-release" install/strip make DESTDIR="${OUTPUT_DIR}/bin-release" install/strip
logInfo "Creating AppImage..."
${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME"
else else
logInfo "Launching Docker container to compile sources..." logInfo "Launching Docker container to compile sources..."
docker run --name "$DOCKER_CONTAINER_NAME" --rm \ docker run --name "$DOCKER_CONTAINER_NAME" --rm \
--cap-add SYS_ADMIN --device /dev/fuse \
-e "CC=${CC}" -e "CXX=${CXX}" \ -e "CC=${CC}" -e "CXX=${CXX}" \
-v "$(realpath "$SRC_DIR"):/keepassxc/src:ro" \ -v "$(realpath "$SRC_DIR"):/keepassxc/src:ro" \
-v "$(realpath "$OUTPUT_DIR"):/keepassxc/out:rw" \ -v "$(realpath "$OUTPUT_DIR"):/keepassxc/out:rw" \
@ -320,13 +325,11 @@ if $BUILD_SOURCES; then
bash -c "cd /keepassxc/out/build-release && \ bash -c "cd /keepassxc/out/build-release && \
cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \ cmake -DCMAKE_BUILD_TYPE=Release -DWITH_TESTS=Off $CMAKE_OPTIONS \
-DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" /keepassxc/src && \ -DCMAKE_INSTALL_PREFIX=\"${INSTALL_PREFIX}\" /keepassxc/src && \
make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip" make $MAKE_OPTIONS && make DESTDIR=/keepassxc/out/bin-release install/strip && \
/keepassxc/src/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME""
logInfo "Build finished, Docker container terminated." logInfo "Build finished, Docker container terminated."
fi fi
logInfo "Creating AppImage..."
${SRC_DIR}/AppImage-Recipe.sh "$APP_NAME" "$RELEASE_NAME"
cd .. cd ..
logInfo "Signing source tarball..." logInfo "Signing source tarball..."