docker-build: force Qt GUI build and fail if palladium-qt is missing
This commit is contained in:
@@ -35,18 +35,24 @@ docker run --rm --platform=linux/amd64 \
|
|||||||
rm -rf depends/${HOST_TRIPLE}
|
rm -rf depends/${HOST_TRIPLE}
|
||||||
rm -f config.cache
|
rm -f config.cache
|
||||||
|
|
||||||
echo '[*] depends (HOST=${HOST_TRIPLE})...'
|
echo '[*] depends (HOST=${HOST_TRIPLE}, forcing Qt packages)...'
|
||||||
cd depends && make HOST=${HOST_TRIPLE} -j\$(nproc) && cd ..
|
cd depends && make HOST=${HOST_TRIPLE} NO_QT= -j\$(nproc) && cd ..
|
||||||
|
|
||||||
echo '[*] autogen/configure...'
|
echo '[*] autogen/configure...'
|
||||||
[[ -x ./autogen.sh ]] && ./autogen.sh
|
[[ -x ./autogen.sh ]] && ./autogen.sh
|
||||||
[[ -f ./configure ]] || { echo 'configure not found: autogen failed'; exit 1; }
|
[[ -f ./configure ]] || { echo 'configure not found: autogen failed'; exit 1; }
|
||||||
|
|
||||||
# Ensure we use Qt tools (moc/uic/rcc) from depends, not system Qt
|
DEPENDS_PREFIX=\$PWD/depends/${HOST_TRIPLE}
|
||||||
export PATH=\$PWD/depends/${HOST_TRIPLE}/bin:\$PATH
|
|
||||||
|
|
||||||
./configure --prefix=\$PWD/depends/${HOST_TRIPLE} \
|
# Qt host tools (moc/uic/rcc) are staged in depends/<host>/native/bin.
|
||||||
--with-qt-bindir=\$PWD/depends/${HOST_TRIPLE}/bin \
|
export PATH=\${DEPENDS_PREFIX}/native/bin:\${DEPENDS_PREFIX}/bin:\$PATH
|
||||||
|
|
||||||
|
CONFIG_SITE=\${DEPENDS_PREFIX}/share/config.site \
|
||||||
|
./configure --prefix=\${DEPENDS_PREFIX} \
|
||||||
|
--enable-gui=qt5 \
|
||||||
|
--with-gui=qt5 \
|
||||||
|
--with-qrencode \
|
||||||
|
--with-qt-bindir=\${DEPENDS_PREFIX}/native/bin \
|
||||||
--host=${HOST_TRIPLE} \
|
--host=${HOST_TRIPLE} \
|
||||||
--enable-glibc-back-compat \
|
--enable-glibc-back-compat \
|
||||||
--enable-reduce-exports \
|
--enable-reduce-exports \
|
||||||
@@ -57,11 +63,17 @@ docker run --rm --platform=linux/amd64 \
|
|||||||
echo '[*] make...'
|
echo '[*] make...'
|
||||||
make -j\$(nproc)
|
make -j\$(nproc)
|
||||||
|
|
||||||
|
if [[ ! -x src/qt/palladium-qt ]]; then
|
||||||
|
echo '[!] ERROR: src/qt/palladium-qt not produced. Check configure output for \"with gui / qt = yes\".'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo '[*] copy binaries to /out...'
|
echo '[*] copy binaries to /out...'
|
||||||
mkdir -p /out
|
mkdir -p /out
|
||||||
for b in src/palladiumd src/palladium-cli src/palladium-tx src/palladium-wallet src/qt/palladium-qt; do
|
for b in src/palladiumd src/palladium-cli src/palladium-tx src/palladium-wallet; do
|
||||||
[[ -f \"\$b\" ]] && install -m 0755 \"\$b\" /out/
|
[[ -f \"\$b\" ]] && install -m 0755 \"\$b\" /out/
|
||||||
done
|
done
|
||||||
|
install -m 0755 src/qt/palladium-qt /out/
|
||||||
|
|
||||||
# Add permissions to host user
|
# Add permissions to host user
|
||||||
chown -R \${HOST_UID:-0}:\${HOST_GID:-0} /out
|
chown -R \${HOST_UID:-0}:\${HOST_GID:-0} /out
|
||||||
|
|||||||
@@ -34,18 +34,24 @@ docker run --rm --platform=linux/amd64 \
|
|||||||
rm -rf depends/${HOST_TRIPLE}
|
rm -rf depends/${HOST_TRIPLE}
|
||||||
rm -f config.cache
|
rm -f config.cache
|
||||||
|
|
||||||
echo '[*] depends (HOST=${HOST_TRIPLE})...'
|
echo '[*] depends (HOST=${HOST_TRIPLE}, forcing Qt packages)...'
|
||||||
cd depends && make HOST=${HOST_TRIPLE} -j\$(nproc) && cd ..
|
cd depends && make HOST=${HOST_TRIPLE} NO_QT= -j\$(nproc) && cd ..
|
||||||
|
|
||||||
echo '[*] autogen/configure...'
|
echo '[*] autogen/configure...'
|
||||||
[[ -x ./autogen.sh ]] && ./autogen.sh
|
[[ -x ./autogen.sh ]] && ./autogen.sh
|
||||||
[[ -f ./configure ]] || { echo 'configure not found: autogen failed'; exit 1; }
|
[[ -f ./configure ]] || { echo 'configure not found: autogen failed'; exit 1; }
|
||||||
|
|
||||||
# Ensure we use Qt tools (moc/uic/rcc) from depends, not system Qt
|
DEPENDS_PREFIX=\$PWD/depends/${HOST_TRIPLE}
|
||||||
export PATH=\$PWD/depends/${HOST_TRIPLE}/bin:\$PATH
|
|
||||||
|
|
||||||
./configure --prefix=\$PWD/depends/${HOST_TRIPLE} \
|
# Qt host tools (moc/uic/rcc) are staged in depends/<host>/native/bin.
|
||||||
--with-qt-bindir=\$PWD/depends/${HOST_TRIPLE}/bin \
|
export PATH=\${DEPENDS_PREFIX}/native/bin:\${DEPENDS_PREFIX}/bin:\$PATH
|
||||||
|
|
||||||
|
CONFIG_SITE=\${DEPENDS_PREFIX}/share/config.site \
|
||||||
|
./configure --prefix=\${DEPENDS_PREFIX} \
|
||||||
|
--enable-gui=qt5 \
|
||||||
|
--with-gui=qt5 \
|
||||||
|
--with-qrencode \
|
||||||
|
--with-qt-bindir=\${DEPENDS_PREFIX}/native/bin \
|
||||||
--host=${HOST_TRIPLE} \
|
--host=${HOST_TRIPLE} \
|
||||||
--enable-glibc-back-compat \
|
--enable-glibc-back-compat \
|
||||||
--enable-reduce-exports \
|
--enable-reduce-exports \
|
||||||
@@ -56,11 +62,17 @@ docker run --rm --platform=linux/amd64 \
|
|||||||
echo '[*] make...'
|
echo '[*] make...'
|
||||||
make -j\$(nproc)
|
make -j\$(nproc)
|
||||||
|
|
||||||
|
if [[ ! -x src/qt/palladium-qt ]]; then
|
||||||
|
echo '[!] ERROR: src/qt/palladium-qt not produced. Check configure output for \"with gui / qt = yes\".'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo '[*] copy binaries to /out...'
|
echo '[*] copy binaries to /out...'
|
||||||
mkdir -p /out
|
mkdir -p /out
|
||||||
for b in src/palladiumd src/palladium-cli src/palladium-tx src/palladium-wallet src/qt/palladium-qt; do
|
for b in src/palladiumd src/palladium-cli src/palladium-tx src/palladium-wallet; do
|
||||||
[[ -f \"\$b\" ]] && install -m 0755 \"\$b\" /out/
|
[[ -f \"\$b\" ]] && install -m 0755 \"\$b\" /out/
|
||||||
done
|
done
|
||||||
|
install -m 0755 src/qt/palladium-qt /out/
|
||||||
|
|
||||||
# Add permissions to host user
|
# Add permissions to host user
|
||||||
chown -R \${HOST_UID:-0}:\${HOST_GID:-0} /out
|
chown -R \${HOST_UID:-0}:\${HOST_GID:-0} /out
|
||||||
|
|||||||
@@ -35,18 +35,24 @@ docker run --rm --platform=linux/amd64 \
|
|||||||
rm -rf depends/${HOST_TRIPLE}
|
rm -rf depends/${HOST_TRIPLE}
|
||||||
rm -f config.cache
|
rm -f config.cache
|
||||||
|
|
||||||
echo '[*] depends...'
|
echo '[*] depends (forcing Qt packages)...'
|
||||||
cd depends && make HOST=${HOST_TRIPLE} -j\$(nproc) && cd ..
|
cd depends && make HOST=${HOST_TRIPLE} NO_QT= -j\$(nproc) && cd ..
|
||||||
|
|
||||||
echo '[*] autogen/configure...'
|
echo '[*] autogen/configure...'
|
||||||
[[ -x ./autogen.sh ]] && ./autogen.sh
|
[[ -x ./autogen.sh ]] && ./autogen.sh
|
||||||
[[ -f ./configure ]] || { echo 'configure not found: autogen failed'; exit 1; }
|
[[ -f ./configure ]] || { echo 'configure not found: autogen failed'; exit 1; }
|
||||||
|
|
||||||
# Ensure we use Qt tools (moc/uic/rcc) from depends, not system Qt
|
DEPENDS_PREFIX=\$PWD/depends/${HOST_TRIPLE}
|
||||||
export PATH=\$PWD/depends/${HOST_TRIPLE}/bin:\$PATH
|
|
||||||
|
|
||||||
./configure --prefix=\$PWD/depends/${HOST_TRIPLE} \
|
# Qt host tools (moc/uic/rcc) are staged in depends/<host>/native/bin.
|
||||||
--with-qt-bindir=\$PWD/depends/${HOST_TRIPLE}/bin \
|
export PATH=\${DEPENDS_PREFIX}/native/bin:\${DEPENDS_PREFIX}/bin:\$PATH
|
||||||
|
|
||||||
|
CONFIG_SITE=\${DEPENDS_PREFIX}/share/config.site \
|
||||||
|
./configure --prefix=\${DEPENDS_PREFIX} \
|
||||||
|
--enable-gui=qt5 \
|
||||||
|
--with-gui=qt5 \
|
||||||
|
--with-qrencode \
|
||||||
|
--with-qt-bindir=\${DEPENDS_PREFIX}/native/bin \
|
||||||
--enable-glibc-back-compat \
|
--enable-glibc-back-compat \
|
||||||
--enable-reduce-exports \
|
--enable-reduce-exports \
|
||||||
LDFLAGS='-static-libstdc++'
|
LDFLAGS='-static-libstdc++'
|
||||||
@@ -54,11 +60,17 @@ docker run --rm --platform=linux/amd64 \
|
|||||||
echo '[*] make...'
|
echo '[*] make...'
|
||||||
make -j\$(nproc)
|
make -j\$(nproc)
|
||||||
|
|
||||||
|
if [[ ! -x src/qt/palladium-qt ]]; then
|
||||||
|
echo '[!] ERROR: src/qt/palladium-qt not produced. Check configure output for \"with gui / qt = yes\".'
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
echo '[*] copying binaries to /out volume...'
|
echo '[*] copying binaries to /out volume...'
|
||||||
mkdir -p /out
|
mkdir -p /out
|
||||||
for b in src/palladiumd src/palladium-cli src/palladium-tx src/palladium-wallet src/qt/palladium-qt; do
|
for b in src/palladiumd src/palladium-cli src/palladium-tx src/palladium-wallet; do
|
||||||
[[ -f \"\$b\" ]] && install -m 0755 \"\$b\" /out/
|
[[ -f \"\$b\" ]] && install -m 0755 \"\$b\" /out/
|
||||||
done
|
done
|
||||||
|
install -m 0755 src/qt/palladium-qt /out/
|
||||||
|
|
||||||
# Align permissions to host user
|
# Align permissions to host user
|
||||||
chown -R \${HOST_UID:-0}:\${HOST_GID:-0} /out
|
chown -R \${HOST_UID:-0}:\${HOST_GID:-0} /out
|
||||||
|
|||||||
Reference in New Issue
Block a user