Fix Dockerfile

Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski 2024-05-10 21:32:03 +01:00
parent 2bd650c1eb
commit 624fec4f30
No known key found for this signature in database
GPG Key ID: A2B008A5F49F5D0D
2 changed files with 5 additions and 3 deletions

View File

@ -15,7 +15,7 @@ RUN apt-get -qq update && apt-get -qq dist-upgrade && \
# rpm is required for FPM to build rpm package
# tclsh is required for building SQLite as part of SQLCipher
# libsecret-1-dev is required even for prebuild keytar
apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev gcc-multilib g++-multilib lzip rpm python libcurl4 git git-lfs ssh unzip tcl \
apt-get -qq install --no-install-recommends qtbase5-dev bsdtar build-essential autoconf libssl-dev lzip rpm python libcurl4 git git-lfs ssh unzip tcl \
libsecret-1-dev \
libopenjp2-tools \
# Used by github actions \
@ -51,4 +51,4 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --no
# Run platform-specific tasks
COPY . /dockerbuild/
RUN /dockerbuild/aarch64.sh
RUN /dockerbuild/setup.sh

View File

@ -1,6 +1,8 @@
#!/usr/bin/env bash
if [ "$TARGETPLATFORM" = "linux/arm64" ]; then
if [ "$TARGETPLATFORM" = "linux/amd64" ]; then
apt-get -y install gcc-multilib g++-multilib
elif [ "$TARGETPLATFORM" = "linux/arm64" ]; then
echo "Building for aarch64"
apt-get -qq update
apt-get -y install crossbuild-essential-arm64 libsqlcipher-dev:arm64 libssl-dev:arm64 libsecret-1-dev:arm64