Skip to content
This repository was archived by the owner on Mar 4, 2023. It is now read-only.

Commit 2d874d5

Browse files
committed
keep some packages, improve error detection
1 parent 602a1d2 commit 2d874d5

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

tools/appserver/dockerbuild/install.sh

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export QPMX_CACHE_DIR=/tmp/qpmx-cache
77
DS_NAME=qdsappd
88
QT_VERSION=5.11.0
99
CRYPTOPP_VERSION=7_0_0
10-
MAIN_DEP="libressl zlib dbus-libs glib libgcc libpcre2-16 libpq ca-certificates"
10+
MAIN_DEP="libressl zlib dbus-libs glib libgcc libstdc++ libpcre2-16 libpq ca-certificates eudev-libs eudev libpcre2-16"
1111
DEV_DEP="libressl-dev zlib-dev dbus-dev glib-dev perl eudev-dev gawk pcre2-dev postgresql-dev linux-headers make gcc g++ curl python3 git"
1212

1313
apk add --no-cache $MAIN_DEP $DEV_DEP
@@ -94,6 +94,7 @@ CXXFLAGS="$CXXFLAGS -DNDEBUG -fPIC" make dynamic
9494
make install PREFIX="/usr"
9595
install -m644 "/tmp/src/tools/appserver/dockerbuild/libcrypto++.pc" "/usr/lib/pkgconfig/libcrypto++.pc"
9696
cd ..
97+
ls -lsa /usr/lib/libcryptopp*
9798

9899
# build messages
99100
cd /tmp/src/src/messages
@@ -116,14 +117,17 @@ make install
116117

117118
#create special symlinks, dirs and move the env script
118119
mkdir -p /etc/$DS_NAME
119-
ln -s $(qmake -qt5 -query QT_INSTALL_BINS)/$DS_NAME /usr/bin/$DS_NAME || true #allow to fail if already exists
120+
ln -s $(qmake -query QT_INSTALL_BINS)/$DS_NAME /usr/bin/$DS_NAME || true #allow to fail if already exists
120121
mv dockerbuild/env_start.sh /usr/bin/
121122

123+
# test if working
124+
/usr/bin/$DS_NAME --version
125+
122126
# remove unused stuff
123127
apk del --no-cache --purge "*-dev" $DEV_DEP
124128
rm -rf /tmp/*
125129
rm -rf $HOME/.cache/qpmx
126130
rm -rf /usr/local/bin/qpm
127131

128-
# test if working
132+
# test if still working
129133
/usr/bin/$DS_NAME --version

0 commit comments

Comments
 (0)