mirror of
https://github.com/element-hq/element-desktop
synced 2025-03-13 07:48:39 +01:00
Fix Dockerfile
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
parent
2bd650c1eb
commit
624fec4f30
@ -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
|
||||
|
@ -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
|
Loading…
x
Reference in New Issue
Block a user