From acc6a7b75149d8e35f0a3d6ae1da9785f60d869d Mon Sep 17 00:00:00 2001
From: Janne Mareike Koschinski <janne@kuschku.de>
Date: Sun, 27 Nov 2022 14:14:30 +0100
Subject: [PATCH] build: correct build erors
---
Dockerfile.trunk | 8 +++++---
Dockerfile.v0.14 | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/Dockerfile.trunk b/Dockerfile.trunk
index 0f658ca..e037d93 100644
--- a/Dockerfile.trunk
+++ b/Dockerfile.trunk
@@ -17,11 +17,12 @@ RUN apk add --no-cache \
boost-dev \
qt5-qtbase-dev \
qt5-qtbase-postgresql \
- qt5-qtbase-sqlite
+ qt5-qtbase-sqlite \
+ qca-dev
# setup repo
RUN mkdir /quassel && \
- git clone -b master --single-branch https://github.com/quassel/quassel /quassel/src && \
+ git clone --recursive https://github.com/quassel/quassel /quassel/src && \
cd /quassel/src
# generate build files
@@ -57,7 +58,8 @@ RUN apk add --no-cache \
libldap \
qt5-qtbase \
qt5-qtbase-postgresql \
- qt5-qtbase-sqlite
+ qt5-qtbase-sqlite \
+ qca
# copy binaries
COPY --from=builder /quassel/install/bin /usr/bin/
diff --git a/Dockerfile.v0.14 b/Dockerfile.v0.14
index 951ebd9..f3b80d0 100644
--- a/Dockerfile.v0.14
+++ b/Dockerfile.v0.14
@@ -17,11 +17,12 @@ RUN apk add --no-cache \
boost-dev \
qt5-qtbase-dev \
qt5-qtbase-postgresql \
- qt5-qtbase-sqlite
+ qt5-qtbase-sqlite \
+ qca-dev
# setup repo
RUN mkdir /quassel && \
- git clone -b master --single-branch https://github.com/quassel/quassel /quassel/src && \
+ git clone --recursive https://github.com/quassel/quassel /quassel/src && \
cd /quassel/src && \
git checkout $QUASSEL_VERSION
@@ -58,7 +59,8 @@ RUN apk add --no-cache \
libldap \
qt5-qtbase \
qt5-qtbase-postgresql \
- qt5-qtbase-sqlite
+ qt5-qtbase-sqlite \
+ qca
# copy binaries
COPY --from=builder /quassel/install/bin /usr/bin/
--
GitLab